From d5dd1206d0c18eadbbc79488a6ac8151f8bc4fa5 Mon Sep 17 00:00:00 2001 From: Will Kamp Date: Sun, 18 Jan 2015 08:04:39 -0800 Subject: [PATCH] include update to andxtidelib, android studio and gradle --- .classpath | 14 - .gitignore | 5 + .gitmodules | 3 + .project | 33 - AndXtideLib | 1 + app/.gitignore | 1 + app/app.iml | 96 + app/build.gradle | 30 + {libs => app/libs}/GraphView-3.0.jar | Bin ...ap-0.3.0-PATCHED-jar-with-dependencies.jar | Bin {libs => app/libs}/osmdroid-android-3.0.9.jar | Bin {libs => app/libs}/slf4j-android-1.5.8.jar | Bin .../proguard-rules.pro | 9 +- .../com/mxmariner/tides/ApplicationTest.java | 13 + .../src/main/AndroidManifest.xml | 9 +- .../harmonics-dwf-20100529-nonfree.tcd | Bin .../harmonics/harmonics-dwf-20121224-free.tcd | Bin .../main/assets}/rendertheme/myosmarender.xml | 0 .../main/assets}/rendertheme/osmarender.xml | 0 .../patterns/access-destination.png | Bin .../rendertheme/patterns/access-private.png | Bin .../assets}/rendertheme/patterns/cemetery.png | Bin .../assets}/rendertheme/patterns/marsh.png | Bin .../assets}/rendertheme/patterns/military.png | Bin .../rendertheme/patterns/nature-reserve.png | Bin .../rendertheme/patterns/wood-coniferous.png | Bin .../rendertheme/patterns/wood-deciduous.png | Bin .../rendertheme/patterns/wood-mixed.png | Bin .../assets}/rendertheme/symbols/airport.png | Bin .../rendertheme/symbols/alpine_hut.png | Bin .../main/assets}/rendertheme/symbols/atm.png | Bin .../assets}/rendertheme/symbols/bakery.png | Bin .../main/assets}/rendertheme/symbols/bank.png | Bin .../assets}/rendertheme/symbols/bench.png | Bin .../rendertheme/symbols/bicycle_rental.png | Bin .../main/assets}/rendertheme/symbols/bus.png | Bin .../assets}/rendertheme/symbols/bus_sta.png | Bin .../assets}/rendertheme/symbols/cable_car.png | Bin .../main/assets}/rendertheme/symbols/cafe.png | Bin .../assets}/rendertheme/symbols/campSite.png | Bin .../rendertheme/symbols/cave_entrance.png | Bin .../rendertheme/symbols/chair_lift_2.png | Bin .../assets}/rendertheme/symbols/church.png | Bin .../assets}/rendertheme/symbols/cinema.png | Bin .../rendertheme/symbols/drinking_water.png | Bin .../assets}/rendertheme/symbols/fastfood.png | Bin .../rendertheme/symbols/firebrigade.png | Bin .../assets}/rendertheme/symbols/florist.png | Bin .../assets}/rendertheme/symbols/fountain.png | Bin .../assets}/rendertheme/symbols/gondola.png | Bin .../assets}/rendertheme/symbols/helipad.png | Bin .../assets}/rendertheme/symbols/hospital.png | Bin .../assets}/rendertheme/symbols/hostel.png | Bin .../assets}/rendertheme/symbols/hotel.png | Bin .../rendertheme/symbols/information.png | Bin .../rendertheme/symbols/kindergarten.png | Bin .../assets}/rendertheme/symbols/library.png | Bin .../assets}/rendertheme/symbols/mosque.png | Bin .../assets}/rendertheme/symbols/oneway.png | Bin .../rendertheme/symbols/osmarender.xml | 0 .../assets}/rendertheme/symbols/parking.png | Bin .../main/assets}/rendertheme/symbols/peak.png | Bin .../rendertheme/symbols/petrolStation.png | Bin .../assets}/rendertheme/symbols/pharmacy.png | Bin .../rendertheme/symbols/playground.png | Bin .../assets}/rendertheme/symbols/postbox.png | Bin .../rendertheme/symbols/postoffice.png | Bin .../main/assets}/rendertheme/symbols/pub.png | Bin .../symbols/railway-crossing-small.png | Bin .../rendertheme/symbols/railway-crossing.png | Bin .../assets}/rendertheme/symbols/recycling.png | Bin .../rendertheme/symbols/restaurant.png | Bin .../assets}/rendertheme/symbols/school.png | Bin .../assets}/rendertheme/symbols/shelter.png | Bin .../rendertheme/symbols/soccer-borderless.png | Bin .../rendertheme/symbols/supermarket.png | Bin .../assets}/rendertheme/symbols/synagogue.png | Bin .../assets}/rendertheme/symbols/telephone.png | Bin .../assets}/rendertheme/symbols/tennis.png | Bin .../assets}/rendertheme/symbols/theatre.png | Bin .../assets}/rendertheme/symbols/toilets.png | Bin .../rendertheme/symbols/traffic_signal.png | Bin .../main/assets}/rendertheme/symbols/tree.png | Bin .../rendertheme/symbols/university.png | Bin .../assets}/rendertheme/symbols/viewpoint.png | Bin .../assets}/rendertheme/symbols/vulcan.png | Bin .../assets}/rendertheme/symbols/windmill.png | Bin {assets => app/src/main/assets}/world.map | Bin .../mxmariner/tides/CurrentListFragment.java | 0 .../com/mxmariner/tides/MainActivity.java | 20 +- .../com/mxmariner/tides/MapFragment.java | 0 .../tides/MapsforgeOSMDroidTileProvider.java | 0 .../tides/MapsforgeOSMTileSource.java | 0 .../java}/com/mxmariner/tides/MyMapView.java | 0 .../com/mxmariner/tides/Preparations.java | 0 .../com/mxmariner/tides/SorterFactory.java | 0 .../java}/com/mxmariner/tides/Station.java | 0 .../com/mxmariner/tides/StationFragment.java | 0 .../com/mxmariner/tides/StationOverlay.java | 0 .../com/mxmariner/tides/TideListFragment.java | 0 .../com/mxmariner/units/UnitConversions.java | 0 .../java}/com/mxmariner/util/Constants.java | 0 .../src/main/res}/drawable-hdpi/current.png | Bin .../main/res}/drawable-hdpi/ic_launcher.png | Bin .../src/main/res}/drawable-hdpi/icon.png | Bin .../src/main/res}/drawable-hdpi/tide.png | Bin .../src/main/res}/drawable-ldpi/current.png | Bin .../src/main/res}/drawable-ldpi/icon.png | Bin .../src/main/res}/drawable-ldpi/tide.png | Bin .../src/main/res}/drawable-mdpi/current.png | Bin .../main/res}/drawable-mdpi/ic_launcher.png | Bin .../src/main/res}/drawable-mdpi/icon.png | Bin .../src/main/res}/drawable-mdpi/tide.png | Bin .../main/res}/drawable-nodpi/currentpt.png | Bin .../src/main/res}/drawable-nodpi/tidept.png | Bin .../src/main/res}/drawable-xhdpi/current.png | Bin .../main/res}/drawable-xhdpi/ic_launcher.png | Bin .../src/main/res}/drawable-xhdpi/icon.png | Bin .../src/main/res}/drawable-xhdpi/tide.png | Bin .../src/main/res}/drawable-xxhdpi/current.png | Bin .../main/res}/drawable-xxhdpi/ic_launcher.png | Bin .../src/main/res}/drawable-xxhdpi/icon.png | Bin .../src/main/res}/drawable-xxhdpi/tide.png | Bin .../src/main/res}/drawable/legendbox.xml | 0 .../src/main/res}/layout/activity_main.xml | 0 .../src/main/res}/layout/dateselect.xml | 0 .../src/main/res}/layout/datimeselect.xml | 0 {res => app/src/main/res}/layout/myview.xml | 0 .../src/main/res}/layout/stationlayout.xml | 0 .../src/main/res}/layout/timeselect.xml | 0 {res => app/src/main/res}/values/color.xml | 0 {res => app/src/main/res}/values/strings.xml | 0 {res => app/src/main/res}/values/styles.xml | 2 +- build.gradle | 19 + gradle.properties | 18 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 + gradlew.bat | 90 + iconsrs/current.svg | 9403 ------ iconsrs/doicon.bat | 6 - iconsrs/dowaypointspng.sh | 15 - iconsrs/icon.svg | 24228 ---------------- iconsrs/tide.svg | 9403 ------ libs/android-support-v4.jar | Bin 393154 -> 0 bytes mx-tides-android.iml | 21 + project.properties | 15 - res/menu/main.xml | 15 - res/values-v11/styles.xml | 11 - res/values-v14/styles.xml | 12 - res/values/arrays.xml | 22 - settings.gradle | 1 + 152 files changed, 483 insertions(+), 43202 deletions(-) delete mode 100644 .classpath create mode 100644 .gitignore create mode 100644 .gitmodules delete mode 100644 .project create mode 160000 AndXtideLib create mode 100644 app/.gitignore create mode 100644 app/app.iml create mode 100644 app/build.gradle rename {libs => app/libs}/GraphView-3.0.jar (100%) rename {libs => app/libs}/mapsforge-map-0.3.0-PATCHED-jar-with-dependencies.jar (100%) rename {libs => app/libs}/osmdroid-android-3.0.9.jar (100%) rename {libs => app/libs}/slf4j-android-1.5.8.jar (100%) rename proguard-project.txt => app/proguard-rules.pro (62%) create mode 100644 app/src/androidTest/java/com/mxmariner/tides/ApplicationTest.java rename AndroidManifest.xml => app/src/main/AndroidManifest.xml (83%) rename {assets => app/src/main/assets}/harmonics/harmonics-dwf-20100529-nonfree.tcd (100%) rename {assets => app/src/main/assets}/harmonics/harmonics-dwf-20121224-free.tcd (100%) rename {assets => app/src/main/assets}/rendertheme/myosmarender.xml (100%) rename {assets => app/src/main/assets}/rendertheme/osmarender.xml (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/access-destination.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/access-private.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/cemetery.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/marsh.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/military.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/nature-reserve.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/wood-coniferous.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/wood-deciduous.png (100%) rename {assets => app/src/main/assets}/rendertheme/patterns/wood-mixed.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/airport.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/alpine_hut.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/atm.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/bakery.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/bank.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/bench.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/bicycle_rental.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/bus.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/bus_sta.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/cable_car.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/cafe.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/campSite.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/cave_entrance.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/chair_lift_2.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/church.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/cinema.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/drinking_water.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/fastfood.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/firebrigade.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/florist.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/fountain.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/gondola.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/helipad.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/hospital.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/hostel.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/hotel.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/information.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/kindergarten.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/library.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/mosque.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/oneway.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/osmarender.xml (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/parking.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/peak.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/petrolStation.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/pharmacy.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/playground.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/postbox.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/postoffice.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/pub.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/railway-crossing-small.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/railway-crossing.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/recycling.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/restaurant.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/school.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/shelter.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/soccer-borderless.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/supermarket.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/synagogue.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/telephone.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/tennis.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/theatre.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/toilets.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/traffic_signal.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/tree.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/university.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/viewpoint.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/vulcan.png (100%) rename {assets => app/src/main/assets}/rendertheme/symbols/windmill.png (100%) rename {assets => app/src/main/assets}/world.map (100%) rename {src => app/src/main/java}/com/mxmariner/tides/CurrentListFragment.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/MainActivity.java (93%) rename {src => app/src/main/java}/com/mxmariner/tides/MapFragment.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/MapsforgeOSMDroidTileProvider.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/MapsforgeOSMTileSource.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/MyMapView.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/Preparations.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/SorterFactory.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/Station.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/StationFragment.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/StationOverlay.java (100%) rename {src => app/src/main/java}/com/mxmariner/tides/TideListFragment.java (100%) rename {src => app/src/main/java}/com/mxmariner/units/UnitConversions.java (100%) rename {src => app/src/main/java}/com/mxmariner/util/Constants.java (100%) rename {res => app/src/main/res}/drawable-hdpi/current.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-hdpi/icon.png (100%) rename {res => app/src/main/res}/drawable-hdpi/tide.png (100%) rename {res => app/src/main/res}/drawable-ldpi/current.png (100%) rename {res => app/src/main/res}/drawable-ldpi/icon.png (100%) rename {res => app/src/main/res}/drawable-ldpi/tide.png (100%) rename {res => app/src/main/res}/drawable-mdpi/current.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-mdpi/icon.png (100%) rename {res => app/src/main/res}/drawable-mdpi/tide.png (100%) rename {res => app/src/main/res}/drawable-nodpi/currentpt.png (100%) rename {res => app/src/main/res}/drawable-nodpi/tidept.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/current.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/icon.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/tide.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/current.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/icon.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/tide.png (100%) rename {res => app/src/main/res}/drawable/legendbox.xml (100%) rename {res => app/src/main/res}/layout/activity_main.xml (100%) rename {res => app/src/main/res}/layout/dateselect.xml (100%) rename {res => app/src/main/res}/layout/datimeselect.xml (100%) rename {res => app/src/main/res}/layout/myview.xml (100%) rename {res => app/src/main/res}/layout/stationlayout.xml (100%) rename {res => app/src/main/res}/layout/timeselect.xml (100%) rename {res => app/src/main/res}/values/color.xml (100%) rename {res => app/src/main/res}/values/strings.xml (100%) rename {res => app/src/main/res}/values/styles.xml (87%) create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 iconsrs/current.svg delete mode 100644 iconsrs/doicon.bat delete mode 100644 iconsrs/dowaypointspng.sh delete mode 100644 iconsrs/icon.svg delete mode 100644 iconsrs/tide.svg delete mode 100644 libs/android-support-v4.jar create mode 100644 mx-tides-android.iml delete mode 100644 project.properties delete mode 100644 res/menu/main.xml delete mode 100644 res/values-v11/styles.xml delete mode 100644 res/values-v14/styles.xml delete mode 100644 res/values/arrays.xml create mode 100644 settings.gradle diff --git a/.classpath b/.classpath deleted file mode 100644 index 561d3d5..0000000 --- a/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..35ed415 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.gradle +/local.properties +.idea/ +.DS_Store +/build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..852df59 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "AndXtideLib"] + path = AndXtideLib + url = git@github.com:manimaul/AndXtideLib.git diff --git a/.project b/.project deleted file mode 100644 index e982a31..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - MXTides - - - - - - 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/AndXtideLib b/AndXtideLib new file mode 160000 index 0000000..19a69a2 --- /dev/null +++ b/AndXtideLib @@ -0,0 +1 @@ +Subproject commit 19a69a27ab32fef7c1d3fdaae5f7558d9aacbda1 diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..136d860 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..daba9cd --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "com.mxmariner.tides" + minSdkVersion 14 + targetSdkVersion 21 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:21.0.3' + compile project(':andxtidelib') + compile files('libs/GraphView-3.0.jar') + compile files('libs/mapsforge-map-0.3.0-PATCHED-jar-with-dependencies.jar') + compile files('libs/osmdroid-android-3.0.9.jar') + compile files('libs/slf4j-android-1.5.8.jar') +} diff --git a/libs/GraphView-3.0.jar b/app/libs/GraphView-3.0.jar similarity index 100% rename from libs/GraphView-3.0.jar rename to app/libs/GraphView-3.0.jar diff --git a/libs/mapsforge-map-0.3.0-PATCHED-jar-with-dependencies.jar b/app/libs/mapsforge-map-0.3.0-PATCHED-jar-with-dependencies.jar similarity index 100% rename from libs/mapsforge-map-0.3.0-PATCHED-jar-with-dependencies.jar rename to app/libs/mapsforge-map-0.3.0-PATCHED-jar-with-dependencies.jar diff --git a/libs/osmdroid-android-3.0.9.jar b/app/libs/osmdroid-android-3.0.9.jar similarity index 100% rename from libs/osmdroid-android-3.0.9.jar rename to app/libs/osmdroid-android-3.0.9.jar diff --git a/libs/slf4j-android-1.5.8.jar b/app/libs/slf4j-android-1.5.8.jar similarity index 100% rename from libs/slf4j-android-1.5.8.jar rename to app/libs/slf4j-android-1.5.8.jar diff --git a/proguard-project.txt b/app/proguard-rules.pro similarity index 62% rename from proguard-project.txt rename to app/proguard-rules.pro index f2fe155..45dc58a 100644 --- a/proguard-project.txt +++ b/app/proguard-rules.pro @@ -1,11 +1,8 @@ -# 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. +# in /opt/android-sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html diff --git a/app/src/androidTest/java/com/mxmariner/tides/ApplicationTest.java b/app/src/androidTest/java/com/mxmariner/tides/ApplicationTest.java new file mode 100644 index 0000000..8fe31d4 --- /dev/null +++ b/app/src/androidTest/java/com/mxmariner/tides/ApplicationTest.java @@ -0,0 +1,13 @@ +package com.mxmariner.tides; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 83% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index a24a89d..613a21e 100644 --- a/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,6 @@ - - + package="com.mxmariner.tides"> @@ -16,7 +10,6 @@ - - - \ No newline at end of file diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml deleted file mode 100644 index a550853..0000000 --- a/res/values-v14/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml deleted file mode 100644 index 1199554..0000000 --- a/res/values/arrays.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - North - South - - - East - West - - - Nautical - Statute - Metric - - @string/naut - @string/stat - @string/metr - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..acbc8b8 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app', ':andxtidelib'