diff --git a/.bzrignore b/.bzrignore index 5640670..47ca4e8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,10 +1,11 @@ gen bin assets libs .settings local.properties .gradle .idea/workspace.xml .idea/libraries build +.idea/codeStyleSettings.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..96cc43e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,23 +1,22 @@ - - - + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1ee46c8..4d8ce81 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,18 +1,18 @@ - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 59436c9..e930905 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,22 @@ - + + + + + + + + + + + - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index d7ee6c5..36165b1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1,9 +1,8 @@ - - + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index def6a6a..6564d52 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,7 +1,6 @@ - - + \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7b566ef..fc22cbd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,43 +1,43 @@ + android:versionCode="9" + android:versionName="1.6.0" > diff --git a/bus-torino.iml b/bus-torino.iml index bd6d355..df1cf32 100644 --- a/bus-torino.iml +++ b/bus-torino.iml @@ -1,89 +1,91 @@ - + + - - + \ No newline at end of file diff --git a/src/it/reyboz/bustorino/layouts/BusListView.java b/res/layout-v11/BusListView.java similarity index 100% rename from src/it/reyboz/bustorino/layouts/BusListView.java rename to res/layout-v11/BusListView.java diff --git a/res/layout/activity_favorites.xml b/res/layout/activity_favorites.xml index 0bcd9aa..c5677b3 100644 --- a/res/layout/activity_favorites.xml +++ b/res/layout/activity_favorites.xml @@ -1,27 +1,29 @@ \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 7a776e9..64d56d8 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,170 +1,175 @@ + android:animateLayoutChanges="true"> - - + + android:onClick="onSearchClick" + tools:ignore="NewApi" /> + android:visibility="gone" + tools:ignore="NewApi" />