diff --git a/.idea/misc.xml b/.idea/misc.xml index d127c77..59436c9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,10 @@ + + + diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bd72745..7b566ef 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,43 +1,43 @@ diff --git a/build.gradle b/build.gradle index fe6eb55..95834c4 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' } } apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion '21.1.1' + 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 acd73f6..bd6d355 100644 --- a/bus-torino.iml +++ b/bus-torino.iml @@ -1,89 +1,89 @@ - - + + + - diff --git a/proguard-project.txt b/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/project.properties b/project.properties deleted file mode 100644 index b3da295..0000000 --- a/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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/android-support-v7-appcompat diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml index 65e214f..d5fcb80 100644 --- a/res/layout/activity_about.xml +++ b/res/layout/activity_about.xml @@ -1,16 +1,16 @@ + tools:context="it.reyboz.bustorino.ActivityAbout" > \ No newline at end of file diff --git a/res/layout/activity_favorites.xml b/res/layout/activity_favorites.xml index f6238f2..0bcd9aa 100644 --- a/res/layout/activity_favorites.xml +++ b/res/layout/activity_favorites.xml @@ -1,27 +1,27 @@ + tools:context="it.reyboz.bustorino.ActivityFavorites" > \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 2d7945c..7a776e9 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,170 +1,170 @@ + tools:context="it.reyboz.bustorino.ActivityMain" >