diff --git a/app/build.gradle b/app/build.gradle index 0c66218..1a54d89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,6 +11,7 @@ android { targetSdkVersion 27 versionCode 45 versionName '5.8' + vectorDrawables.useSupportLibrary = true } lintOptions { diff --git a/app/src/hidden/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/hidden/res/drawable/ic_launcher.xml similarity index 72% rename from app/src/hidden/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/hidden/res/drawable/ic_launcher.xml index c5c9e8f..85a4fa4 100644 --- a/app/src/hidden/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/hidden/res/drawable/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/hidden/res/drawable/ic_launcher_foreground.xml b/app/src/hidden/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..ef75a1c --- /dev/null +++ b/app/src/hidden/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/hidden/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/hidden/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index c5c9e8f..0000000 --- a/app/src/hidden/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/hidden/res/mipmap-hdpi/ic_launcher.png b/app/src/hidden/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index d0a9deb..0000000 Binary files a/app/src/hidden/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/hidden/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 0f747f7..0000000 Binary files a/app/src/hidden/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-mdpi/ic_launcher.png b/app/src/hidden/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index 5aadf4f..0000000 Binary files a/app/src/hidden/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/hidden/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 00df5a8..0000000 Binary files a/app/src/hidden/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-xhdpi/ic_launcher.png b/app/src/hidden/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100755 index 1c13bde..0000000 Binary files a/app/src/hidden/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/hidden/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index a5c60fb..0000000 Binary files a/app/src/hidden/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-xxhdpi/ic_launcher.png b/app/src/hidden/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index 89d6270..0000000 Binary files a/app/src/hidden/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/hidden/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 65081bd..0000000 Binary files a/app/src/hidden/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/hidden/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100755 index 0aa0af8..0000000 Binary files a/app/src/hidden/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/hidden/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/hidden/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 3660c94..0000000 Binary files a/app/src/hidden/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f30ac68..7bca576 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ diff --git a/app/src/main/java/org/traccar/client/ShortcutActivity.java b/app/src/main/java/org/traccar/client/ShortcutActivity.java index 53328a2..761b6e7 100644 --- a/app/src/main/java/org/traccar/client/ShortcutActivity.java +++ b/app/src/main/java/org/traccar/client/ShortcutActivity.java @@ -68,13 +68,13 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: - setShortcutResult(items[position], R.mipmap.ic_start, ACTION_START); + setShortcutResult(items[position], R.drawable.ic_start, ACTION_START); break; case 1: - setShortcutResult(items[position], R.mipmap.ic_stop, ACTION_STOP); + setShortcutResult(items[position], R.drawable.ic_stop, ACTION_STOP); break; case 2: - setShortcutResult(items[position], R.mipmap.ic_sos, ACTION_SOS); + setShortcutResult(items[position], R.drawable.ic_sos, ACTION_SOS); break; } finish(); diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml similarity index 72% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/drawable/ic_launcher.xml index 7335274..3cf2551 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/drawable/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..370c0a7 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_start.xml b/app/src/main/res/drawable/ic_sos.xml similarity index 73% rename from app/src/main/res/mipmap-anydpi-v26/ic_start.xml rename to app/src/main/res/drawable/ic_sos.xml index 80f75e8..1925a84 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_start.xml +++ b/app/src/main/res/drawable/ic_sos.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_sos_foreground.xml b/app/src/main/res/drawable/ic_sos_foreground.xml new file mode 100644 index 0000000..b1b6ccd --- /dev/null +++ b/app/src/main/res/drawable/ic_sos_foreground.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_start_round.xml b/app/src/main/res/drawable/ic_start.xml similarity index 72% rename from app/src/main/res/mipmap-anydpi-v26/ic_start_round.xml rename to app/src/main/res/drawable/ic_start.xml index 80f75e8..165898c 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_start_round.xml +++ b/app/src/main/res/drawable/ic_start.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_start_foreground.xml b/app/src/main/res/drawable/ic_start_foreground.xml new file mode 100644 index 0000000..659c19c --- /dev/null +++ b/app/src/main/res/drawable/ic_start_foreground.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml similarity index 73% rename from app/src/main/res/mipmap-anydpi-v26/ic_stop.xml rename to app/src/main/res/drawable/ic_stop.xml index 316abda..3b5d326 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_stop.xml +++ b/app/src/main/res/drawable/ic_stop.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_stop_foreground.xml b/app/src/main/res/drawable/ic_stop_foreground.xml new file mode 100644 index 0000000..8a11839 --- /dev/null +++ b/app/src/main/res/drawable/ic_stop_foreground.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 7335274..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_sos.xml b/app/src/main/res/mipmap-anydpi-v26/ic_sos.xml deleted file mode 100644 index ff48e78..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_sos.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_sos_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_sos_round.xml deleted file mode 100644 index ff48e78..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_sos_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_stop_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_stop_round.xml deleted file mode 100644 index 316abda..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_stop_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 0193bcb..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index bbac580..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_sos.png b/app/src/main/res/mipmap-hdpi/ic_sos.png deleted file mode 100644 index cd5464b..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_sos.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_sos_foreground.png b/app/src/main/res/mipmap-hdpi/ic_sos_foreground.png deleted file mode 100644 index f777ebe..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_sos_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_start.png b/app/src/main/res/mipmap-hdpi/ic_start.png deleted file mode 100644 index 26585b2..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_start.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_start_foreground.png b/app/src/main/res/mipmap-hdpi/ic_start_foreground.png deleted file mode 100644 index fc90d31..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_start_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_stop.png b/app/src/main/res/mipmap-hdpi/ic_stop.png deleted file mode 100644 index b15d13e..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_stop.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_stop_foreground.png b/app/src/main/res/mipmap-hdpi/ic_stop_foreground.png deleted file mode 100644 index 9b584c6..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_stop_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 7e51d59..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 589797a..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_sos.png b/app/src/main/res/mipmap-mdpi/ic_sos.png deleted file mode 100644 index 09aeebf..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_sos.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_sos_foreground.png b/app/src/main/res/mipmap-mdpi/ic_sos_foreground.png deleted file mode 100644 index 7acf0de..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_sos_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_start.png b/app/src/main/res/mipmap-mdpi/ic_start.png deleted file mode 100644 index 859aca3..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_start.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_start_foreground.png b/app/src/main/res/mipmap-mdpi/ic_start_foreground.png deleted file mode 100644 index d93f095..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_start_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_stop.png b/app/src/main/res/mipmap-mdpi/ic_stop.png deleted file mode 100644 index cbc9a7d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_stop.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_stop_foreground.png b/app/src/main/res/mipmap-mdpi/ic_stop_foreground.png deleted file mode 100644 index fd2bac3..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_stop_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 567c9c0..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index f14ebf0..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_sos.png b/app/src/main/res/mipmap-xhdpi/ic_sos.png deleted file mode 100644 index 4abc859..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_sos.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_sos_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_sos_foreground.png deleted file mode 100644 index a0b054f..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_sos_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_start.png b/app/src/main/res/mipmap-xhdpi/ic_start.png deleted file mode 100644 index b867ce9..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_start.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_start_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_start_foreground.png deleted file mode 100644 index c73c7e5..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_start_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_stop.png b/app/src/main/res/mipmap-xhdpi/ic_stop.png deleted file mode 100644 index 156e816..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_stop.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_stop_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_stop_foreground.png deleted file mode 100644 index f565d54..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_stop_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 726cb84..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 420ef73..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sos.png b/app/src/main/res/mipmap-xxhdpi/ic_sos.png deleted file mode 100644 index f491474..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_sos.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sos_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_sos_foreground.png deleted file mode 100644 index a995c36..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_sos_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_start.png b/app/src/main/res/mipmap-xxhdpi/ic_start.png deleted file mode 100644 index e43f982..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_start.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_start_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_start_foreground.png deleted file mode 100644 index 15c10c6..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_start_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_stop.png b/app/src/main/res/mipmap-xxhdpi/ic_stop.png deleted file mode 100644 index f81fac8..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_stop.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_stop_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_stop_foreground.png deleted file mode 100644 index 0c74388..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_stop_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index a9186e2..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index fb25980..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_sos.png b/app/src/main/res/mipmap-xxxhdpi/ic_sos.png deleted file mode 100644 index 2951baa..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_sos.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_sos_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_sos_foreground.png deleted file mode 100644 index aada2ac..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_sos_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_start.png b/app/src/main/res/mipmap-xxxhdpi/ic_start.png deleted file mode 100644 index 21d96f0..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_start.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_start_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_start_foreground.png deleted file mode 100644 index 1c56014..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_start_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_stop.png b/app/src/main/res/mipmap-xxxhdpi/ic_stop.png deleted file mode 100644 index c863ba6..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_stop.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_stop_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_stop_foreground.png deleted file mode 100644 index 8922475..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_stop_foreground.png and /dev/null differ diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml index 6ff6aac..c3f9c8a 100644 --- a/app/src/main/res/xml/shortcuts.xml +++ b/app/src/main/res/xml/shortcuts.xml @@ -7,7 +7,7 @@