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