diff --git a/app/build.gradle b/app/build.gradle index 7aa6c2b..7e26f69 100644 --- a/app/build.gradle +++ b/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 'com.google.android.material:material:1.5.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + 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.espresso:espresso-core:3.4.0' -} \ No newline at end of file + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} diff --git a/app/src/androidTest/java/cc/jerryxiao/easterscrsaver/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/jerryxiao/easterdream13/ExampleInstrumentedTest.java similarity index 86% rename from app/src/androidTest/java/cc/jerryxiao/easterscrsaver/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/jerryxiao/easterdream13/ExampleInstrumentedTest.java index acec06d..879a1ea 100644 --- a/app/src/androidTest/java/cc/jerryxiao/easterscrsaver/ExampleInstrumentedTest.java +++ b/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()); } -} \ No newline at end of file +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 206dda0..5a4e433 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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"> + android:resource="@xml/dream" /> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..42f23fd Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/cc/jerryxiao/easterscrsaver/COLREmojiCompat.kt b/app/src/main/java/com/jerryxiao/easterdream13/COLREmojiCompat.kt similarity index 95% rename from app/src/main/java/cc/jerryxiao/easterscrsaver/COLREmojiCompat.kt rename to app/src/main/java/com/jerryxiao/easterdream13/COLREmojiCompat.kt index 2b1c252..0208502 100644 --- a/app/src/main/java/cc/jerryxiao/easterscrsaver/COLREmojiCompat.kt +++ b/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 /** diff --git a/app/src/main/java/cc/jerryxiao/easterscrsaver/DrawableKt.kt b/app/src/main/java/com/jerryxiao/easterdream13/DrawableKt.kt similarity index 98% rename from app/src/main/java/cc/jerryxiao/easterscrsaver/DrawableKt.kt rename to app/src/main/java/com/jerryxiao/easterdream13/DrawableKt.kt index 1f7d51b..a3f5f61 100644 --- a/app/src/main/java/cc/jerryxiao/easterscrsaver/DrawableKt.kt +++ b/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 diff --git a/app/src/main/java/cc/jerryxiao/easterscrsaver/EasterDream.java b/app/src/main/java/com/jerryxiao/easterdream13/EasterDream.java similarity index 99% rename from app/src/main/java/cc/jerryxiao/easterscrsaver/EasterDream.java rename to app/src/main/java/com/jerryxiao/easterdream13/EasterDream.java index b4ec3fe..6417d53 100644 --- a/app/src/main/java/cc/jerryxiao/easterscrsaver/EasterDream.java +++ b/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; diff --git a/app/src/main/java/cc/jerryxiao/easterscrsaver/SettingsActivity.java b/app/src/main/java/com/jerryxiao/easterdream13/SettingsActivity.java similarity index 99% rename from app/src/main/java/cc/jerryxiao/easterscrsaver/SettingsActivity.java rename to app/src/main/java/com/jerryxiao/easterdream13/SettingsActivity.java index 56074b2..d31aae7 100644 --- a/app/src/main/java/cc/jerryxiao/easterscrsaver/SettingsActivity.java +++ b/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; diff --git a/app/src/main/java/cc/jerryxiao/easterscrsaver/UtilExt.kt b/app/src/main/java/com/jerryxiao/easterdream13/UtilExt.kt similarity index 96% rename from app/src/main/java/cc/jerryxiao/easterscrsaver/UtilExt.kt rename to app/src/main/java/com/jerryxiao/easterdream13/UtilExt.kt index ede9dee..89976f9 100644 --- a/app/src/main/java/cc/jerryxiao/easterscrsaver/UtilExt.kt +++ b/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 diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 2b068d1..da88fab 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -1,30 +1,10 @@ - - - - - - - - - - - \ No newline at end of file + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..fee427c 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:pathData="M0,0h108v108h-108z"> + + + + + + + diff --git a/app/src/main/res/drawable/settings_preview.xml b/app/src/main/res/drawable/settings_preview.xml new file mode 100644 index 0000000..895db49 --- /dev/null +++ b/app/src/main/res/drawable/settings_preview.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..bbd3e02 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..bbd3e02 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..f4f702b 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..b21ba8a 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..d841352 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..d92e9ab 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..af168f4 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..4522799 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..28f3b29 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..7f8fcee 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..9a33598 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..f83b839 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index aac8765..57466b6 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ -