v1.2.2

YangDai2003 · May 1, 2024 · e048049 · e048049
1 parent dfb89e0
commit e048049
Show file tree

Hide file tree

Showing 26 changed files with 118 additions and 237 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.googleHilt)
     alias(libs.plugins.googleKsp)
     alias(libs.plugins.googleGms)
@@ -16,8 +17,8 @@ android {
         applicationId = "com.yangdai.opennote"
         minSdk = 29
         targetSdk = 34
-        versionCode = 120
-        versionName = "1.2.0"
+        versionCode = 122
+        versionName = "1.2.2"
         resourceConfigurations += listOf("en", "zh")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -51,8 +52,10 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.12"
+    composeCompiler {
+        enableStrongSkippingMode = true
+        enableIntrinsicRemember = true
+        enableNonSkippingGroupOptimization = true
     }
     packaging {
         resources {
@@ -95,11 +98,10 @@ dependencies {
     annotationProcessor(libs.androidx.room.compiler)
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.ktx)
-    implementation(libs.androidx.room.paging)
     testImplementation(libs.androidx.room.testing)
 
     // Hilt, for dependency injection
-    implementation(libs.androidx.hilt)
+    implementation(libs.androidx.hilt.navigation)
     ksp(libs.google.hilt.compiler)
     implementation(libs.google.hilt)
 
@@ -124,7 +126,6 @@ dependencies {
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.biometric)
     implementation(libs.androidx.datastore.preferences)
-    implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
 
     // Test

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,15 +4,11 @@
 
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.INTERNET" />
-
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <queries>
@@ -36,15 +32,15 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.OpenNote"
+        android:theme="@style/Theme.OpenNote.Starting"
         android:usesCleartextTraffic="true"
         tools:targetApi="tiramisu">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.OpenNote.Starting"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/yangdai/opennote/MainActivity.kt b/app/src/main/java/com/yangdai/opennote/MainActivity.kt
@@ -43,7 +43,7 @@ class MainActivity : AppCompatActivity() {
                     0f
                 )
 
-                animation.duration = 200L
+                animation.duration = 300L
 
                 // Call SplashScreenView.remove at the end of your custom animation.
                 animation.doOnEnd { splashScreenView.remove() }
@@ -54,7 +54,6 @@ class MainActivity : AppCompatActivity() {
         }
 
         enableEdgeToEdge()
-
         super.onCreate(savedInstanceState)
 
         setContent {

diff --git a/app/src/main/java/com/yangdai/opennote/data/repository/DataStoreRepositoryImpl.kt b/app/src/main/java/com/yangdai/opennote/data/repository/DataStoreRepositoryImpl.kt
@@ -5,6 +5,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.floatPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.core.stringSetPreferencesKey
@@ -38,6 +39,13 @@ class DataStoreRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun putFloat(key: String, value: Float) {
+        val preferencesKey = floatPreferencesKey(key)
+        context.dataStore.edit { preferences ->
+            preferences[preferencesKey] = value
+        }
+    }
+
     override suspend fun putBoolean(key: String, value: Boolean) {
         val preferencesKey = booleanPreferencesKey(key)
         context.dataStore.edit { preferences ->
@@ -67,6 +75,17 @@ class DataStoreRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun getFloat(key: String): Float? {
+        return try {
+            val preferencesKey = floatPreferencesKey(key)
+            val preferences = context.dataStore.data.first()
+            preferences[preferencesKey]
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
     override suspend fun getBoolean(key: String): Boolean? {
         return try {
             val preferencesKey = booleanPreferencesKey(key)
@@ -103,6 +122,13 @@ class DataStoreRepositoryImpl @Inject constructor(
         }
     }
 
+    override fun floatFlow(key: String): Flow<Float> {
+        val preferencesKey = floatPreferencesKey(key)
+        return context.dataStore.data.map { preferences ->
+            preferences[preferencesKey] ?: 0f
+        }
+    }
+
     override fun stringFlow(key: String): Flow<String> {
         val preferencesKey = stringPreferencesKey(key)
         return context.dataStore.data.map { preferences ->
@@ -123,12 +149,4 @@ class DataStoreRepositoryImpl @Inject constructor(
             preferences[preferencesKey] ?: setOf()
         }
     }
-
-    override fun preferencesFlow(): Flow<Preferences> {
-        return context.dataStore.data
-    }
-
-    override fun getDataStore(): DataStore<Preferences> {
-        return context.dataStore
-    }
 }
diff --git a/app/src/main/java/com/yangdai/opennote/domain/repository/DataStoreRepository.kt b/app/src/main/java/com/yangdai/opennote/domain/repository/DataStoreRepository.kt
@@ -1,24 +1,24 @@
 package com.yangdai.opennote.domain.repository
 
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
 import kotlinx.coroutines.flow.Flow
 
 interface DataStoreRepository {
 
     suspend fun putString(key: String, value: String)
     suspend fun putInt(key: String, value: Int)
+    suspend fun putFloat(key: String, value: Float)
+    suspend fun putBoolean(key: String, value: Boolean)
+    suspend fun putStringSet(key: String, value: Set<String>)
+
     suspend fun getString(key: String): String?
     suspend fun getInt(key: String): Int?
-    suspend fun putBoolean(key: String, value: Boolean)
+    suspend fun getFloat(key: String): Float?
     suspend fun getBoolean(key: String): Boolean?
-    suspend fun putStringSet(key: String, value: Set<String>)
     suspend fun getStringSet(key: String): Set<String>?
 
     fun intFlow(key: String): Flow<Int>
+    fun floatFlow(key: String): Flow<Float>
     fun stringFlow(key: String): Flow<String>
     fun booleanFlow(key: String): Flow<Boolean>
     fun stringSetFlow(key: String): Flow<Set<String>>
-    fun preferencesFlow(): Flow<Preferences>
-    fun getDataStore(): DataStore<Preferences>
 }
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/CurlyCornerShape.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/CurlyCornerShape.kt
@@ -41,7 +41,7 @@ class CurlyCornerShape(
         topEnd: Float,
         bottomEnd: Float,
         bottomStart: Float,
-        layoutDirection: LayoutDirection,
+        layoutDirection: LayoutDirection
     ): Outline {
         val d = 2.0
         val r2: Double = size.width / d

diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/MarkdownText.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/MarkdownText.kt
@@ -73,7 +73,8 @@ fun MarkdownText(html: String) {
                 setPadding(0, 0, 0, 0)
                 setBackgroundColor(Color.TRANSPARENT)
             }
-        }, update = {
+        },
+        update = {
             val data = """
                     <!DOCTYPE html>
                     <html>

diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/SelectableColorPlatte.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/SelectableColorPlatte.kt
@@ -62,7 +62,7 @@ fun SelectableColorPlatte(
                     modifier = Modifier
                         .align(Alignment.Center)
                         .clip(CircleShape)
-                        .background(MaterialTheme.colorScheme.primary),
+                        .background(colorScheme.tertiaryContainer),
                     enter = fadeIn() + expandIn(expandFrom = Alignment.Center),
                     exit = shrinkOut(shrinkTowards = Alignment.Center) + fadeOut()
                 ) {