rename & icon

app/build.gradle

@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    namespace 'cc.jerryxiao.easterscrsaver'
+    namespace 'com.jerryxiao.easterdream13'
     compileSdk 33
 
     defaultConfig {
-        applicationId "cc.jerryxiao.easterscrsaver"
+        applicationId "com.jerryxiao.easterdream13"
         minSdk 21
         targetSdk 32
         versionCode 1
@@ -33,11 +33,11 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

app/src/androidTest/java/com/jerryxiao/easterdream13/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package cc.jerryxiao.easterscrsaver;
+package com.jerryxiao.easterdream13;
 
 import android.content.Context;
 
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("cc.jerryxiao.easterscrsaver", appContext.getPackageName());
+        assertEquals("com.jerryxiao.easterdream13", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.EasterScrSaver"
+        android:theme="@style/Theme.EasterDream13"
         tools:targetApi="32">
         <activity
             android:name=".SettingsActivity"
@@ -33,7 +33,7 @@
 
             <meta-data
                 android:name="android.service.dream"
-                android:resource="@xml/easterdream" />
+                android:resource="@xml/dream" />
         </service>
     </application>
 

app/src/main/java/com/jerryxiao/easterdream13/COLREmojiCompat.kt

@@ -1,11 +1,11 @@
 @file:JvmName("COLREmojiCompat")
 
-package cc.jerryxiao.easterscrsaver
+package com.jerryxiao.easterdream13
 
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.drawable.Drawable
-import cc.jerryxiao.easterscrsaver.EasterDream.Bubble
+import com.jerryxiao.easterdream13.EasterDream.Bubble
 import java.util.WeakHashMap
 
 /**

app/src/main/java/com/jerryxiao/easterdream13/DrawableKt.kt

@@ -1,7 +1,7 @@
 @file:JvmName("DrawableKt")
 @file:JvmMultifileClass
 
-package cc.jerryxiao.easterscrsaver
+package com.jerryxiao.easterdream13
 
 import android.annotation.SuppressLint
 import android.content.Context

app/src/main/java/com/jerryxiao/easterdream13/EasterDream.java

@@ -1,4 +1,4 @@
-package cc.jerryxiao.easterscrsaver;
+package com.jerryxiao.easterdream13;
 
 import static android.graphics.PixelFormat.TRANSLUCENT;
 

app/src/main/java/com/jerryxiao/easterdream13/SettingsActivity.java

@@ -1,4 +1,4 @@
-package cc.jerryxiao.easterscrsaver;
+package com.jerryxiao.easterdream13;
 
 import android.annotation.SuppressLint;
 import android.content.pm.PackageManager;

app/src/main/java/com/jerryxiao/easterdream13/UtilExt.kt

@@ -1,6 +1,6 @@
 @file:JvmName("UtilExt")
 
-package cc.jerryxiao.easterscrsaver
+package com.jerryxiao.easterdream13
 
 import android.util.TypedValue
 import kotlin.math.roundToInt

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector android:height="108dp" android:tint="#FFFFFF"
-    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportHeight="108" android:viewportWidth="108"
-    android:width="108dp"
+    android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    android:height="108dp"
+    <group android:scaleX="1.9"
-    android:viewportWidth="108"
+        android:scaleY="1.9"
-    android:viewportHeight="108">
+        android:translateX="30.6"
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        android:translateY="30.6">
-        <aapt:attr name="android:fillColor">
+        <path android:fillColor="#FFFFFF" android:pathData="M12,3C8.5,3 5,9.33 5,14c0,3.87 3.13,7 7,7s7,-3.13 7,-7C19,9.33 15.5,3 12,3zM13,18c-3,0 -5,-1.99 -5,-5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1c0,2.92 2.42,3 3,3c0.55,0 1,0.45 1,1S13.55,18 13,18z"/>
-            <gradient
+    </group>
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
 </vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z">
-        android:pathData="M0,0h108v108h-108z" />
+        <aapt:attr name="android:fillColor">
-    <path
+            <gradient
-        android:fillColor="#00000000"
+                android:endX="90.0"
-        android:pathData="M9,0L9,108"
+                android:endY="90.0"
-        android:strokeWidth="0.8"
+                android:startX="45.0"
-        android:strokeColor="#33FFFFFF" />
+                android:startY="45.0"
-    <path
+                android:type="linear">
-        android:fillColor="#00000000"
+                <item
-        android:pathData="M19,0L19,108"
+                    android:color="@color/purple_700"
-        android:strokeWidth="0.8"
+                    android:offset="0.0" />
-        android:strokeColor="#33FFFFFF" />
+                <item
-    <path
+                    android:color="@color/purple_500"
-        android:fillColor="#00000000"
+                    android:offset="1.0" />
-        android:pathData="M29,0L29,108"
+            </gradient>
-        android:strokeWidth="0.8"
+        </aapt:attr>
-        android:strokeColor="#33FFFFFF" />
+    </path>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
 </vector>

app/src/main/res/drawable/settings_preview.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ic_launcher_background" />
+    <item android:drawable="@drawable/t_platlogo" />
+</layer-list>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.EasterScrSaver" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.EasterDream13" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">EasterScrSaver</string>
+    <string name="app_name">EasterDream13</string>
     <string name="title_activity_settings">设置</string>
     <string name="daydream_header">屏保</string>
     <string name="dim_screen_title">允许降低亮度</string>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">EasterScrSaver</string>
+    <string name="app_name">EasterDream13</string>
     <string name="title_activity_settings">Settings</string>
     <string name="daydream_header">Daydream</string>
     <string name="dim_screen_title">Screen Dimming</string>

app/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.EasterScrSaver" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.EasterDream13" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

app/src/main/res/xml/dream.xml

@@ -0,0 +1,3 @@
+<dream xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="com.jerryxiao.easterdream13/.SettingsActivity"
+    android:previewImage="@drawable/settings_preview" />

app/src/main/res/xml/easterdream.xml

@@ -1,2 +0,0 @@
-<dream xmlns:android="http://schemas.android.com/apk/res/android"
-    android:settingsActivity="cc.jerryxiao.easterscrsaver/.SettingsActivity" />

app/src/test/java/com/jerryxiao/easterdream13/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package cc.jerryxiao.easterscrsaver;
+package com.jerryxiao.easterdream13;
 
 import org.junit.Test;
 

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
+    id 'com.android.application' version '8.1.1' apply false
-    id 'com.android.library' version '8.1.0' apply false
+    id 'com.android.library' version '8.1.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }

settings.gradle

@@ -12,5 +12,5 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "EasterScrSaver"
+rootProject.name = "EasterDream13"
 include ':app'