Merge pull request #139 from 577fkj/Dev

## 4.0.0 - 添加时间共存的功能 - 添加伪时间/自定义文字的功能 - 更改 UI - 更改包名 - 删除仅循环一次的功能 - 删除彩蛋 - 优化 UI - 优化代码
Block-Network · Feb 3, 2022 · 4ae041a · 4ae041a
2 parents f780bd1 + 0e6f418
commit 4ae041a
Show file tree

Hide file tree

Showing 134 changed files with 3,764 additions and 2,065 deletions.
diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
@@ -60,19 +60,19 @@ jobs:
       - name: Upload Release APK
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_release
+          name: StatusBarLyric_release
           path: ${{ steps.sign_release.outputs.signedReleaseFile }}
 
       - name: Upload Debug APK
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_debug
+          name: StatusBarLyric_debug
           path: ${{ steps.sign_debug.outputs.signedReleaseFile }}
 
       - name: Upload Release Mapping
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_release_mapping
+          name: StatusBarLyric_release_mapping
           path: ./app/build/outputs/mapping/release/mapping.txt
 
       - name: Post to channel

diff --git a/.github/workflows/Android_Canary.yml b/.github/workflows/Android_Canary.yml
@@ -60,19 +60,19 @@ jobs:
       - name: Upload Release APK
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_release
+          name: StatusBarLyric_release
           path: ${{ steps.sign_release.outputs.signedReleaseFile }}
 
       - name: Upload Debug APK
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_debug
+          name: StatusBarLyric_debug
           path: ${{ steps.sign_debug.outputs.signedReleaseFile }}
 
       - name: Upload Release Mapping
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_release_mapping
+          name: StatusBarLyric_release_mapping
           path: ./app/build/outputs/mapping/release/mapping.txt
 
       - name: Post to channel

diff --git a/.github/workflows/Android_Dev.yml b/.github/workflows/Android_Dev.yml
@@ -60,19 +60,19 @@ jobs:
       - name: Upload Release APK
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_release
+          name: StatusBarLyric_release
           path: ${{ steps.sign_release.outputs.signedReleaseFile }}
 
       - name: Upload Debug APK
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_debug
+          name: StatusBarLyric_debug
           path: ${{ steps.sign_debug.outputs.signedReleaseFile }}
 
       - name: Upload Release Mapping
         uses: actions/upload-artifact@v2
         with:
-          name: MIUIStatusBarLyric_release_mapping
+          name: StatusBarLyric_release_mapping
           path: ./app/build/outputs/mapping/release/mapping.txt
 
       - name: Post to channel

diff --git a/.github/workflows/Android_Kotlin.yml b/.github/workflows/Android_Kotlin.yml
diff --git a/README.md b/README.md
@@ -2,16 +2,16 @@
 
 <div align="center">
 
