diff --git a/.bzrignore b/.bzrignore index ee70358..fcf06f2 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,4 +1,5 @@ gen bin assets libs +.settings diff --git a/.classpath b/.classpath index 7bc01d9..59cebc0 100644 --- a/.classpath +++ b/.classpath @@ -1,9 +1,30 @@ - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.project b/.project index 1035107..fd085cf 100644 --- a/.project +++ b/.project @@ -1,33 +1,68 @@ - BusTO - - - - - - 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 - - + + +BusTO + + + + + + + + + + + + + +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 diff --git a/lint.xml b/lint.xml new file mode 100644 index 0000000..791d4c8 --- /dev/null +++ b/lint.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/project.properties b/project.properties index 13143ab..d857353 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-19 -android.library.reference.1=../appcompat_v7 +target=android-21 +android.library.reference.1=../../EclipseWorkspace/appcompat_v7 diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml index 3072e65..21ef001 100644 --- a/res/layout/activity_about.xml +++ b/res/layout/activity_about.xml @@ -1,18 +1,17 @@ \ No newline at end of file diff --git a/res/layout/bus_stop_entry.xml b/res/layout/bus_stop_entry.xml index 2c15452..a4b7df2 100644 --- a/res/layout/bus_stop_entry.xml +++ b/res/layout/bus_stop_entry.xml @@ -1,33 +1,36 @@ \ No newline at end of file diff --git a/res/layout/main_activity.xml b/res/layout/main_activity.xml index 5801a56..e9ff1ab 100644 --- a/res/layout/main_activity.xml +++ b/res/layout/main_activity.xml @@ -1,70 +1,79 @@ + tools:context="it.reyboz.bustorino.MainActivity" > - -