diff --git a/app/build.gradle b/app/build.gradle index 0bd0d9b..fba4513 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { buildConfigField "boolean", "HIDDEN_APP", "false" minSdkVersion 16 targetSdkVersion 29 - versionCode 57 - versionName '5.20' + versionCode 58 + versionName '5.21' } lintOptions { @@ -34,11 +34,11 @@ android { } dependencies { - implementation 'com.google.android.material:material:1.1.0-alpha10' + implementation 'com.google.android.material:material:1.2.0-alpha01' implementation 'androidx.preference:preference:1.1.0' testImplementation 'junit:junit:4.12' testImplementation 'org.robolectric:robolectric:4.1' - googleImplementation 'com.google.firebase:firebase-core:17.2.0' + googleImplementation 'com.google.firebase:firebase-core:17.2.1' googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' googleImplementation "com.google.android.gms:play-services-location:17.0.0" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 98e43af..5569742 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,8 +48,6 @@ - - diff --git a/app/src/main/java/org/traccar/client/AboutActivity.java b/app/src/main/java/org/traccar/client/AboutActivity.java deleted file mode 100644 index 642749f..0000000 --- a/app/src/main/java/org/traccar/client/AboutActivity.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.client; - -import android.content.pm.PackageManager.NameNotFoundException; -import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; -import android.util.Log; -import android.widget.TextView; - -public class AboutActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.about); - - TextView title = findViewById(R.id.title); - try { - title.setText(title.getText() + " " + getPackageManager().getPackageInfo(this.getPackageName(), 0).versionName); - } catch (NameNotFoundException e) { - Log.w(AboutActivity.class.getSimpleName(), e); - } - } - -} diff --git a/app/src/main/java/org/traccar/client/MainFragment.java b/app/src/main/java/org/traccar/client/MainFragment.java index b7b899f..909a2cf 100644 --- a/app/src/main/java/org/traccar/client/MainFragment.java +++ b/app/src/main/java/org/traccar/client/MainFragment.java @@ -195,9 +195,6 @@ public class MainFragment extends PreferenceFragmentCompat implements OnSharedPr if (item.getItemId() == R.id.status) { startActivity(new Intent(getActivity(), StatusActivity.class)); return true; - } else if (item.getItemId() == R.id.about) { - startActivity(new Intent(getActivity(), AboutActivity.class)); - return true; } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml deleted file mode 100644 index c518db7..0000000 --- a/app/src/main/res/layout/about.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 01b4b67..0b75dab 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -8,9 +8,4 @@ android:title="@string/menu_status" app:showAsAction="ifRoom" /> - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 826b6e2..4c8dc3e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,12 +28,8 @@ Foreground service Increase service priority Status - About Add shortcuts Clear - Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems. - This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub. - For more information visit\nwww.traccar.org/client Service started Service stopped Send successfully diff --git a/build.gradle b/build.gradle index 4a3a6df..e080ab9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.2' classpath 'com.google.gms:google-services:4.3.2' classpath 'io.fabric.tools:gradle:1.26.1' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 01a286e..e5591bc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip