Release 0.4.2

.github/workflows/build.yml

@@ -1,19 +1,22 @@
-name: Build
+name: Build debug APK
 on:
   push:
     branches:
       - '**'
-  pull_request:
-    branches:
-      - master
-      - dev
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1
+        with:
+          fileName: 'Key/music-debug.jks'
+          encodedString: ${{ secrets.KEYSTORE }}
+
       - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
@@ -23,6 +26,11 @@ jobs:
 
       - name: Build debug APK and run jvm tests
         run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
+        env:
+          MUSIC_DEBUG_KEYSTORE_FILE: 'Key/music-debug.jks'
+          MUSIC_DEBUG_SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          MUSIC_DEBUG_SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+          MUSIC_DEBUG_SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
 
       - name: Upload APK
         uses: actions/upload-artifact@v2

.github/workflows/build_pr.yml

@@ -0,0 +1,27 @@
+name: Build PR
+on:
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Build debug APK and run jvm tests
+        run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
+        with:
+          name: app
+          path: app/build/outputs/apk/debug/*.apk

README.md

@@ -1,4 +1,4 @@
-# Music
+# InnerTune
 
 <img src="https://raw.githubusercontent.com/z-huang/music/dev/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png" height="72">
 
@@ -13,9 +13,9 @@ No ads, free, and simple.
 
 > **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 name of this app is temporary. It will be changed in the future.
+> **Note 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 _Music_ is to enable everyone to listen to music at no cost by an easy-to-use, practical and ad-free application.
+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.
 
@@ -69,11 +69,11 @@ With this app, you're like getting a free music streaming service. You can liste
 
 ## Installation
 
-You can install _Music_ using the following methods:
+You can install _InnerTune_ using the following methods:
 
 1. Download the APK file from [GitHub Releases](https://github.com/z-huang/music/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. To get a dev build, go to [GitHub Action](https://github.com/z-huang/music/actions) and download the APK artifact of any workflow.
+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.
 4. Clone this repository and build a debug APK.
 
 How to get updates?

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "com.zionhuang.music"
         minSdk = 24
         targetSdk = 32
-        versionCode = 12
-        versionName = "0.4.1"
+        versionCode = 13
+        versionName = "0.4.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -38,6 +38,19 @@ android {
             applicationIdSuffix = ".debug"
         }
     }
+    signingConfigs {
+        getByName("debug") {
+            if (System.getenv("MUSIC_DEBUG_SIGNING_STORE_PASSWORD") != null) {
+                val tmpFilePath = System.getProperty("user.home") + "/work/_temp/Key/"
+                val allFilesFromDir = File(tmpFilePath).listFiles()
+                val keystoreFile = allFilesFromDir?.first()
+                storeFile = keystoreFile ?: file(System.getenv("MUSIC_DEBUG_KEYSTORE_FILE"))
+                storePassword = System.getenv("MUSIC_DEBUG_SIGNING_STORE_PASSWORD")
+                keyAlias = System.getenv("MUSIC_DEBUG_SIGNING_KEY_ALIAS")
+                keyPassword = System.getenv("MUSIC_DEBUG_SIGNING_KEY_PASSWORD")
+            }
+        }
+    }
     buildFeatures {
         viewBinding = true
         dataBinding = true
@@ -128,12 +141,14 @@ dependencies {
     implementation("androidx.work:work-runtime-ktx:2.7.1")
     implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
     implementation("androidx.transition:transition-ktx:1.4.1")
-    implementation("com.google.android.material:material:1.7.0-rc01")
+    implementation("com.google.android.material:material:1.8.0-alpha01")
+    implementation("dev.chrisbanes.insetter:insetter:0.6.1")
     // Gson
     implementation("com.google.code.gson:gson:2.9.0")
     // ExoPlayer
     implementation("com.google.android.exoplayer:exoplayer:2.18.1")
     implementation("com.google.android.exoplayer:extension-mediasession:2.18.1")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.18.1")
     // Paging
     implementation("androidx.paging:paging-runtime-ktx:3.1.1")
     implementation("androidx.test:monitor:1.5.0")

app/proguard-rules.pro

@@ -80,6 +80,9 @@
 # @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