Skip to content

Commit

Permalink
new theming part 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@nift4
nift4 committed Aug 2, 2024
1 parent 6d77b9a commit e6f712e
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 42 deletions.
2 changes: 1 addition & 1 deletion app/src/main/cpp/droidboot_gui
Submodule droidboot_gui updated 3 files
+10 −10 common/droidboot_theme.c
+121 −95 config_parser/droidboot_config.c
+24 −16 include/droidboot_config_parser.h
4 changes: 3 additions & 1 deletion app/src/main/java/org/andbootmgr/app/Simulator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import android.widget.LinearLayout
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat
import com.topjohnwu.superuser.Shell
Expand Down Expand Up @@ -81,11 +82,12 @@ class Simulator : AppCompatActivity() {
}
l.addView(v, LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT))
setContentView(l)
WindowCompat.setDecorFitsSystemWindows(window, false)
WindowInsetsControllerCompat(window, l).apply {
systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
hide(WindowInsetsCompat.Type.systemBars())
}
setContentView(l)
}

private fun blockCount(): Long {
Expand Down
116 changes: 76 additions & 40 deletions app/src/main/java/org/andbootmgr/app/Themes.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.andbootmgr.app
import android.content.Intent
import android.widget.Toast
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Button
import androidx.compose.material3.DrawerValue
Expand All @@ -11,7 +12,6 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.rememberDrawerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateMapOf
import androidx.compose.runtime.mutableStateOf
Expand All @@ -28,24 +28,26 @@ import java.io.File
import java.util.Random

/*
uint32_t win_bg_color;
uint8_t win_radius;
uint8_t win_border_width;
uint32_t win_border_color;
uint32_t global_font_size;
char* global_font_name;
uint32_t button_unselected_color;
uint32_t button_unselected_size;
uint32_t button_unselected_text_color;
uint32_t button_selected_color;
uint32_t button_selected_size;
uint32_t button_selected_text_color;
uint8_t button_radius;
bool button_grow_default;
uint8_t button_border_unselected_width;
uint32_t button_border_unselected_color;
uint8_t button_border_selected_width;
uint32_t button_border_selected_color;
uint32_t win_bg_color;
uint8_t win_radius;
uint8_t win_border_size;
uint32_t win_border_color;
uint32_t list_bg_color;
uint8_t list_radius;
uint8_t list_border_size;
uint32_t list_border_color;
uint32_t global_font_size;
char* global_font_name;
uint32_t button_unselected_color;
uint32_t button_unselected_text_color;
uint32_t button_selected_color;
uint32_t button_selected_text_color;
uint8_t button_radius;
bool button_grow_default;
uint8_t button_border_unselected_size;
uint32_t button_border_unselected_color;
uint8_t button_border_selected_size;
uint32_t button_border_selected_color;
*/
@Composable
fun Themes(vm: MainActivityState) {
Expand All @@ -64,40 +66,74 @@ fun Themes(vm: MainActivityState) {
}
}
val e = remember { mutableStateMapOf<Long, Boolean>() }
ConfigTextField(c, e, "COLOR", "win_bg_color", "hmm")
Button(onClick = {
if (e.containsValue(false))
Toast.makeText(vm.activity!!, vm.activity!!.getString(R.string.invalid_in), Toast.LENGTH_LONG).show()
else {
try {
c.exportToFile(File(vm.logic!!.abmDb, "db.conf"))
} catch (e: ActionAbortedError) {
Toast.makeText(vm.activity!!, vm.activity!!.getString(R.string.failed2save), Toast.LENGTH_LONG)
.show()
val col = { it: String -> it.startsWith("0x") && (it.toIntOrNull(16) ?: -1) in 0..0xffffff }
Column {
ConfigTextField(c, e, stringResource(id = R.string.win_bg_color), "win_bg_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.win_radius), "win_radius") { it.toShortOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.win_border_size), "win_border_size") { it.toShortOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.win_border_color), "win_border_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.list_bg_color), "list_bg_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.list_radius), "list_radius") { it.toShortOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.list_border_size), "list_border_size") { it.toShortOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.list_border_color), "list_border_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.global_font_size), "global_font_size") { it.toIntOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.global_font_name), "global_font_name") { true /* should check if exists later */ }
ConfigTextField(c, e, stringResource(id = R.string.button_unselected_color), "button_unselected_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.button_unselected_text_color), "button_unselected_text_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.button_unselected_size), "button_unselected_size") { it.toIntOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.button_selected_color), "button_selected_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.button_selected_text_color), "button_selected_text_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.button_selected_size), "button_selected_size") { it.toIntOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.button_radius), "button_radius") { it.toShortOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.button_grow_default), "button_grow_default") { it.toBooleanStrictOrNull() != null } // TODO checkbox
ConfigTextField(c, e, stringResource(id = R.string.button_border_unselected_color), "button_border_unselected_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.button_border_unselected_size), "button_border_unselected_size") { it.toIntOrNull() != null }
ConfigTextField(c, e, stringResource(id = R.string.button_border_selected_color), "button_border_selected_color", validate = col)
ConfigTextField(c, e, stringResource(id = R.string.button_border_selected_size), "button_border_selected_size") { it.toIntOrNull() != null }


Button(onClick = {
if (e.containsValue(false))
Toast.makeText(
vm.activity!!,
vm.activity!!.getString(R.string.invalid_in),
Toast.LENGTH_LONG
).show()
else {
try {
c.exportToFile(File(vm.logic!!.abmDb, "db.conf"))
} catch (e: ActionAbortedError) {
Toast.makeText(
vm.activity!!,
vm.activity!!.getString(R.string.failed2save),
Toast.LENGTH_LONG
)
.show()
}
}
}, enabled = !e.containsValue(false)) {
Text(stringResource(R.string.save_changes))
}
Button(onClick = {
vm.activity!!.startActivity(Intent(vm.activity!!, Simulator::class.java).apply {
putExtra("sdCardBlock", vm.deviceInfo!!.bdev)
})
}) {
Text(text = stringResource(id = R.string.simulator))
}
}, enabled = !e.containsValue(false)) {
Text(stringResource(R.string.save_changes))
}
Button(onClick = {
vm.activity!!.startActivity(Intent(vm.activity!!, Simulator::class.java).apply {
putExtra("sdCardBlock", vm.deviceInfo!!.bdev)
})
}) {
Text(text = stringResource(id = R.string.simulator))
}
}

