diff --git a/.project b/.project index fd085cf..fef5898 100644 --- a/.project +++ b/.project @@ -1,68 +1,34 @@ - - -BusTO - - - + BusTO_33 + - - - - - - - - - -com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - - - - - -com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - - - - - -org.eclipse.jdt.core.javabuilder - - - - - - - - - -com.android.ide.eclipse.adt.ApkBuilder - - - - - - - - - - -com.android.ide.eclipse.adt.AndroidNature - - - -org.eclipse.jdt.core.javanature - - - - \ No newline at end of file + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5b86b76..bd72745 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,43 +1,43 @@ + android:windowSoftInputMode="adjustResize" > diff --git a/project.properties b/project.properties index d857353..f74b9d7 100644 --- a/project.properties +++ b/project.properties @@ -1,15 +1,15 @@ # This file is automatically generated by Android Tools. # Do not modify this file -- YOUR CHANGES WILL BE ERASED! # # This file must be checked in Version Control Systems. # # To customize properties used by the Ant build system edit # "ant.properties", and override values to adapt the script to your # project structure. # # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. target=android-21 -android.library.reference.1=../../EclipseWorkspace/appcompat_v7 +android.library.reference.1=../workspace/android-support-v7-appcompat diff --git a/res/drawable-xxxhdpi/floating_button.xml b/res/drawable-xxxhdpi/floating_button.xml new file mode 100644 index 0000000..1d7aa13 --- /dev/null +++ b/res/drawable-xxxhdpi/floating_button.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable-xxxhdpi/floating_button_default.png b/res/drawable-xxxhdpi/floating_button_default.png new file mode 100644 index 0000000..0d5685a Binary files /dev/null and b/res/drawable-xxxhdpi/floating_button_default.png differ diff --git a/res/drawable-xxxhdpi/floating_button_pressed.png b/res/drawable-xxxhdpi/floating_button_pressed.png new file mode 100644 index 0000000..c32bb2c Binary files /dev/null and b/res/drawable-xxxhdpi/floating_button_pressed.png differ diff --git a/res/drawable-xxxhdpi/floating_button_shadow.png b/res/drawable-xxxhdpi/floating_button_shadow.png new file mode 100644 index 0000000..3db28cb Binary files /dev/null and b/res/drawable-xxxhdpi/floating_button_shadow.png differ diff --git a/res/drawable-xxxhdpi/search_button_custom.xml b/res/drawable-xxxhdpi/search_button_custom.xml index 823d998..b04d895 100644 --- a/res/drawable-xxxhdpi/search_button_custom.xml +++ b/res/drawable-xxxhdpi/search_button_custom.xml @@ -1,10 +1,8 @@ + - + \ No newline at end of file diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml index 21ef001..65e214f 100644 --- a/res/layout/activity_about.xml +++ b/res/layout/activity_about.xml @@ -1,17 +1,16 @@ \ No newline at end of file diff --git a/res/layout/activity_favorites.xml b/res/layout/activity_favorites.xml index 02952e6..296dde6 100644 --- a/res/layout/activity_favorites.xml +++ b/res/layout/activity_favorites.xml @@ -1,31 +1,33 @@ + + \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 936727f..3f22df3 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,125 +1,181 @@ - + - + + + + + + + + android:visibility="gone" />