diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 4d8ce81..e5d9f89 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 e930905..1a3eaff 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,22 +1,46 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 95834c4..fb497d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,53 +1,53 @@ buildscript { repositories { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0-rc2' + classpath 'com.android.tools.build:gradle:1.3.0' } } apply plugin: 'com.android.application' android { compileSdkVersion 21 buildToolsVersion '21.1.2' compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } packagingOptions { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] } } lintOptions { abortOnError false } repositories { mavenCentral() mavenLocal() } dependencies { compile 'com.android.support:support-v4:21.0.+' compile 'com.android.support:appcompat-v7:21.0.+' compile 'com.melnykov:floatingactionbutton:1.1.0' } } \ No newline at end of file diff --git a/bus-torino.iml b/bus-torino.iml index df1cf32..b0f1886 100644 --- a/bus-torino.iml +++ b/bus-torino.iml @@ -1,91 +1,97 @@ - + - + - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable-hdpi/ic_add_black_24dp.png b/res/drawable-hdpi/ic_add_black_24dp.png deleted file mode 100644 index a48d400..0000000 Binary files a/res/drawable-hdpi/ic_add_black_24dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_add_white_24dp.png b/res/drawable-hdpi/ic_add_white_24dp.png deleted file mode 100644 index 481643e..0000000 Binary files a/res/drawable-hdpi/ic_add_white_24dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_keyboard_black_24dp.png b/res/drawable-hdpi/ic_keyboard_black_24dp.png deleted file mode 100644 index b5ab2eb..0000000 Binary files a/res/drawable-hdpi/ic_keyboard_black_24dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.png b/res/drawable-hdpi/ic_keyboard_white_24dp.png deleted file mode 100644 index 9a66461..0000000 Binary files a/res/drawable-hdpi/ic_keyboard_white_24dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_looks_one_black_24dp.png b/res/drawable-hdpi/ic_looks_one_black_24dp.png deleted file mode 100644 index 5a86b26..0000000 Binary files a/res/drawable-hdpi/ic_looks_one_black_24dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_looks_one_white_24dp.png b/res/drawable-hdpi/ic_looks_one_white_24dp.png deleted file mode 100644 index c087572..0000000 Binary files a/res/drawable-hdpi/ic_looks_one_white_24dp.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/alphabetical.png b/res/drawable-xxxhdpi/alphabetical.png new file mode 100644 index 0000000..84365a5 Binary files /dev/null and b/res/drawable-xxxhdpi/alphabetical.png differ diff --git a/res/drawable-xxxhdpi/keyboard.png b/res/drawable-xxxhdpi/keyboard.png new file mode 100644 index 0000000..06b9c22 Binary files /dev/null and b/res/drawable-xxxhdpi/keyboard.png differ diff --git a/res/drawable-xxxhdpi/numeric.png b/res/drawable-xxxhdpi/numeric.png new file mode 100644 index 0000000..36a9ba7 Binary files /dev/null and b/res/drawable-xxxhdpi/numeric.png differ diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml index d5fcb80..ff57657 100644 --- a/res/layout/activity_about.xml +++ b/res/layout/activity_about.xml @@ -1,16 +1,16 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + tools:context="it.reyboz.bustorino.ActivityAbout"> + android:layout_marginTop="5dip" + android:textAppearance="?android:attr/textAppearanceMedium"/> \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 6f49a48..6ffda3f 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,177 +1,179 @@ - + xmlns:fab="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context="it.reyboz.bustorino.ActivityMain"> + - + - + - - - - - - - - - - - - - - - - - -