From 901ebb7410783b639fc0bea233223c2d7cd69a27 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Mon, 5 Sep 2022 20:33:48 +0530 Subject: [PATCH 1/3] Change app icon to our custom icon --- .../res/drawable/ic_launcher_background.xml | 42 ++++++++---- .../res/drawable/ic_launcher_foreground.xml | 66 ++++++++++++------- .../res/drawable/ic_launcher_monochrome.xml | 23 ------- .../main/res/mipmap-anydpi/ic_launcher.xml | 24 +++++-- 4 files changed, 88 insertions(+), 67 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_launcher_monochrome.xml 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/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index 588536f..0000000 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml index b58c81f..d24a0f7 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -1,10 +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 . + --> - - - + + + + -- GitLab From 7b640e88a54a999a2231b6e3538519d473fc123c Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 15 Sep 2022 19:47:40 +0530 Subject: [PATCH 2/3] 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 From d71ebb41707e3396c244672074daac421c648622 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 22 Mar 2023 17:47:38 +0530 Subject: [PATCH 3/3] Port translation changes from Android S --- app/src/main/res/values-es/strings.xml | 32 +++++++++++++++++++++++--- app/src/main/res/values-fr/strings.xml | 5 ++-- app/src/main/res/values-nl/strings.xml | 7 +++--- app/src/main/res/values-ru/strings.xml | 7 +++--- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8edc009..7e37e7a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -12,8 +12,7 @@ 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. ---> - +--> Grabadora Compartir Detener @@ -35,4 +34,31 @@ Descartar Permisos necesarios denegados, actívelos desde la aplicación de Ajustes para iniciar la grabación Grabar sonido - + ¿Estás seguro de que quieres borrar las grabaciones seleccionadas\? Esto no se puede deshacer + Eliminar seleccionados + ¿Estás seguro de que quieres borrar todas las grabaciones\? Esto no se puede deshacer + Eliminar todo + Más acciones + Cambiar + Editar nombre de grabación + Todas tus grabaciones se mostrarán aquí + Mis grabaciones + El permiso de localización ha sido denegado, habilítalo desde la aplicación Ajustes para etiquetar tus grabaciones + La grabadora necesita permiso de ubicación para etiquetar automáticamente tus grabaciones y ayudarte a organizarlas + Grabar en alta calidad + Etiqueta tus grabaciones con tu posición actual + Pausado + ¿Quieres utilizar la última grabación\? + ¿Utilizar grabación\? + Grabar de nuevo + Descartar + Confirmar + ¿Estás seguro de que quieres borrar esta grabación\? No se puede deshacer + Renombrar + Eliminar todo + Eliminar seleccionados + Reanudar + Pausa + Compartir seleccionados + Ajustes + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 95f05f1..c0350bc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -12,8 +12,7 @@ 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. ---> - +--> Magnétophone Partager Partager la sélection @@ -62,4 +61,4 @@ Êtes-vous sûr de vouloir supprimer tous les enregistrements ? Cette action est irréversible Supprimer la sélection Êtes-vous sûr de vouloir supprimer les enregistrements sélectionnés ? Cette action est irréversible - + \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 88d42bc..df3d63c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -12,8 +12,7 @@ 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. ---> - +--> Recorder Delen Selectie delen @@ -29,7 +28,7 @@ Opname verwijderen Weet u zeker dat u deze opname wilt verwijderen? Dit kan niet ongedaan worden gemaakt Bevestig - Negeer + Verwerpen Neem opnieuw op Opname gebruiken? Wilt u de laatste opname gebruiken? @@ -66,4 +65,4 @@ Weet u zeker dat u alle opnames wilt verwijderen? Dit kan niet ongedaan worden gemaakt Selectie verwijderen Weet u zeker dat u de geselecteerde opnames wilt verwijderen? Dit kan niet ongedaan worden gemaakt - + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index acbd7ec..41688b4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -12,10 +12,9 @@ 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. ---> - +--> Рекордер - Отправить + Поделиться Поделиться выбранным Остановить Воспроизвести @@ -66,4 +65,4 @@ Вы уверены, что хотите удалить все записи? Действие не может быть отменено Удалить выбранное Вы уверены, что хотите выбранные записи? Действие не может быть отменено - + \ No newline at end of file -- GitLab