From b29db5cbde952f18308f2922a260f6ce009b0068 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Sun, 18 Sep 2022 22:28:47 +0530 Subject: [PATCH 1/3] Change app icon to our custom icon --- res/drawable/ic_launcher_background.xml | 41 +++++++++++++------ res/drawable/ic_launcher_foreground.xml | 53 +++++++++++++------------ res/drawable/ic_launcher_monochrome.xml | 15 ------- res/mipmap-anydpi/ic_launcher.xml | 22 +++++++--- 4 files changed, 73 insertions(+), 58 deletions(-) delete mode 100644 res/drawable/ic_launcher_monochrome.xml diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index 3275d87d..5ec6d629 100644 --- a/res/drawable/ic_launcher_background.xml +++ b/res/drawable/ic_launcher_background.xml @@ -1,22 +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/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index ce461bc0..2924aa5e 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,34 +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 . + --> - - - - - - - - - - - - + + + + + + + + diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index 37fc89bc..00000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index b58c81ff..5afc3d88 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/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 734d44f7628e5700959c2ed4e16b4f0e8e03b193 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 11 Oct 2022 14:54:29 +0530 Subject: [PATCH 2/3] Theme app according to our palette --- Android.bp | 1 + res/drawable/playlist_icon.xml | 2 +- res/drawable/recent_icon.xml | 2 +- res/drawable/recently_added.xml | 2 +- res/drawable/stopwatch_icon_white.xml | 2 +- res/drawable/top_tracks_icon.xml | 2 +- res/layout/activity_album_detail.xml | 1 + res/layout/activity_audio_preview.xml | 4 +++- res/layout/album_detail_song.xml | 1 + res/layout/artist_detail_song.xml | 3 ++- res/layout/list_item_common.xml | 1 + res/values-night/colors.xml | 28 --------------------------- res/values-night/styles.xml | 3 ++- res/values/colors.xml | 28 +++++++++++++-------------- res/values/styles.xml | 12 ++++++++++-- 15 files changed, 40 insertions(+), 52 deletions(-) diff --git a/Android.bp b/Android.bp index c07ea544..b8d0cb54 100644 --- a/Android.bp +++ b/Android.bp @@ -34,6 +34,7 @@ android_app { "androidx.palette_palette", "androidx.preference_preference", "androidx.recyclerview_recyclerview", + "elib", ], overrides: ["Music"], diff --git a/res/drawable/playlist_icon.xml b/res/drawable/playlist_icon.xml index 7e87ba76..c2306cf9 100644 --- a/res/drawable/playlist_icon.xml +++ b/res/drawable/playlist_icon.xml @@ -8,6 +8,6 @@ diff --git a/res/drawable/recent_icon.xml b/res/drawable/recent_icon.xml index 39581a60..9c6b8d6b 100644 --- a/res/drawable/recent_icon.xml +++ b/res/drawable/recent_icon.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/stopwatch_icon_white.xml b/res/drawable/stopwatch_icon_white.xml index 6d77f334..0e83ff38 100644 --- a/res/drawable/stopwatch_icon_white.xml +++ b/res/drawable/stopwatch_icon_white.xml @@ -8,7 +8,7 @@ diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml index 24884b95..8929967b 100644 --- a/res/layout/activity_album_detail.xml +++ b/res/layout/activity_album_detail.xml @@ -68,6 +68,7 @@ android:layout_alignBottom="@+id/duration" android:layout_marginEnd="4dp" android:gravity="center" + android:tint="@color/accent" android:src="@drawable/stopwatch_icon_small_grey" /> + android:layout_height="@dimen/preview_layout_seekbar_height" + android:thumbTint="@color/e_accent" + android:progressTint="@color/e_accent" /> diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml index 66611a43..258dde52 100644 --- a/res/layout/artist_detail_song.xml +++ b/res/layout/artist_detail_song.xml @@ -33,6 +33,7 @@ android:id="@+id/overflow" android:layout_width="@dimen/overflow_width" android:layout_height="@dimen/overflow_height" + android:tint="@color/e_icon_color" android:src="@drawable/menu_button" /> @@ -62,4 +63,4 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:src="@drawable/inset_list_divider" /> - \ No newline at end of file + diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml index 41356c48..5b36baad 100644 --- a/res/layout/list_item_common.xml +++ b/res/layout/list_item_common.xml @@ -76,6 +76,7 @@ android:layout_width="@dimen/overflow_width" android:layout_height="@dimen/overflow_height" android:background="?android:selectableItemBackgroundBorderless" + android:tint="@color/e_icon_color" android:src="@drawable/menu_button" /> diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 01aa44d4..b818ee98 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -15,40 +15,12 @@ limitations under the License. --> - - #212121 - #121212 - #1ddbc5 - - - @color/white - @color/white - #333333 - - #121212 - @color/black - - @color/white - @color/default_text_color_light - - - @color/black - #ea212121 - - - @color/white - - - @color/white - - - @color/black diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml index 60c7e441..17471418 100644 --- a/res/values-night/styles.xml +++ b/res/values-night/styles.xml @@ -26,12 +26,13 @@ @style/ActionBar @style/ActionBarWidgetTheme @color/primary - @color/primary + @color/e_background @color/primary_dark @color/accent true false false + @color/primary + + - + -- GitLab From 1646cb9e4b90ce45ea83e363aa72e9dd7539cdc7 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 22 Mar 2023 17:13:35 +0530 Subject: [PATCH 3/3] Port translation changes from Android S --- res/values-fr/strings.xml | 7 ++++--- res/values-nl/strings.xml | 5 ++--- res/values-ru/strings.xml | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index c92a61db..3193709c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -15,8 +15,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. ---> - +--> Musique Artistes Albums @@ -136,4 +135,6 @@ Plus de 5 albums "Autres" %1$s %2$s - + La permission d\'enregistrer des contenus audio a été refusée, activez-la depuis les Paramètres du téléphone pour afficher les animations musicales. + Lecture de la musique + \ No newline at end of file diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 7263f55e..168ffd8e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -15,8 +15,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. ---> - +--> Muziek Artiesten Albums @@ -138,4 +137,4 @@ "Overig" %1$s %2$s Muziek afspelen - + \ No newline at end of file diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 015b47b2..5cec19af 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -15,8 +15,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. ---> - +--> Музыка Исполнители Альбомы @@ -138,4 +137,4 @@ "Другие" %1$s %2$s Воспроизведение музыки - + \ No newline at end of file -- GitLab