Prepare for new update

maxrave-dev · Jun 29, 2024 · 76e6dc7 · 76e6dc7
1 parent 5d0aeec
commit 76e6dc7
Show file tree

Hide file tree

Showing 18 changed files with 283 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@
 - Spotify Canvas supported
 - Play video option with subtitle
 - AI suggest songs
+- Notification from followed artists
 - Caching and can save data for offline playback
 - Synced lyrics from Musixmatch, Spotify (require login) and YouTube Transcript and translated lyrics (Community translation from Musixmatch)
 - Personalize data (*) and multi-YouTube-account support
@@ -82,6 +83,59 @@ see [this](https://github.com/maxrave-dev/SimpMusic/blob/13f7ab6e5fa521b62a9fd31
 [![Crowdin](https://badges.crowdin.net/simpmusic/localized.svg)](https://crowdin.com/project/simpmusic)  
 You can help me translate this app into your language by using Crowdin [SimpMusic on Crowdin](https://crowdin.com/project/simpmusic)
 
+<details>
+
+  <summary>Top Contributors</summary>
+
+| Image | Username | Full Name | Language | Translated Words |
+|-------|----------|-----------|----------|------------------|
+| ![maxrave](https://crowdin-static.downloads.crowdin.com/avatar/14178407/medium/070e1d1286e9bb49bad0266a19315f12.jpeg) | maxrave | Minh (maxrave) | Arabic, Chinese Simplified, Chinese Traditional, Finnish, French, German, Indonesian, Italian, Japanese, Polish, Portuguese, Russian, Spanish (Modern), Turkish, Vietnamese,  | 4505 |
+| ![eric100lin](https://crowdin-static.downloads.crowdin.com/avatar/16329472/medium/e246dc09dd9034e20c4451a3e1d9e476.jpeg) | eric100lin | Eric Lin (Tzu Hsiang Lin) (eric100lin) | Chinese Traditional,  | 1128 |
+| ![AmrEraky](https://crowdin-static.downloads.crowdin.com/avatar/15904523/medium/87578e72fa90778859373c2319a603bd.png) | AmrEraky | AmrEraky | Arabic,  | 1112 |
+| ![clxf12](https://crowdin-static.downloads.crowdin.com/avatar/15817767/medium/7908bdeb8f8a9662a912dca8b6057e99.jpeg) | clxf12 | Clxff H3r4ld0 (clxf12) | Indonesian,  | 997 |
+| ![Cp0204](https://crowdin-static.downloads.crowdin.com/avatar/12904036/medium/61d5ff8ad17f02c74b25a4e3a6dd9f67_default.png) | Cp0204 | Cp0204 | Chinese Simplified,  | 982 |
+| ![komputerX](https://crowdin-static.downloads.crowdin.com/avatar/15913787/medium/02e80f2376c45924c26f24464aa77e4e.png) | komputerX | komputerX | Turkish,  | 979 |
+| ![andronedev](https://crowdin-static.downloads.crowdin.com/avatar/14635726/medium/56e04bb02ace2c8d4e1241e91354e4f4.png) | andronedev | andronedev | French,  | 945 |
+| ![Zbynius](https://crowdin-static.downloads.crowdin.com/avatar/16051900/medium/28695595dbebdfc36be1191ed8f0aacb.png) | Zbynius | Zbynius | Polish,  | 942 |
+| ![s.reszkojr](https://crowdin-static.downloads.crowdin.com/avatar/15131829/medium/07d7420c2d13bce1f7a6f11a02aec38e.png) | s.reszkojr | Fabio S. Reszko Jr. (s.reszkojr) | Portuguese,  | 854 |
+| ![FileX](https://crowdin-static.downloads.crowdin.com/avatar/16014929/medium/afc91f10a28a18a7b74676eda79d59e4_default.png) | FileX | FileX | German, Japanese,  | 844 |
+| ![teemue](https://crowdin-static.downloads.crowdin.com/avatar/13301586/medium/29845b9bc870769f9f447f1e09a38c8d.png) | teemue | teemue | Finnish,  | 829 |
+| ![AndresQO](https://crowdin-static.downloads.crowdin.com/avatar/16046670/medium/e5b809b41b6f6e25eafe404c94955c43.jpeg) | AndresQO | Miguel Quicaño (AndresQO) | Spanish (Modern),  | 770 |
+| ![Atuy1219](https://crowdin-static.downloads.crowdin.com/avatar/15747579/medium/86816e9e73cc890d6b4f7928369700a2_default.png) | Atuy1219 | Atuy (Atuy1219) | Japanese,  | 714 |
+| ![Ronner231](https://crowdin-static.downloads.crowdin.com/avatar/16021342/medium/7734d550df2de5a2fec2ffff33e7024c.jpeg) | Ronner231 | Ronner (Ronner231) | Russian,  | 650 |
+| ![BabyBenefactor](https://crowdin-static.downloads.crowdin.com/avatar/15977263/medium/6e2c41d65d0a3b0bde3190b4cd861fec.png) | BabyBenefactor | BabyBenefactor | Dutch,  | 481 |
+| ![gaker19](https://crowdin-static.downloads.crowdin.com/avatar/15722805/medium/a0648c617565e26011dc6e17b491f8b0.png) | gaker19 | gaker19 | Dutch, German,  | 385 |
+| ![ghostnear](https://crowdin-static.downloads.crowdin.com/avatar/14949851/medium/eb634c29f022de8fd90147a45b2b45d4_default.png) | ghostnear | ゴーストニアー (ghostnear) | Romanian,  | 328 |
+| ![MONE_FIERA](https://crowdin-static.downloads.crowdin.com/avatar/15626257/medium/a27bb4112166ef9877bb1765745e69eb_default.png) | MONE_FIERA | MONE_FIERA | Japanese,  | 198 |
+| ![Mora04](https://crowdin-static.downloads.crowdin.com/avatar/16291164/medium/d3b5acaf7706b7ddf497e9d55bf9d8bb.jpeg) | Mora04 | Santiago Moreno (Mora04) | Spanish (Modern),  | 164 |
+| ![bkrucarci](https://crowdin-static.downloads.crowdin.com/avatar/12412213/medium/607e1e98ba8d34da038d86f7a0bb07b7_default.png) | bkrucarci | Bekir UÇARCI (bkrucarci) | Turkish,  | 160 |
+| ![egpheel](https://crowdin-static.downloads.crowdin.com/avatar/16301586/medium/703735bada5f9aee60cf0eeaa4852679.jpeg) | egpheel | Eduardo Gil (egpheel) | Portuguese,  | 142 |
+| ![milena-kos](https://crowdin-static.downloads.crowdin.com/avatar/15891805/medium/0ebd3d7f628e42995270613db4992c68.jpeg) | milena-kos | Milenakos (milena-kos) | Russian,  | 136 |
+| ![stepersy](https://crowdin-static.downloads.crowdin.com/avatar/16198720/medium/b3b8d47d35498b04d293bf766d6e1842.jpeg) | stepersy | Stefano Persano Adorno (stepersy) | Italian,  | 123 |
+| ![siggi1984](https://crowdin-static.downloads.crowdin.com/avatar/15963157/medium/af6f94fe7cea3595b77a2a8b41433d03.png) | siggi1984 | siggi1984 | German,  | 97 |
+| ![espiondev](https://crowdin-static.downloads.crowdin.com/avatar/16248398/medium/0cad75225d2b737f3f0b9b0996b576f6.jpeg) | espiondev | Espion (espiondev) | French,  | 85 |
+| ![Paxsenix0](https://crowdin-static.downloads.crowdin.com/avatar/16048552/medium/870a6f6d49e3c325058aa88e55bac81b.jpeg) | Paxsenix0 | Alex (Paxsenix0) | Indonesian,  | 77 |
+| ![rikalaj](https://crowdin-static.downloads.crowdin.com/avatar/15079923/medium/317150e188196d6f8f4baa1a599acc65_default.png) | rikalaj | rikalaj | Finnish,  | 61 |
+| ![BrightDV](https://crowdin-static.downloads.crowdin.com/avatar/15021663/medium/ad932c65a6328c1da3c125b0a8119eac.png) | BrightDV | BrightDV | French,  | 55 |
+| ![RD3V](https://crowdin-static.downloads.crowdin.com/avatar/15973217/medium/dcd5a3a9ab51dc285ad89ded3cdb0c38.png) | RD3V | RD3V | Polish,  | 48 |
+| ![krist7169](https://crowdin-static.downloads.crowdin.com/avatar/14290958/medium/acd35924b7b6710b3890a369ff507153.jpeg) | krist7169 | Šimon Krištufek (krist7169) | Czech,  | 42 |
+| ![GeovaneDev](https://crowdin-static.downloads.crowdin.com/avatar/16119164/medium/a81e574f2dcbc6de7a8f10cc22c0fcb8.png) | GeovaneDev | Geovane (GeovaneDev) | Portuguese,  | 35 |
+| ![chatinteligence](https://crowdin-static.downloads.crowdin.com/avatar/16121068/medium/f8814b63a40d7335d8f3eaf5b3b0176a.jpg) | chatinteligence | neonhack (chatinteligence) | Spanish (Modern),  | 33 |
+| ![Egor418](https://crowdin-static.downloads.crowdin.com/avatar/15377634/medium/9ef6ca09b23addbc96c9e22009d50d25.jpeg) | Egor418 | Egor418 | Russian,  | 31 |
+| ![cstogmuller](https://crowdin-static.downloads.crowdin.com/avatar/15983147/medium/f668476225ef71b84c96917a1fac7426_default.png) | cstogmuller | cstogmuller | German,  | 30 |
+| ![REMOVED_USER](https://crowdin-static.downloads.crowdin.com/avatar/16214652/medium/c3b736a35e21d346ae618c6822cfc5bf_default.png) | REMOVED_USER | REMOVED_USER | Portuguese,  | 28 |
+| ![tralalax](https://crowdin-static.downloads.crowdin.com/avatar/15996263/medium/a801a853776ac5462ceb89d5baf242b2.jpg) | tralalax | tralalax | French,  | 27 |
+| ![hudiei52](https://crowdin-static.downloads.crowdin.com/avatar/13341742/medium/7628d04303020d499eaf5c7d4118ee2a.jpg) | hudiei52 | PH Pang (hudiei52) | Chinese Simplified,  | 19 |
+| ![haudek](https://crowdin-static.downloads.crowdin.com/avatar/13995011/medium/9d2ea24d044e08d8776f4ca474bed239.jpeg) | haudek | Maciej Haudek (haudek) | Polish,  | 6 |
+| ![bigstern54](https://crowdin-static.downloads.crowdin.com/avatar/16276884/medium/83ad048e5421d9b38257080fa6bb3ef2.png) | bigstern54 | big stern (bigstern54) | Russian,  | 5 |
+| ![tyy2750709](https://crowdin-static.downloads.crowdin.com/avatar/16346776/medium/158f91f3a723d7b5ff2a873e70ea072f.png) | tyy2750709 | yyin tao (tyy2750709) | Chinese Simplified,  | 4 |
+| ![chrisarabagas](https://crowdin-static.downloads.crowdin.com/avatar/16215132/medium/41aa129c66e8d728b513990478711bf6.png) | chrisarabagas | Argo Carpathians (chrisarabagas) | Indonesian,  | 2 |
+| ![enescelikbas873](https://crowdin-static.downloads.crowdin.com/avatar/16220370/medium/6ebf150736d25e875a5d9bb464cfebac.png) | enescelikbas873 | Enes Çelikbaş (enescelikbas873) | Turkish,  | 2 |
+| ![davidevol](https://crowdin-static.downloads.crowdin.com/avatar/14878728/medium/3026648aea7853e299fc782ff8bb9b2c.jpg) | davidevol | David (davidevol) | Portuguese,  | 2 |
+| ![sujitfg1](https://crowdin-static.downloads.crowdin.com/avatar/16084474/medium/7c23adcfa96e3791f8cbc4a1a4518c10.png) | sujitfg1 | sujitfg1 | Hindi,  | 1 |
+
+</details>
+
 ## FAQ
 
 #### 1. Wrong Lyrics?

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.maxrave.simpmusic"
         minSdk = 26
         targetSdk = 34
-        versionCode = 17
-        versionName = "0.2.1"
+        versionCode = 18
+        versionName = "0.2.2"
         vectorDrawables.useSupportLibrary = true
 
         ksp {

diff --git a/app/src/main/java/com/maxrave/simpmusic/viewModel/SharedViewModel.kt b/app/src/main/java/com/maxrave/simpmusic/viewModel/SharedViewModel.kt
@@ -833,7 +833,7 @@ constructor(
     private fun getSavedLyrics(track: Track) {
         viewModelScope.launch {
             resetLyrics()
-            mainRepository.getSavedLyrics(track.videoId).collect { lyrics ->
+            mainRepository.getSavedLyrics(track.videoId).cancellable().collect { lyrics ->
                 if (lyrics != null) {
                     _lyricsProvider.value = LyricsProvider.OFFLINE
                     _lyrics.value = Resource.Success(lyrics.toLyrics())
@@ -843,7 +843,7 @@ constructor(
                 } else {
                     resetLyrics()
                     mainRepository.getLyricsData(track.artists.toListName().firstOrNull() ?: "", track.title, track.durationSeconds)
-                        .collect { response ->
+                        .cancellable().collect { response ->
                             _lyrics.value = response.second
                             when (_lyrics.value) {
                                 is Resource.Success -> {
@@ -854,7 +854,7 @@ constructor(
                                         )
                                         parseLyrics(_lyrics.value?.data)
                                         if (dataStoreManager.enableTranslateLyric.first() == TRUE) {
-                                            mainRepository.getTranslateLyrics(response.first)
+                                            mainRepository.getTranslateLyrics(response.first).cancellable()
                                                 .collect { translate ->
                                                     if (translate != null) {
                                                         _translateLyrics.value =
@@ -1607,7 +1607,7 @@ constructor(
                                             if (dataStoreManager.enableTranslateLyric.first() == TRUE) {
                                                 mainRepository.getTranslateLyrics(
                                                     response.first,
-                                                )
+                                                ).cancellable()
                                                     .collect { translate ->
                                                         if (translate != null) {
                                                             _translateLyrics.value =
@@ -1710,7 +1710,7 @@ constructor(
     ) {
         viewModelScope.launch {
             Log.d("Check SpotifyLyrics", "SpotifyLyrics $query")
-            mainRepository.getSpotifyLyrics(query, duration).collect { response ->
+            mainRepository.getSpotifyLyrics(query, duration).cancellable().collect { response ->
                 Log.d("Check SpotifyLyrics", response.toString())
                 _lyrics.value = response
                 when (response) {

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -187,7 +187,7 @@
     <string name="preview">استعراض</string>
     <string name="music_off_topic">موسيقى خارج الموضوع</string>
     <string name="poi_highlight">تسليط الضوء على النقاط الهامة</string>
-    <string name="filler">تصفية</string>
+    <string name="filler">فلتر</string>
     <string name="sponsorBlock">SponsorBlock</string>
     <string name="enable_sponsor_block">تمكين SponsorBlock</string>
     <string name="categories_sponsor_block">حدد سلوك تخطي الجزء</string>
@@ -323,15 +323,16 @@
     <string name="guide_miniplayer_content">اسحب لإظهار زر تخطي وإغلاق</string>
     <string name="guide_suggest_content">إظهار الأغاني المقترحة بواسطة الذكاء الاصطناعي استنادًا إلى قوائم التشغيل الخاصة بك</string>
     <string name="guide_liked_title">تمت الإضافة إلى إعجابات YouTube قوائم التشغيل</string>
-    <string name="log_out_from_spotify">Log out from Spotify</string>
-    <string name="delete">Delete</string>
-    <string name="top_videos">Top videos</string>
-    <string name="trending">Trending</string>
-    <string name="new_singles">New singles</string>
-    <string name="new_albums">New albums</string>
-    <string name="notification">Notification</string>
-    <string name="month_s_ago">%1$d month(s) ago</string>
-    <string name="day_s_ago">%1$d day(s) ago</string>
-    <string name="hour_s_ago">%1$d hour(s) ago</string>
-    <string name="no_notification">No notification</string>
+    <string name="log_out_from_spotify">تسجيل الخروج من Spotify</string>
+    <string name="delete">حذف</string>
+    <string name="top_videos">أعلى الفيديوهات</string>
+    <string name="trending">الشائع</string>
+    <string name="new_singles">الفردي الجديد</string>
+    <string name="new_albums">ألبوم جديد</string>
+    <string name="notification">إشعار</string>
+    <string name="month_s_ago">منذ %1$d اشهر</string>
+    <string name="day_s_ago">منذ %1$d يوم</string>
+    <string name="hour_s_ago">منذ %1$d ساعة</string>
+    <string name="no_notification">لا إشعارات</string>
+    <string name="created_at">تم الانشاء في %1$s</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hant+TW/strings.xml b/app/src/main/res/values-b+zh+Hant+TW/strings.xml
@@ -187,7 +187,7 @@
     <string name="preview">預覽</string>
     <string name="music_off_topic">相關音樂</string>
     <string name="poi_highlight">POI熱門</string>
-    <string name="filler">背景音樂</string>
+    <string name="filler">篩選器</string>
     <string name="sponsorBlock">SponsorBlock</string>
     <string name="enable_sponsor_block">啟用 SponsorBlock</string>
     <string name="categories_sponsor_block">選擇跳過段行為</string>
@@ -329,4 +329,5 @@
     <string name="day_s_ago">%1$d天前</string>
     <string name="hour_s_ago">%1$d小時前</string>
     <string name="no_notification">沒有通知</string>
-</resources>
+    <string name="created_at">建立於：%1$s</string>
+</resources>