-![Release Download](https://img.shields.io/github/downloads/577fkj/MIUIStatusBarLyric/total?style=flat-square)
-[![Release Version](https://img.shields.io/github/v/release/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/releases/latest)
-[![GitHub license](https://img.shields.io/github/license/577fkj/MIUIStatusBarLyric?style=flat-square)](LICENSE)
-[![GitHub Star](https://img.shields.io/github/stars/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/stargazers)
-[![GitHub Fork](https://img.shields.io/github/forks/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/network/members)
-![GitHub Repo size](https://img.shields.io/github/repo-size/577fkj/MIUIStatusBarLyric?style=flat-square&color=3cb371)
-[![GitHub Repo Languages](https://img.shields.io/github/languages/top/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/search?l=java)
-
-[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2F577fkj%2FMIUIStatusBarLyric%2Fbadge%3Fref%3Dmain&style=flat)](https://actions-badge.atrox.dev/577fkj/MIUIStatusBarLyric/goto?ref=main)
-[![GitHub Star](https://img.shields.io/github/stars/577fkj/MIUIStatusBarLyric.svg?style=social)](https://github.com/577fkj/MIUIStatusBarLyric)
+![Release Download](https://img.shields.io/github/downloads/577fkj/StatusBarLyric/total?style=flat-square)
+[![Release Version](https://img.shields.io/github/v/release/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/releases/latest)
+[![GitHub license](https://img.shields.io/github/license/577fkj/StatusBarLyric?style=flat-square)](LICENSE)
+[![GitHub Star](https://img.shields.io/github/stars/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/stargazers)
+[![GitHub Fork](https://img.shields.io/github/forks/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/network/members)
+![GitHub Repo size](https://img.shields.io/github/repo-size/577fkj/StatusBarLyric?style=flat-square&color=3cb371)
+[![GitHub Repo Languages](https://img.shields.io/github/languages/top/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/search?l=java)
+
+[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2F577fkj%2FStatusBarLyric%2Fbadge%3Fref%3Dmain&style=flat)](https://actions-badge.atrox.dev/577fkj/StatusBarLyric/goto?ref=main)
+[![GitHub Star](https://img.shields.io/github/stars/577fkj/StatusBarLyric.svg?style=social)](https://github.com/577fkj/StatusBarLyric)
 [![电报群](https://img.shields.io/badge/电报群-MIUIStatusBatLyric-blue.svg?style=flat-square&color=12b7f5)](https://t.me/MIUIStatusBatLyric)
 [![QQ群](https://img.shields.io/badge/QQ群-884185860-blue.svg?style=flat-square&color=12b7f5)](https://qm.qq.com/cgi-bin/qm/qr?k=ea_MP7zFoZJEdpxDFQcadBdbZmwYXZHh&jump_from=webapi)
 [![爱发电](https://img.shields.io/badge/爱发电-@xiao_wine-blue.svg?style=flat-square&color=12b7f5)](https://afdian.net/@xiao_wine)
@@ -26,17 +26,7 @@
 
 ## 支持的音乐软件版本
 
-- [APlayer](https://github.com/rRemix/APlayer) 未知 ~ 1.5.7.9
-- __QQ音乐__ 未知 ~ 11.0.16
-- __咪咕音乐__ 未知 ~ 7.7.0
-- __网易云音乐__ 7.2.21 ~ 8.6.40
-- __魅族音乐__ 未知 ~ 未知
-- __酷狗音乐__ 未知 ~ 11.0.2
-- __酷我音乐__ 未知 ~ 10.0.4.9
-
-### 应用主动适配
-
-- __[椒盐音乐](https://github.com/Moriafly/SaltPlayerSource)__ 4.5 ~ 现今
+- __请查看模块内的使用说明__
 
 ## 感谢名单（不分先后）
 
@@ -49,10 +39,10 @@
 
 ### 下载
 
-- [Releases](https://github.com/577fkj/MIUIStatusBarLyric/releases)
-- [酷安](https://www.coolapk.com/apk/miui.statusbar.lyric)
-- [Beta](https://github.com/577fkj/MIUIStatusBarLyric/actions/workflows/Android.yml)
-- [Canary](https://github.com/577fkj/MIUIStatusBarLyric/actions/workflows/Android_Dev.yml)
+- [Releases](https://github.com/577fkj/StatusBarLyric/releases)
+- [酷安](https://www.coolapk.com/apk/cn.fkj233.xposed.statusbarlyric)
+- [Beta](https://github.com/577fkj/StatusBarLyric/actions/workflows/Android.yml)
+- [Canary](https://github.com/577fkj/StatusBarLyric/actions/workflows/Android_Dev.yml)
 
 ### 使用教程
 
@@ -62,18 +52,19 @@
 
 - [QQ交流群](https://jq.qq.com/?_wv=1027&amp;k=KQeQjgsv)
 - [电报](https://t.me/MIUIStatusBatLyric)
-- [酷安](https://www.coolapk.com/apk/miui.statusbar.lyric)
-- [BUG反馈(Github)](https://github.com/577fkj/MIUIStatusBarLyric/issues/new)
+- [酷安](https://www.coolapk.com/apk/cn.fkj233.xposed.statusbarlyric)
+- [BUG反馈(Github)](https://github.com/577fkj/StatusBarLyric/issues/new)
 
 ## 音乐主动适配
 
 请查看 [Api](https://github.com/577fkj/StatusBarApiExample)
 
-## 贡献
 
-[贡献](doc/CONTRIBUTING.md)
+## 贡献
 
-[赞助列表](doc/SPONSOR.md)
+[想做贡献？](doc/CONTRIBUTING.md)  
+[合作名单](doc/Cooperate.md)   
+[赞助列表](doc/SPONSOR.md)  
 
 <img height="400px" src="./images/3to1.jpg" />
 

diff --git a/README_EN.md b/README_EN.md
@@ -2,16 +2,16 @@
 
 <div align="center">
 
-![Release Download](https://img.shields.io/github/downloads/577fkj/MIUIStatusBarLyric/total?style=flat-square)
-[![Release Version](https://img.shields.io/github/v/release/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/releases/latest)
-[![GitHub license](https://img.shields.io/github/license/577fkj/MIUIStatusBarLyric?style=flat-square)](LICENSE)
-[![GitHub Star](https://img.shields.io/github/stars/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/stargazers)
-[![GitHub Fork](https://img.shields.io/github/forks/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/network/members)
-![GitHub Repo size](https://img.shields.io/github/repo-size/577fkj/MIUIStatusBarLyric?style=flat-square&color=3cb371)
-[![GitHub Repo Languages](https://img.shields.io/github/languages/top/577fkj/MIUIStatusBarLyric?style=flat-square)](https://github.com/577fkj/MIUIStatusBarLyric/search?l=java)
-
-[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2F577fkj%2FMIUIStatusBarLyric%2Fbadge%3Fref%3Dmain&style=flat)](https://actions-badge.atrox.dev/577fkj/MIUIStatusBarLyric/goto?ref=main)
-[![GitHub Star](https://img.shields.io/github/stars/577fkj/MIUIStatusBarLyric.svg?style=social)](https://github.com/577fkj/MIUIStatusBarLyric)
+![Release Download](https://img.shields.io/github/downloads/577fkj/StatusBarLyric/total?style=flat-square)
+[![Release Version](https://img.shields.io/github/v/release/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/releases/latest)
+[![GitHub license](https://img.shields.io/github/license/577fkj/StatusBarLyric?style=flat-square)](LICENSE)
+[![GitHub Star](https://img.shields.io/github/stars/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/stargazers)
+[![GitHub Fork](https://img.shields.io/github/forks/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/network/members)
+![GitHub Repo size](https://img.shields.io/github/repo-size/577fkj/StatusBarLyric?style=flat-square&color=3cb371)
+[![GitHub Repo Languages](https://img.shields.io/github/languages/top/577fkj/StatusBarLyric?style=flat-square)](https://github.com/577fkj/StatusBarLyric/search?l=java)
+
+[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2F577fkj%2FStatusBarLyric%2Fbadge%3Fref%3Dmain&style=flat)](https://actions-badge.atrox.dev/577fkj/StatusBarLyric/goto?ref=main)
+[![GitHub Star](https://img.shields.io/github/stars/577fkj/StatusBarLyric.svg?style=social)](https://github.com/577fkj/StatusBarLyric)
 [![Telegram](https://img.shields.io/badge/Telegram-MIUIStatusBatLyric-blue.svg?style=flat-square&color=12b7f5)](https://t.me/MIUIStatusBatLyric)
 [![QQ Group](https://img.shields.io/badge/QQ%20Group-884185860-blue.svg?style=flat-square&color=12b7f5)](https://qm.qq.com/cgi-bin/qm/qr?k=ea_MP7zFoZJEdpxDFQcadBdbZmwYXZHh&jump_from=webapi)
 
@@ -25,17 +25,7 @@
 
 ## Supported Music app versions
 
-- __[APlayer](https://github.com/rRemix/APlayer)__ Unknown ~ 1.5.7.9
-- __QQ Music__ unknown ~ 11.0.16
-- __Migu Music__ Unknown ~ 7.7.0
-- __Netease Music__ 7.22.1 ~ 8.6.40
-- __Meizu Music__ Unknown ~ Unknown
-- __Kugou Music__ Unknown ~ 11.0.2
-- __Kuwo Music__ Unknown ~ 10.0.4.9
-
-### App active adaptation
-
-- __[SaltPlayer](https://github.com/Moriafly/SaltPlayerSource)__：4.5 ~ now
+- __Please check the instructions in the module__
 
 ## Thanks list（In no particular order）
 
@@ -48,27 +38,27 @@
 
 ### Downloads
 
-- [Releases](https://github.com/577fkj/MIUIStatusBarLyric/releases)
-- [CoolAPK](https://www.coolapk.com/apk/miui.statusbar.lyric)
-- [Beta](https://github.com/577fkj/MIUIStatusBarLyric/actions/workflows/Android.yml)
-- [Canary](https://github.com/577fkj/MIUIStatusBarLyric/actions/workflows/Android_Dev.yml)
+- [Releases](https://github.com/577fkj/StatusBarLyric/releases)
+- [CoolAPK](https://www.coolapk.com/apk/cn.fkj233.xposed.statusbarlyric)
+- [Beta](https://github.com/577fkj/StatusBarLyric/actions/workflows/Android.yml)
+- [Canary](https://github.com/577fkj/StatusBarLyric/actions/workflows/Android_Dev.yml)
 
 ### contact us
 
 - [QQ Group](https://jq.qq.com/?_wv=1027&amp;k=KQeQjgsv)
 - [Telegram](https://t.me/MIUIStatusBatLyric)
-- [CoolAPK](https://www.coolapk.com/apk/miui.statusbar.lyric)
-- [BUG feedback (Github)](https://github.com/577fkj/MIUIStatusBarLyric/issues/new)
+- [CoolAPK](https://www.coolapk.com/apk/cn.fkj233.xposed.statusbarlyric)
+- [BUG feedback (Github)](https://github.com/577fkj/StatusBarLyric/issues/new)
 
 ## App active adaptation
 
 please check [Api](https://github.com/577fkj/StatusBarApiExample)
 
 ## Contributing
 
-[Contributing](doc/CONTRIBUTING_EN.md)
-
-[Sponsorship list](doc/SPONSOR.md)
+[Want to contribute?](doc/CONTRIBUTING_EN.md)  
+[Cooperate Lists](doc/Cooperate.md)  
+[Sponsorship list](doc/SPONSOR.md)  
 
 <img height="400px" src="./images/3to1.jpg" />
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -9,11 +9,11 @@ android {
     compileSdk = 32
 
     defaultConfig {
-        applicationId = "miui.statusbar.lyric"
+        applicationId = "statusbar.lyric"
         minSdk = 26
         targetSdk = 32
-        versionCode = 83
-        versionName = "3.56.25"
+        versionCode = 100
+        versionName = "4.0.0"
         aaptOptions.cruncherEnabled = false
         aaptOptions.useNewCruncher = false
     }
@@ -36,6 +36,9 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
     packagingOptions {
         resources {
             excludes += "/META-INF/**"
@@ -47,9 +50,13 @@ android {
             useLegacyPackaging = true
         }
     }
+    buildFeatures {
+        viewBinding = true
+    }
     applicationVariants.all {
         outputs.all {
-            (this as BaseVariantOutputImpl).outputFileName = "StatusBarLyric-$versionName($versionCode)-$name.apk"
+            (this as BaseVariantOutputImpl).outputFileName =
+                "StatusBarLyric-$versionName($versionCode)-$name.apk"
         }
     }
 }
@@ -65,5 +72,6 @@ dependencies {
     val appCenterSdkVersion = "4.4.2"
     implementation("com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}")
     implementation("com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}")
-
-}
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
+    implementation(project(":miui"))
+}