Release 0.4.3

z-huang · Nov 2, 2022 · 2dcce14 · 2dcce14
2 parents ce5bcc1 + af06c18
commit 2dcce14
Show file tree

Hide file tree

Showing 143 changed files with 4,819 additions and 1,084 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,13 +1,13 @@
 name: Bug report
 description: Create a bug report to help us improve
-labels: [bug]
+labels: [ bug ]
 body:
   - type: checkboxes
     id: checklist
     attributes:
       label: Checklist
       options:
-        - label: I am able to reproduce the bug with the [latest version](https://github.com/z-huang/music/releases/latest).
+        - label: I am able to reproduce the bug with the [latest DEBUG version](https://github.com/z-huang/InnerTune/actions).
           required: true
         - label: I've checked that there is no issue about this bug.
           required: true
@@ -65,7 +65,7 @@ body:
       label: Logs
       description: |
         If your bug includes a crash, please use `adb logcat` or other ways to provide logs.
-  
+
   - type: input
     id: music-version
     attributes:

diff --git a/.gitignore b/.gitignore
@@ -85,4 +85,5 @@ lint/outputs/
 lint/tmp/
 # lint/reports/
 
-.DS_Store
+.DS_Store
+/app/release/output-metadata.json
diff --git a/README.md b/README.md
@@ -1,23 +1,27 @@
 # InnerTune
 
-<img src="https://raw.githubusercontent.com/z-huang/music/dev/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png" height="72">
+<img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png" height="72">
 
 Make your own music library with any song from YouTube Music.  
 No ads, free, and simple.
 
 [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height="80">](https://apt.izzysoft.de/fdroid/index/apk/com.zionhuang.music)
 
-[![Latest release](https://img.shields.io/github/v/release/z-huang/music?include_prereleases)](https://github.com/z-huang/music/releases)
-[![License](https://img.shields.io/github/license/z-huang/music)](https://www.gnu.org/licenses/gpl-3.0)
-[![Downloads](https://img.shields.io/github/downloads/z-huang/music/total)](https://github.com/z-huang/music/releases)
+[![Latest release](https://img.shields.io/github/v/release/z-huang/InnerTune?include_prereleases)](https://github.com/z-huang/music/releases)
+[![License](https://img.shields.io/github/license/z-huang/InnerTune)](https://www.gnu.org/licenses/gpl-3.0)
+[![Downloads](https://img.shields.io/github/downloads/z-huang/InnerTune/total)](https://github.com/z-huang/InnerTune/releases)
 
-> **Note 1:** The project is currently in an unstable stage, so there should be many bugs. If you encounter one, please report by opening an issue.
-
-> **Note 2:** The icon of this app is temporary. It will be changed in the future.
+> **Note**
+>
+> **1.** The project is currently in an unstable stage, so there should be many bugs. If you encounter one, please report by opening an issue.
+>
+> **2.** The icon of this app is temporary. It will be changed in the future.
 
 With this app, you're like getting a free music streaming service. You can listen to music from YouTube Music and build your own library. What's more, songs can be downloaded for offline playback. You can also create playlists to organize your songs. The aim of _InnerTune_ is to enable everyone to listen to music at no cost by an easy-to-use, practical and ad-free application.
 
-⚠️ Warning: If you're in region that YouTube Music is not supported, you won't be able to use this app ***unless*** you have proxy or VPN to connect to a YTM supported region.
+> **Warning**
+> 
+>If you're in region that YouTube Music is not supported, you won't be able to use this app ***unless*** you have proxy or VPN to connect to a YTM supported region.
 
 ## Features
 
@@ -32,17 +36,21 @@ With this app, you're like getting a free music streaming service. You can liste
 
 - Save songs, albums and playlists in local database
 - Download music for offline playback
-- Edit song title
+- Like songs
+- local playlist management
 - Add links to your favorite YouTube Music playlists
+- Export downloaded songs via SAF
 
 ### Player
 
 - Material design player
 - Lockscreen playback
-- Media controls in notification
-- Skip to next/previous song
-- Repeat/shuffle mode
-- Edit now-playing queue
+- Cache songs
+- (Synchronized) lyrics
+- Skip silence
+- Audio normalization
+- Stat for nerds
+- Persistent queue
 
 ### Other
 
@@ -51,35 +59,46 @@ With this app, you're like getting a free music streaming service. You can liste
 - Localization
 - Proxy
 - Backup & restore
+- Support Android Auto
 
 ## Screenshots
 
 <p float="left">
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/01.jpg" width="170" />
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/02.jpg" width="170" />
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/03.jpg" width="170" />
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/04.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/01.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/02.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/03.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/04.jpg" width="170" />
 </p>
 <p float="left">
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/05.jpg" width="170" />
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/07.jpg" width="170" />
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/08.jpg" width="170" />
-  <img src="https://raw.githubusercontent.com/z-huang/music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/09.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/05.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/07.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/08.jpg" width="170" />
+  <img src="https://raw.githubusercontent.com/z-huang/InnerTune/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/09.jpg" width="170" />
 </p>
 
 ## Installation
 
 You can install _InnerTune_ using the following methods:
 
-1. Download the APK file from [GitHub Releases](https://github.com/z-huang/music/releases).
+1. Download the APK file from [GitHub Releases](https://github.com/z-huang/InnerTune/releases).
 2. Add [IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/com.zionhuang.music) to your F-Droid repos following the [instruction](https://apt.izzysoft.de/fdroid/index/info), and you can search for this app and receive updates.
-3. If you want to have bug fixes or enjoy new features quickly, install debug version from [GitHub Action](https://github.com/z-huang/music/actions) at your own risk and remember to backup your data more frequently.
+3. If you want to have bug fixes or enjoy new features quickly, install debug version from [GitHub Action](https://github.com/z-huang/InnerTune/actions) at your own risk and remember to backup your data more frequently.
 4. Clone this repository and build a debug APK.
 
 How to get updates?
 
 1. F-Droid application.
-2. [GitHub](https://github.com/z-huang/music)
+2. [GitHub](https://github.com/z-huang/InnerTune) + [Obtainium (beta)](https://github.com/ImranR98/Obtainium)
+
+## FAQ
+
+### Q: How to scrobble music to LastFM, LibreFM, ListenBrainz or GNU FM?
+
+Use other music scrobbler apps. I recommend [Pano Scrobbler](https://play.google.com/store/apps/details?id=com.arn.scrobble).
+
+### Q: How to export downloaded song files?
+
+*InnerTune* support SAF. You can find the provider in Android native file manager. You can also use [Material Files](https://play.google.com/store/apps/details?id=me.zhanghai.android.files) with [instruction](https://github.com/z-huang/InnerTune/issues/117#issuecomment-1295090708) (recommended).
 
 ## Contribution
 
@@ -96,4 +115,4 @@ How to get updates?
 
 #### Fastlane (App Description and Changelogs)
 
-Follow the [fastlane instruction](https://gitlab.com/-/snippets/1895688) to add your language and create a pull request.
+Follow the [fastlane instruction](https://gitlab.com/-/snippets/1895688) to add your language and create a pull request.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.zionhuang.music"
         minSdk = 24
         targetSdk = 32
-        versionCode = 13
-        versionName = "0.4.2"
+        versionCode = 14
+        versionName = "0.4.3"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -143,6 +143,7 @@ dependencies {
     implementation("androidx.transition:transition-ktx:1.4.1")
     implementation("com.google.android.material:material:1.8.0-alpha01")
     implementation("dev.chrisbanes.insetter:insetter:0.6.1")
+    implementation("com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0")
     // Gson
     implementation("com.google.code.gson:gson:2.9.0")
     // ExoPlayer
@@ -163,6 +164,8 @@ dependencies {
     testImplementation("androidx.room:room-testing:2.4.3")
     // YouTube API
     implementation(project(mapOf("path" to ":innertube")))
+    // KuGou
+    implementation(project(mapOf("path" to ":kugou")))
     // Apache Utils
     implementation("org.apache.commons:commons-lang3:3.12.0")
     implementation("org.apache.commons:commons-text:1.9")

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -80,9 +80,6 @@
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault
 
-# Protobuf
--keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
-
 -dontwarn javax.servlet.ServletContainerInitializer
 -dontwarn org.bouncycastle.jsse.BCSSLParameters
 -dontwarn org.bouncycastle.jsse.BCSSLSocket