@Composable
private fun ConfigTextField(c: ConfigFile, e: SnapshotStateMap<Long, Boolean>, text: String, configKey: String, default: String = "") {
private fun ConfigTextField(c: ConfigFile, e: SnapshotStateMap<Long, Boolean>, text: String, configKey: String, default: String = "", validate: (String) -> Boolean) {
val id = remember { Random().nextLong() }
var value by remember { mutableStateOf(c[configKey] ?: default) }
TextField(
value = value,
onValueChange = {
value = it
c[configKey] = it.trim()
e[id] = true
e[id] = validate(text)
},
label = { Text(text) },
isError = !(e[id] ?: true)
Expand Down
22 changes: 22 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,26 @@
<string name="installer_sh">Installer shell script</string>
<string name="themes">Themes</string>
<string name="simulator">Start simulator</string>
<string name="win_bg_color">Window background color</string>
<string name="win_radius">Window corner radius</string>
<string name="win_border_size">Window border size</string>
<string name="win_border_color">Window border color</string>
<string name="global_font_size">Global font size</string>
<string name="global_font_name">Global font name</string>
<string name="button_unselected_color">Button color (unselected)</string>
<string name="button_unselected_text_color">Button text color (unselected)</string>
<string name="button_selected_color">Button color (selected)</string>
<string name="button_selected_text_color">Button text color (selected)</string>
<string name="button_unselected_size">Button size (unselected)</string>
<string name="button_selected_size">Button size (selected)</string>
<string name="button_radius">Button radius</string>
<string name="button_grow_default">Grow buttons when selected</string>
<string name="button_border_unselected_color">Button border color (unselected)</string>
<string name="button_border_unselected_size">Button border size (unselected)</string>
<string name="button_border_selected_color">Button border color (selected)</string>
<string name="button_border_selected_size">Button border size (selected)</string>
<string name="list_bg_color">List background color</string>
<string name="list_radius">List radius</string>
<string name="list_border_size">List border size</string>
<string name="list_border_color">List border color</string>
</resources>

0 comments on commit e6f712e

Please sign in to comment.