Merge branch 'release/1.9.0'

Author: hushenghao

.gitignore

@@ -9,4 +9,8 @@
 local.properties
 key.properties
 
-fastlane/report.xml
+fastlane/report.xml
+
+# script pip dir
+.rustup
+/Library

README.md

@@ -18,8 +18,8 @@ The project contains the complete code of the system Easter eggs, which aims to
 
 ## Screenshots
 
-| ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) | ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) |
-|----------------------------------------------------------------------|----------------------------------------------------------------------|
+| ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) | ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) | ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) |
+|----------------------------------------------------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------|
 
 ## Android Versions
 | Name                                   |  SDK  | Egg                           | Status | Use new features [*](#id_new_features) | Minimum SDK [*](#id_full_egg_mini_sdk) |
@@ -68,6 +68,9 @@ Device type for emulators to be managed by the Android Gradle Plugin.
 
 If there are errors and problems, please submit [Issues](https://github.com/hushenghao/AndroidEasterEggs/issues). If you are interested in this project, please submit [Pull requests](https://github.com/hushenghao/AndroidEasterEggs/pulls) to participate.
 
+[Contact me 📧](mailto:[email protected])
+
+### Thanks
 [System source code](https://github.com/aosp-mirror/platform_frameworks_base)
 
-[Contact me](mailto:dede.hu@qq.com)
+[🦖 T-Rex Run 3D](https://github.com/Priler/dino3d)

README_zh.md

@@ -18,8 +18,8 @@
 
 ## 截图
 
-| ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) | ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) |
-|----------------------------------------------------------------------|----------------------------------------------------------------------|
+| ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) | ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) | ![](./fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) |
+|----------------------------------------------------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------|
 
 ## Android版本
 | 名称                                     |  SDK  | 彩蛋                            | 状态  | 有使用新特性 [*](#id_new_features) | 最小版本 [*](#id_full_egg_mini_sdk) |
@@ -68,6 +68,9 @@
 
 如果存在错误和问题，欢迎提交 [Issues](https://github.com/hushenghao/AndroidEasterEggs/issues) 。如果你对本项目感兴趣，欢迎提交 [Pull requests](https://github.com/hushenghao/AndroidEasterEggs/pulls) 参与。
 
+[联系我 📧](mailto:[email protected])
+
+### 感谢
 [系统源码](https://github.com/aosp-mirror/platform_frameworks_base)
 
-[联系我](mailto:dede.hu@qq.com)
+[🦖 T-Rex Run 3D](https://github.com/Priler/dino3d)

app/build.gradle.kts

@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 import com.android.build.api.dsl.ManagedVirtualDevice
 import java.util.*
 
@@ -21,7 +23,7 @@ android {
         minSdk = Versions.MIN_SDK
         targetSdk = Versions.TARGET_SDK
         versionCode = 23
-        versionName = "1.8.1"
+        versionName = "1.9.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations.addAll(listOf("zh", "en"))
@@ -95,6 +97,7 @@ dependencies {
     implementation(deps.androidx.browser)
     implementation(deps.google.material)
     implementation(deps.free.reflection)
+    implementation(deps.nanohttpd)
     debugImplementation(deps.leakcanary)
     implementation(project(":basic"))
     implementation(project(":eggs:T"))
@@ -114,5 +117,4 @@ dependencies {
 
     testImplementation(deps.junit)
     androidTestImplementation(deps.bundles.android.test)
-    androidTestImplementation(deps.nanohttpd)
 }

app/src/androidTest/java/com/dede/android_eggs/EasterEggsActivityBaseTest.kt

@@ -8,6 +8,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions.actionOnHolderItem
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
+import com.dede.android_eggs.main.EasterEggsActivity
 import org.junit.Rule
 
 /**

app/src/main/AndroidManifest.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     app:once="XXWHCA">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".EasterEggsApp"
         android:allowBackup="true"
@@ -12,11 +15,12 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.EasterEggs">
+        android:theme="@style/Theme.EasterEggs"
+        tools:targetApi="tiramisu">
         <activity
-            android:name=".EasterEggsActivity"
+            android:name=".main.EasterEggsActivity"
             android:exported="true"
             android:label="@string/title_activity_settings">
             <intent-filter>
@@ -28,6 +32,10 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
+        <activity
+            android:name="com.dede.android_eggs.dino.DinoEggActivity"
+            android:process=":dino"
+            android:screenOrientation="landscape" />
     </application>
 
 </manifest>

app/src/main/assets/dino3d/css/style.css

@@ -0,0 +1,44 @@
+var
+	gulp			= require("gulp"),
+	livereload		= require("gulp-livereload"),
+	sass			= require("gulp-sass"),
+	autoprefixer	= require("gulp-autoprefixer"),
+	cleancss		= require("gulp-clean-css"),
+	rename			= require("gulp-rename"),
+	rigger			= require("gulp-rigger"),
+	minify			= require("gulp-minify");
+
+gulp.task("reload-css", function() {
+	return gulp.src('./css/*.scss')
+	.pipe(sass().on('error', sass.logError))
+	.pipe(autoprefixer({
+		browsers: ['last 3 versions'],
+		cascade: false
+	}))
+	.pipe(gulp.dest('./css/'))
+	.pipe(cleancss({compatibility: 'ie8'}))
+	.pipe(rename({suffix: '.min'}))
+	.pipe(gulp.dest('./css/'))
+	.pipe(livereload());
+});
+
+gulp.task("reload-js", function() {
+	return gulp.src('./js/src/build.js')
+	.pipe(rigger())
+	.pipe(minify({
+		ext: {
+			min: '.min.js',
+			mangle: false,
+			noSource: true,
+			preserveComments: 'all'
+		}
+	}))
+	.pipe(gulp.dest('./js'))
+});
+
+gulp.task("default", function() {
+	livereload.listen();
+	gulp.watch('./css/*.scss', gulp.series('reload-css'));
+	gulp.watch('./js/src/*.js', gulp.series('reload-js'));
+	gulp.watch('./js/src/*/*.js', gulp.series('reload-js'));
+});