From 6ad779207d79246210c9522b095794cb3a0ab5e1 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Mon, 5 Sep 2022 20:33:48 +0530 Subject: [PATCH 1/2] Change app icon to our custom icon --- .../res/drawable/ic_launcher_background.xml | 42 ++++++++---- .../res/drawable/ic_launcher_foreground.xml | 66 ++++++++++++------- .../main/res/mipmap-anydpi/ic_launcher.xml | 25 +++++-- 3 files changed, 89 insertions(+), 44 deletions(-) diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index ae40d16..faea79d 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,23 +1,37 @@ + ~ Copyright ECORP SAS 2022 + ~ 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 . + --> - - - + android:pathData="M0,0h108v108h-108z"> + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 501e379..49a25ac 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,33 +1,51 @@ + ~ Copyright ECORP SAS 2022 + ~ 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 . + --> - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml index 3d90bc5..25f9cfa 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -1,9 +1,22 @@ + ~ Copyright ECORP SAS 2022 + ~ 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 . + --> - - - + + + + + \ No newline at end of file -- GitLab From 5026382d40b2dd1e69ae6101fe037d307516ec6d Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 15 Sep 2022 19:47:40 +0530 Subject: [PATCH 2/2] Theme app according to our palette --- app/src/main/Android.bp | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/values-night-v31/colors.xml | 6 ++--- app/src/main/res/values-v31/colors.xml | 6 ++--- app/src/main/res/values/styles.xml | 24 +++++++++++++++++--- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/app/src/main/Android.bp b/app/src/main/Android.bp index 843cc7a..bc8a6ac 100644 --- a/app/src/main/Android.bp +++ b/app/src/main/Android.bp @@ -32,7 +32,7 @@ android_app { "androidx-constraintlayout_constraintlayout-solver", "androidx.appcompat_appcompat", "androidx.recyclerview_recyclerview", - "com.google.android.material_material", + "elib", ], sdk_version: "current", diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8b7677f..5ff17d6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -54,7 +54,7 @@ android:clipToPadding="false" android:contentDescription="@string/main_sound_action" android:src="@drawable/ic_action_record" - app:fabCustomSize="96dp" + app:fabCustomSize="72dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml index 88232cc..2fbae26 100644 --- a/app/src/main/res/values-night-v31/colors.xml +++ b/app/src/main/res/values-night-v31/colors.xml @@ -14,7 +14,7 @@ limitations under the License. --> - @android:color/system_neutral1_900 - @android:color/system_neutral1_900 - @android:color/system_accent1_100 + @color/e_action_bar + @color/e_action_bar + @color/e_accent diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml index 96732af..2fbae26 100644 --- a/app/src/main/res/values-v31/colors.xml +++ b/app/src/main/res/values-v31/colors.xml @@ -14,7 +14,7 @@ limitations under the License. --> - @android:color/system_neutral1_50 - @android:color/system_neutral1_50 - @android:color/system_accent1_600 + @color/e_action_bar + @color/e_action_bar + @color/e_accent diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cfa64af..1c673d9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,7 +20,10 @@ @color/colorPrimaryDark @color/colorAccent true - true + @color/e_background + @style/Dialog + @color/e_primary_text_color + @color/e_secondary_text_color + + -- GitLab