diff --git a/README.md b/README.md index ef43de099..946758280 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- +

Meshtastic-Android

diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml index 41e38c351..30c5add98 100644 --- a/app/src/google/AndroidManifest.xml +++ b/app/src/google/AndroidManifest.xml @@ -25,9 +25,8 @@ android:allowBackup="false" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="false" - android:icon="@mipmap/ic_launcher2" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher2_round" android:supportsRtl="true" android:hardwareAccelerated="true" android:theme="@style/AppTheme" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0348f541b..067336286 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -100,9 +100,8 @@ android:allowBackup="false" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="false" - android:icon="@mipmap/ic_launcher2" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher2_round" android:supportsRtl="true" android:hardwareAccelerated="true" android:theme="@style/AppTheme" diff --git a/app/src/main/res/drawable/ic_launcher2_foreground.xml b/app/src/main/res/drawable-anydpi/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher2_foreground.xml rename to app/src/main/res/drawable-anydpi/ic_launcher_foreground.xml diff --git a/app/src/main/res/drawable-hdpi/app_icon.png b/app/src/main/res/drawable-hdpi/app_icon.png deleted file mode 100644 index 8f86071ee..000000000 Binary files a/app/src/main/res/drawable-hdpi/app_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/app_icon_novect.png b/app/src/main/res/drawable-hdpi/app_icon_novect.png deleted file mode 120000 index ef5958e92..000000000 --- a/app/src/main/res/drawable-hdpi/app_icon_novect.png +++ /dev/null @@ -1 +0,0 @@ -app_icon.png \ No newline at end of file diff --git a/app/src/main/res/drawable-mdpi/app_icon.png b/app/src/main/res/drawable-mdpi/app_icon.png deleted file mode 100644 index f432e8db3..000000000 Binary files a/app/src/main/res/drawable-mdpi/app_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/app_icon_novect.png b/app/src/main/res/drawable-mdpi/app_icon_novect.png deleted file mode 120000 index ef5958e92..000000000 --- a/app/src/main/res/drawable-mdpi/app_icon_novect.png +++ /dev/null @@ -1 +0,0 @@ -app_icon.png \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/app_icon.png b/app/src/main/res/drawable-xhdpi/app_icon.png deleted file mode 100644 index f295a5a22..000000000 Binary files a/app/src/main/res/drawable-xhdpi/app_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/app_icon_novect.png b/app/src/main/res/drawable-xhdpi/app_icon_novect.png deleted file mode 120000 index ef5958e92..000000000 --- a/app/src/main/res/drawable-xhdpi/app_icon_novect.png +++ /dev/null @@ -1 +0,0 @@ -app_icon.png \ No newline at end of file diff --git a/app/src/main/res/drawable-xxhdpi/app_icon.png b/app/src/main/res/drawable-xxhdpi/app_icon.png deleted file mode 100644 index ee1231857..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/app_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/app_icon_novect.png b/app/src/main/res/drawable-xxhdpi/app_icon_novect.png deleted file mode 120000 index ef5958e92..000000000 --- a/app/src/main/res/drawable-xxhdpi/app_icon_novect.png +++ /dev/null @@ -1 +0,0 @@ -app_icon.png \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher2_background.xml b/app/src/main/res/drawable/ic_launcher2_background.xml deleted file mode 100644 index 8bd903402..000000000 --- a/app/src/main/res/drawable/ic_launcher2_background.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher2.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher2.xml deleted file mode 100644 index a130eaee3..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher2_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher2_round.xml deleted file mode 100644 index a130eaee3..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher2_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 70% rename from mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to app/src/main/res/mipmap-anydpi/ic_launcher.xml index 6f3b755bf..0b0d585e4 100644 --- a/mesh_service_example/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher2.png b/app/src/main/res/mipmap-hdpi/ic_launcher2.png deleted file mode 100644 index 6bca632e5..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher2.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher2_round.png deleted file mode 100644 index 6915cc50a..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher2_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher2.png b/app/src/main/res/mipmap-mdpi/ic_launcher2.png deleted file mode 100644 index cb6cad39b..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher2.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher2_round.png deleted file mode 100644 index 917810c59..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher2_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher2.png b/app/src/main/res/mipmap-xhdpi/ic_launcher2.png deleted file mode 100644 index d42ae3ccc..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher2.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher2_round.png deleted file mode 100644 index 9a608c578..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher2_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher2.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher2.png deleted file mode 100644 index 618049278..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher2.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher2_round.png deleted file mode 100644 index 767a4d7e6..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher2_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher2_round.png deleted file mode 100644 index a66d98b03..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher2_round.png and /dev/null differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..351badbfe --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,19 @@ + + + #67ea94 + diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher2.png b/logo.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher2.png rename to logo.png diff --git a/mesh_service_example/src/main/AndroidManifest.xml b/mesh_service_example/src/main/AndroidManifest.xml index 58fcd216b..cfa4623bc 100644 --- a/mesh_service_example/src/main/AndroidManifest.xml +++ b/mesh_service_example/src/main/AndroidManifest.xml @@ -13,7 +13,6 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.MeshServiceExample" tools:targetApi="31" diff --git a/mesh_service_example/src/main/res/drawable/ic_launcher_background.xml b/mesh_service_example/src/main/res/drawable-anydpi/ic_launcher_background.xml similarity index 100% rename from mesh_service_example/src/main/res/drawable/ic_launcher_background.xml rename to mesh_service_example/src/main/res/drawable-anydpi/ic_launcher_background.xml diff --git a/mesh_service_example/src/main/res/drawable/ic_launcher_foreground.xml b/mesh_service_example/src/main/res/drawable-anydpi/ic_launcher_foreground.xml similarity index 100% rename from mesh_service_example/src/main/res/drawable/ic_launcher_foreground.xml rename to mesh_service_example/src/main/res/drawable-anydpi/ic_launcher_foreground.xml diff --git a/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ec..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1b..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da0..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070f..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f5083..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37c..000000000 Binary files a/mesh_service_example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