VersionCode: 0.5.8

Added night mode support to splash screen Optimize widgets
Z-Siqi · Apr 11, 2024 · 5a9e1f3 · 5a9e1f3
1 parent 4e912d4
commit 5a9e1f3
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 68 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.sqz.writingboard"
         minSdk 29
         targetSdk 34
-        versionCode 55
-        versionName "0.5.8-beta2"
+        versionCode 58
+        versionName "0.5.8"
     }
 
     buildTypes {

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 55,
-      "versionName": "0.5.8-beta2",
+      "versionCode": 58,
+      "versionName": "0.5.8",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/sqz/writingboard/glance/WritingBoardWidget.kt b/app/src/main/java/com/sqz/writingboard/glance/WritingBoardWidget.kt
@@ -78,28 +78,28 @@ class WritingBoardWidget : GlanceAppWidget() {
                 modifier = modifier.size(size.width - 12.dp, size.height - 8.dp)
             ) {
                 item {
-                    Text(
-                        text = savedText(context),
-                        style = TextStyle(
-                            color = GlanceTheme.colors.onSurfaceVariant,
-                            fontWeight = if (fontFamily != 1) {
-                                androidx.glance.text.FontWeight.Bold
-                            } else {
-                                androidx.glance.text.FontWeight.Medium
-                            },
-                            fontFamily = when (fontFamily) {
-                                0 -> FontFamily.Monospace
-                                1 -> null
-                                2 -> FontFamily.Serif
-                                3 -> FontFamily.Cursive
-                                else -> null
-                            }
-                        ),
-                        modifier = modifier.fillMaxSize()
-                    )
-                }
-                item {
-                    Spacer(modifier = modifier.size(size.width, 45.dp))
+                    Column {
+                        Text(
+                            text = savedText(context),
+                            style = TextStyle(
+                                color = GlanceTheme.colors.onSurfaceVariant,
+                                fontWeight = if (fontFamily != 1) {
+                                    androidx.glance.text.FontWeight.Bold
+                                } else {
+                                    androidx.glance.text.FontWeight.Medium
+                                },
+                                fontFamily = when (fontFamily) {
+                                    0 -> FontFamily.Monospace
+                                    1 -> null
+                                    2 -> FontFamily.Serif
+                                    3 -> FontFamily.Cursive
+                                    else -> null
+                                }
+                            ),
+                            modifier = modifier.fillMaxSize()
+                        )
+                        Spacer(modifier = modifier.size(size.width, 45.dp))
+                    }
                 }
             }
         }
@@ -108,22 +108,13 @@ class WritingBoardWidget : GlanceAppWidget() {
             horizontalAlignment = Alignment.End,
             modifier = modifier.fillMaxSize().padding(8.dp)
         ) {
-            LazyColumn {
-                item {
-                    Column(
-                        horizontalAlignment = Alignment.End,
-                        modifier = modifier.fillMaxWidth()
-                    ) {
-                        Image(
-                            provider = ImageProvider(R.drawable.widget_button),
-                            contentDescription = LocalContext.current.getString(R.string.edit),
-                            modifier = modifier.size(45.dp)
-                                .clickable { openAppAction(context) },
-                            contentScale = ContentScale.FillBounds
-                        )
-                    }
-                }
-            }
+            Image(
+                provider = ImageProvider(R.drawable.widget_button),
+                contentDescription = LocalContext.current.getString(R.string.edit),
+                modifier = modifier.size(45.dp).cornerRadius(12.dp)
+                    .clickable { openAppAction(context) },
+                contentScale = ContentScale.FillBounds
+            )
         }
     }
 }
@@ -156,14 +147,14 @@ class WritingBoardTextOnlyWidget : GlanceAppWidget() {
 
             Column(
                 modifier = modifier
-                    .size(size.width - 12.dp, size.height - 8.dp)
+                    .size(size.width - 8.dp, size.height - 8.dp)
                     .clickable { openAppAction(context) }
             ) {
-                LazyColumn {
+                LazyColumn(modifier = modifier.cornerRadius(15.dp)) {
                     item {
                         Text(
                             text = savedText(context),
-                            modifier = modifier.fillMaxWidth()
+                            modifier = modifier.fillMaxWidth().padding(2.dp)
                                 .clickable { openAppAction(context) },
                             style = TextStyle(
                                 color = GlanceTheme.colors.onSurfaceVariant,

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="SplashScreenBackground">@android:color/system_accent3_500</color>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="SplashScreenBackground">#FF4E616C</color>
+</resources>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="SplashScreenBackground">@android:color/system_accent2_100</color>
+</resources>
diff --git a/app/src/main/res/values-v31/splashs.xml b/app/src/main/res/values-v31/splashs.xml
diff --git a/app/src/main/res/values-v31/strings.xml b/app/src/main/res/values-v31/strings.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="SplashScreenBackground">#FFD3E2F0</color>
 </resources>
diff --git a/app/src/main/res/values/splashs.xml b/app/src/main/res/values/splashs.xml
@@ -2,7 +2,7 @@
 <resources>
     <style name="Theme.WritingBoard.Starting" parent="Theme.SplashScreen">
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
-        <item name="windowSplashScreenBackground">#D3E2F0</item>
+        <item name="windowSplashScreenBackground">@color/SplashScreenBackground</item>
         <item name="postSplashScreenTheme">@style/Theme.WritingBoard</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>