From b5375c8832963070917d572ed520345f75f1b9a8 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 5 Nov 2016 10:38:13 +1300 Subject: [PATCH] Start app from scratch --- app/build.gradle | 19 ++++---- .../org/traccar/manager/ApplicationTest.java | 13 ------ app/src/main/AndroidManifest.xml | 18 ++------ .../org/traccar/manager/MainActivity.java | 42 ++++++++---------- app/src/main/res/layout/activity_main.xml | 6 +-- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 3361 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 2065 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 4780 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 7703 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 11220 bytes app/src/main/res/values/google_maps_api.xml | 5 --- app/src/main/res/values/strings.xml | 3 +- app/src/main/res/values/styles.xml | 4 +- build.gradle | 7 +-- gradle/wrapper/gradle-wrapper.properties | 3 +- 15 files changed, 38 insertions(+), 82 deletions(-) delete mode 100644 app/src/androidTest/java/org/traccar/manager/ApplicationTest.java create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/values/google_maps_api.xml diff --git a/app/build.gradle b/app/build.gradle index e06fb40..7a3cfe5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,25 +1,26 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 24 + buildToolsVersion "23.0.3" defaultConfig { applicationId "org.traccar.manager" - minSdkVersion 10 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" + minSdkVersion 14 + targetSdkVersion 24 + versionCode 10 + versionName "2.0" } + buildTypes { release { minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt') } } } dependencies { - compile 'com.android.support:appcompat-v7:23.1.0' - compile 'com.google.android.gms:play-services:8.4.0' - compile 'com.squareup.retrofit:retrofit:2.0.0-beta2' + testCompile 'junit:junit:4.12' + testCompile 'org.robolectric:robolectric:3.0' } diff --git a/app/src/androidTest/java/org/traccar/manager/ApplicationTest.java b/app/src/androidTest/java/org/traccar/manager/ApplicationTest.java deleted file mode 100644 index 25062ea..0000000 --- a/app/src/androidTest/java/org/traccar/manager/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.traccar.manager; - -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/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f2c1cd..d4bd89b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,33 +1,23 @@ + package="org.traccar.manager"> - - - - - - - + android:theme="@style/AppTheme"> + android:name=".MainActivity"> - + diff --git a/app/src/main/java/org/traccar/manager/MainActivity.java b/app/src/main/java/org/traccar/manager/MainActivity.java index 68d5135..c8d202d 100644 --- a/app/src/main/java/org/traccar/manager/MainActivity.java +++ b/app/src/main/java/org/traccar/manager/MainActivity.java @@ -1,36 +1,30 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package org.traccar.manager; +import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import com.google.android.gms.maps.CameraUpdateFactory; -import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.OnMapReadyCallback; -import com.google.android.gms.maps.SupportMapFragment; -import com.google.android.gms.maps.model.LatLng; -import com.google.android.gms.maps.model.MarkerOptions; - -public class MainActivity extends FragmentActivity implements OnMapReadyCallback { - - private GoogleMap map; +public class MainActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - // Obtain the SupportMapFragment and get notified when the map is ready to be used. - SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() - .findFragmentById(R.id.map); - mapFragment.getMapAsync(this); - } - - @Override - public void onMapReady(GoogleMap googleMap) { - map = googleMap; - - LatLng sydney = new LatLng(-34, 151); - map.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney")); - map.moveCamera(CameraUpdateFactory.newLatLng(sydney)); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1e523d2..3d47df2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,9 +1,7 @@ - - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bcccec65160d92116f20ffce4fce0b5245c..56d818d32c9d81dfa6120dee11056d9d096dc74b 100644 GIT binary patch delta 3359 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 literal 3418 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 VFwL6zQVak9002ovPDHLkV1ldK3B&*Z diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..4c368f4cf3dc8d8fcfd6acfdd43cc331fd1f3364 100644 GIT binary patch literal 4780 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 literal 4842 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..2bfb40b7d0ee774190b4eaddd7de7be8336a5d34 100644 GIT binary patch literal 7703 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 R*gpUO002ovPDHLkV1fd{%=-WU literal 7718 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 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..edf7f6f592faeb26854e1db02f796ece8fecafc1 GIT binary patch literal 11220 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 - - AIzaSyAMQYClXhA2tZdfCzu9EK9wUDWtCRQ6Bj0 - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6b4abc1..482efed 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,3 @@ - TraccarManager - Main + Traccar Manager diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 766ab99..44ec70b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,8 +1,6 @@ - - diff --git a/build.gradle b/build.gradle index 1b7886d..7a8e3ab 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,9 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4a1684f..dbdc05d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Sep 02 15:52:58 NZST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip