github actions

.github/workflows/andorid.yml

@@ -19,25 +19,17 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
       - name: Build with Gradle
+        env:
+          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
         run: ./gradlew assembleRelease
 
-      - uses: ilharp/sign-android-release@v1 # Or use @nightly
-        name: Sign app APK
-        id: sign_app
-        with:
-          releaseDir: app/build/outputs/apk/release
-          signingKey: ${{ secrets.SIGNING_KEY }}
-          keyAlias: ${{ secrets.ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          buildToolsVersion: 33.0.0
-
       - uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-          files: ${{steps.sign_app.outputs.signedFile}}
+          files: app/build/outputs/apk/release/app-release.apk
 
 

README.md

@@ -2,10 +2,7 @@
 
 [DoubanMovie.apk](https://github.com/fourcels/DoubanMovie/releases/latest/download/app-release-unsigned-signed.apk)
 
-| Light                                                                                                                        | Dark                                                                                                                         |
-|------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
-| <img src="https://user-images.githubusercontent.com/1042568/198966849-90d28c42-3143-4f00-bb44-e8db8889d5ca.png" width="400"> | <img src="https://user-images.githubusercontent.com/1042568/198966875-68a09e19-7a71-494f-b748-463394d0c4a9.png" width="400"> |
-
-
-https://user-images.githubusercontent.com/1042568/198938918-af6b1df2-8b3c-453c-a2c9-31299cb49ad7.mp4
+| Light                             | Dark                                                            |
+|-----------------------------------|-----------------------------------------------------------------|
+| <img src="/preview/Screenshot_20230117_110657.png" width="400"> | <img src="/preview/Screenshot_20230117_110755.png" width="400"> |
 

app/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+
 android {
     namespace 'com.example.doubanmovie'
     compileSdk 33
@@ -20,10 +21,20 @@ android {
         }
     }
 
+    signingConfigs {
+        release {
+            storeFile file('../release.jks')
+            storePassword System.getenv('STORE_PASSWORD')
+            keyPassword System.getenv('KEY_PASSWORD')
+            keyAlias System.getenv('KEY_ALIAS')
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
     compileOptions {
@@ -32,7 +43,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        freeCompilerArgs = ["-Xopt-in=kotlin.RequiresOptIn"]
     }
     buildFeatures {
         compose true

app/src/main/java/com/example/doubanmovie/ui/theme/Theme.kt

@@ -35,14 +35,9 @@ private val LightColorScheme = lightColorScheme(
 @Composable
 fun DoubanMovieTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
     val colorScheme = when {
-//        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-//            val context = LocalContext.current
-//            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-//        }
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }