new theme package

Android-Boot-Manager · Aug 3, 2024 · e430b0c · e430b0c
1 parent d18936f
commit e430b0c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name=".Simulator"
+			android:name=".themes.Simulator"
 			android:exported="false"
 			android:process=":simulator"
 			android:taskAffinity=""

diff --git a/app/src/main/cpp/app.cpp b/app/src/main/cpp/app.cpp
@@ -8,14 +8,14 @@ extern "C" void simulator_start(JNIEnv* env, jobject thiz, jobject bitmap, jint
 extern "C" void simulator_stop(JNIEnv* env);
 extern "C" void simulator_key(jint key);
 
-extern "C" JNIEXPORT void JNICALL Java_org_andbootmgr_app_Simulator_key(JNIEnv* env, jobject thiz, jint key) {
+extern "C" JNIEXPORT void JNICALL Java_org_andbootmgr_app_themes_Simulator_key(JNIEnv* env, jobject thiz, jint key) {
 	simulator_key(key);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_andbootmgr_app_Simulator_stop(JNIEnv* env, jobject thiz) {
+extern "C" JNIEXPORT void JNICALL Java_org_andbootmgr_app_themes_Simulator_stop(JNIEnv* env, jobject thiz) {
 	simulator_stop(env);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_andbootmgr_app_Simulator_start(JNIEnv* env, jobject thiz, jobject bitmap, jint w, jint h) {
+extern "C" JNIEXPORT void JNICALL Java_org_andbootmgr_app_themes_Simulator_start(JNIEnv* env, jobject thiz, jobject bitmap, jint w, jint h) {
 	simulator_start(env, thiz, bitmap, w, h);
 }
diff --git a/app/src/main/java/org/andbootmgr/app/MainActivity.kt b/app/src/main/java/org/andbootmgr/app/MainActivity.kt
@@ -39,6 +39,7 @@ import com.topjohnwu.superuser.Shell.FLAG_REDIRECT_STDERR
 import com.topjohnwu.superuser.io.SuFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.andbootmgr.app.themes.Themes
 import org.andbootmgr.app.util.AbmTheme
 import org.andbootmgr.app.util.ConfigFile
 import org.andbootmgr.app.util.SDUtils

diff --git a/...main/java/org/andbootmgr/app/Simulator.kt → ...va/org/andbootmgr/app/themes/Simulator.kt b/...main/java/org/andbootmgr/app/Simulator.kt → ...va/org/andbootmgr/app/themes/Simulator.kt
@@ -1,4 +1,4 @@
-package org.andbootmgr.app
+package org.andbootmgr.app.themes
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -19,6 +19,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.io.SuRandomAccessFile
+import org.andbootmgr.app.join
 import java.io.File
 import kotlin.math.min
 import kotlin.system.exitProcess
@@ -92,12 +93,14 @@ class Simulator : AppCompatActivity() {
 		}
 	}
 
+	@Suppress("unused") // jni
 	private fun blockCount(): Long {
 		return Shell.cmd("blockdev --getsz ${f.absolutePath}").exec().out.join("\n").toLong().also {
 			Log.i("Simulator", "block count: $it")
 		}
 	}
 
+	@Suppress("unused") // jni
 	private fun readBlocks(offset: Long, count: Int): ByteArray {
 		Log.i("Simulator", "read $count bytes at $offset")
 		val fo = SuRandomAccessFile.open(f, "r")
@@ -108,11 +111,13 @@ class Simulator : AppCompatActivity() {
 		return b
 	}
 
+	@Suppress("unused") // jni
 	private fun redraw() {
 		Log.i("Simulator", "redrawing")
 		v.invalidate()
 	}
 
+	@Suppress("unused") // jni
 	private fun screenPrint(str: String) {
 		handler.post {
 			Toast.makeText(this, str.trim(), Toast.LENGTH_SHORT).show()

diff --git a/...rc/main/java/org/andbootmgr/app/Themes.kt → .../java/org/andbootmgr/app/themes/Themes.kt b/...rc/main/java/org/andbootmgr/app/Themes.kt → .../java/org/andbootmgr/app/themes/Themes.kt
@@ -1,4 +1,4 @@
-package org.andbootmgr.app
+package org.andbootmgr.app.themes
 
 import android.content.Intent
 import android.widget.Toast
@@ -30,10 +30,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.stringResource
@@ -43,6 +40,11 @@ import androidx.navigation.compose.rememberNavController
 import com.github.skydoves.colorpicker.compose.BrightnessSlider
 import com.github.skydoves.colorpicker.compose.HsvColorPicker
 import com.github.skydoves.colorpicker.compose.rememberColorPickerController
+import org.andbootmgr.app.ActionAbortedCleanlyError
+import org.andbootmgr.app.ActionAbortedError
+import org.andbootmgr.app.AppContent
+import org.andbootmgr.app.MainActivityState
+import org.andbootmgr.app.R
 import org.andbootmgr.app.util.ConfigFile
 import java.io.File