Skip to content

Commit 4eac43a

Browse files
committed
feat: Android 14 Name
del: 删除多余资源 chore: 统一编译版本
1 parent e3528bd commit 4eac43a

File tree

7 files changed

+41
-17
lines changed

7 files changed

+41
-17
lines changed

app/src/main/java/com/dede/android_eggs/main/entity/EggDatas.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object EggDatas {
5151
Egg(
5252
com.android_u.egg.R.drawable.u_android14_patch_adaptive,
5353
R.string.title_android_u,
54-
com.android_u.egg.R.string.u_egg_name,
54+
R.string.u_egg_name_override,
5555
CharSequenceFormatter(R.string.version_comment_once, 34, "14"),
5656
com.android_u.egg.PlatLogoActivity::class.java,
5757
true,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@
3636
<string name="version_comment_range" translatable="false">API %d~%d\nAndroid %s~%s</string>
3737

3838
<string name="r_egg_short_name" translatable="false">Cat Controls</string>
39+
<string name="u_egg_name_override" translatable="false">Upside Down Cake</string>
3940
</resources>

eggs/U/android_u_EasterEgg.apk

-964 KB
Binary file not shown.

eggs/U/android_u_easter_egg.jar

-1.35 MB
Binary file not shown.

eggs/U/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
android {
7-
compileSdk = 33
7+
compileSdk = Versions.COMPILE_SDK
88
buildToolsVersion = Versions.BUILD_TOOLS
99
defaultConfig {
1010
minSdk = Versions.MIN_SDK
@@ -23,11 +23,11 @@ android {
2323
}
2424
}
2525
compileOptions {
26-
sourceCompatibility = JavaVersion.VERSION_1_8
27-
targetCompatibility = JavaVersion.VERSION_1_8
26+
sourceCompatibility = JavaVersion.VERSION_17
27+
targetCompatibility = JavaVersion.VERSION_17
2828
}
2929
kotlinOptions {
30-
jvmTarget = "1.8"
30+
jvmTarget = "17"
3131
// freeCompilerArgs += listOf(
3232
// "-P",
3333
// "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
34

45
<uses-permission android:name="android.permission.VIBRATE" />
56

@@ -11,13 +12,15 @@
1112
android:icon="@drawable/u_platlogo"
1213
android:theme="@android:style/Theme.Wallpaper.NoTitleBar.Fullscreen" />
1314

14-
<!-- <activity-->
15-
<!-- android:name="com.android.egg.landroid.MainActivity"-->
16-
<!-- android:configChanges="density|screenSize|screenLayout|orientation"-->
17-
<!-- android:exported="true"-->
18-
<!-- android:icon="@drawable/u_android14_patch_adaptive"-->
19-
<!-- android:label="@string/u_egg_name"-->
20-
<!-- android:theme="@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen" />-->
15+
<activity
16+
android:name="com.android.egg.landroid.MainActivity"
17+
android:configChanges="density|screenSize|screenLayout|orientation"
18+
android:enabled="false"
19+
android:exported="true"
20+
android:icon="@drawable/u_android14_patch_adaptive"
21+
android:label="@string/u_egg_name"
22+
android:theme="@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen"
23+
tools:ignore="MissingClass" />
2124

2225
</application>
2326
</manifest>

eggs/U/src/main/java/com/android_u/egg/PlatLogoActivity.java

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.animation.TimeAnimator;
55
import android.app.ActionBar;
66
import android.app.Activity;
7-
import android.content.ActivityNotFoundException;
87
import android.content.Context;
98
import android.graphics.Canvas;
109
import android.graphics.Color;
@@ -26,6 +25,7 @@
2625
import android.util.Log;
2726
import android.view.Gravity;
2827
import android.view.HapticFeedbackConstants;
28+
import android.view.KeyEvent;
2929
import android.view.MotionEvent;
3030
import android.view.View;
3131
import android.widget.FrameLayout;
@@ -228,6 +228,26 @@ private void stopAnimating() {
228228
this.mAnim = null;
229229
}
230230

231+
@Override // android.app.Activity, android.view.KeyEvent.Callback
232+
public boolean onKeyDown(int keyCode, KeyEvent event) {
233+
if (keyCode == KeyEvent.KEYCODE_SPACE) {
234+
if (event.getRepeatCount() == 0) {
235+
startWarp();
236+
}
237+
return true;
238+
}
239+
return super.onKeyDown(keyCode, event);
240+
}
241+
242+
@Override // android.app.Activity, android.view.KeyEvent.Callback
243+
public boolean onKeyUp(int keyCode, KeyEvent event) {
244+
if (keyCode == KeyEvent.KEYCODE_SPACE) {
245+
stopWarp();
246+
return true;
247+
}
248+
return super.onKeyUp(keyCode, event);
249+
}
250+
231251
/* JADX INFO: Access modifiers changed from: private */
232252
public void startWarp() {
233253
stopWarp();
@@ -272,12 +292,12 @@ private void launchNextStage(boolean locked) {
272292
// and the kotlin version is not compatible as a jar package dependency.
273293
// R. reference issue needs to be resolved
274294
Toast.makeText(this, "Decompiled version does not support more features!", Toast.LENGTH_SHORT).show();
275-
// Intent eggActivity = new Intent(Intent.ACTION_MAIN);
295+
// Intent eggActivity = new Intent(Intent.ACTION_MAIN)
276296
// .setClass(this, Class.forName("com.android.egg.landroid.MainActivity"));
277297
// Log.v(TAG, "launching: " + eggActivity);
278298
// startActivity(eggActivity);
279-
} catch (ActivityNotFoundException e2) {
280-
Log.e(TAG, "No more eggs.");
299+
} catch (Exception e2) {
300+
Log.e(TAG, "No more eggs.", e2);
281301
}
282302
}
283303

0 commit comments

Comments
 (0)