Skip to content

Develop - Charging optimization with shizuku, UI redesign, Your android #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sameerasw merged 14 commits into from
Mar 2, 2026
Merged

Develop - Charging optimization with shizuku, UI redesign, Your android #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8cf96f7
fix: Bottom toolbar spacing
sameerasw Mar 1, 2026
857084d
fix: Typo in toast
sameerasw Mar 1, 2026
de2f76c
fix: Use shizuku for charging optimization qs
sameerasw Mar 1, 2026
85ea080
version: upgrade to 12.1
sameerasw Mar 1, 2026
47b6bc4
feat: Shizuku is required for charging opt qs tile
sameerasw Mar 1, 2026
e2e51a9
feat: FAB in bottom toolbar
sameerasw Mar 1, 2026
9223f71
feat: Move freeze buttons to top of freeze tab
sameerasw Mar 1, 2026
58c283f
feat: Reload and add app update repos in scrollable area
sameerasw Mar 1, 2026
7b3131d
feat: Loading indicator in app updates refresh button
sameerasw Mar 1, 2026
a254c75
feat: Settings help and guides section
sameerasw Mar 1, 2026
bccf876
feat: no top app bar
sameerasw Mar 1, 2026
150a7d1
feat: progressive blur
sameerasw Mar 1, 2026
7af0d60
feat: global bottom toolbar design with no top app bars
sameerasw Mar 1, 2026
2cde793
feat: Your Android
sameerasw Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
applicationId = "com.sameerasw.essentials"
minSdk = 26
targetSdk = 36
versionCode = 31
versionName = "12.0"
versionCode = 32
versionName = "12.1"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -139,4 +139,7 @@ dependencies {
// Watermark dependencies
implementation("androidx.exifinterface:exifinterface:1.3.7")
implementation("androidx.compose.material:material-icons-extended:1.7.0") // Compatible with Compose BOM

// GSMArena Parsing
implementation("org.jsoup:jsoup:1.15.3")
}
7 changes: 7 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@
android:theme="@style/Theme.Essentials">
</activity>

<activity
android:name=".ui.activities.YourAndroidActivity"
android:exported="false"
android:label="@string/tab_your_android"
android:theme="@style/Theme.Essentials">
</activity>

<activity
android:name=".SettingsActivity"
android:exported="false"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/sameerasw/essentials/AppUpdatesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,10 @@ class AppUpdatesActivity : FragmentActivity() {
HapticUtil.performMediumHaptic(view)
showAddRepoSheet = true
},
modifier = Modifier.padding(bottom = 16.dp, end = 16.dp),
containerColor = MaterialTheme.colorScheme.primaryContainer,
contentColor = MaterialTheme.colorScheme.onPrimaryContainer
contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
elevation = androidx.compose.material3.FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp)
) {
androidx.compose.material3.Icon(
painter = painterResource(id = R.drawable.rounded_add_24),
Expand Down
164 changes: 70 additions & 94 deletions app/src/main/java/com/sameerasw/essentials/FeatureSettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ import android.os.VibratorManager
import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -20,29 +25,29 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.core.net.toUri
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.viewmodel.compose.viewModel
import com.sameerasw.essentials.domain.HapticFeedbackType
import com.sameerasw.essentials.domain.registry.FeatureRegistry
import com.sameerasw.essentials.ui.components.ReusableTopAppBar
import com.sameerasw.essentials.ui.components.SettingsFloatingToolbar
import com.sameerasw.essentials.ui.components.cards.FeatureCard
import com.sameerasw.essentials.ui.components.containers.RoundedCardContainer
import com.sameerasw.essentials.ui.components.linkActions.LinkPickerScreen
Expand All @@ -68,6 +73,8 @@ import com.sameerasw.essentials.ui.composables.configs.SoundModeTileSettingsUI
import com.sameerasw.essentials.ui.composables.configs.StatusBarIconSettingsUI
import com.sameerasw.essentials.ui.composables.configs.TextAnimationsSettingsUI
import com.sameerasw.essentials.ui.composables.configs.WatchSettingsUI
import com.sameerasw.essentials.ui.modifiers.BlurDirection
import com.sameerasw.essentials.ui.modifiers.progressiveBlur
import com.sameerasw.essentials.ui.theme.EssentialsTheme
import com.sameerasw.essentials.utils.BiometricSecurityHelper
import com.sameerasw.essentials.utils.HapticUtil
Expand Down Expand Up @@ -95,6 +102,10 @@ class FeatureSettingsActivity : FragmentActivity() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
window.isNavigationBarContrastEnforced = false
}

val isDarkMode = (resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
android.content.res.Configuration.UI_MODE_NIGHT_YES
window.setBackgroundDrawableResource(if (isDarkMode) android.R.color.black else R.color.app_window_background)
val featureId = intent.getStringExtra("feature") ?: ""
val featureObj = FeatureRegistry.ALL_FEATURES.find { it.id == featureId }
val highlightSetting = intent.getStringExtra("highlight_setting")
Expand Down Expand Up @@ -149,9 +160,8 @@ class FeatureSettingsActivity : FragmentActivity() {
}
}

LaunchedEffect(Unit) {
viewModel.check(context)
}
// Initialize synchronously so settingsRepository is ready before first composition
remember(context) { viewModel.check(context) }

val isPitchBlackThemeEnabled by viewModel.isPitchBlackThemeEnabled
val pinnedFeatureKeys by viewModel.pinnedFeatureKeys
Expand Down Expand Up @@ -296,99 +306,38 @@ class FeatureSettingsActivity : FragmentActivity() {
)
}

val scrollBehavior =
TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
Scaffold(
contentWindowInsets = androidx.compose.foundation.layout.WindowInsets(
0,
0,
0,
0
),
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
containerColor = MaterialTheme.colorScheme.surfaceContainer,
topBar = {
ReusableTopAppBar(
title = if (featureObj != null) stringResource(featureObj.title) else featureId,
hasBack = true,
hasSearch = false,
onBackClick = { finish() },
scrollBehavior = scrollBehavior,
subtitle = if (featureObj != null) stringResource(featureObj.description) else "",
isBeta = featureObj?.isBeta ?: false,
actions = {
if (featureObj != null && featureObj.aboutDescription != null) {
var showMenu by remember { mutableStateOf(false) }
androidx.compose.material3.IconButton(
onClick = {
HapticUtil.performVirtualKeyHaptic(view)
showMenu = true
},
colors = androidx.compose.material3.IconButtonDefaults.iconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceBright
),
modifier = Modifier.size(40.dp)
) {
Icon(
painter = painterResource(id = R.drawable.rounded_more_vert_24),
contentDescription = stringResource(R.string.content_desc_more_options),
modifier = Modifier.size(24.dp)
)
val pageTitle = if (featureObj != null) stringResource(featureObj.title) else featureId
val hasMenu = featureObj != null && featureObj.aboutDescription != null

com.sameerasw.essentials.ui.components.menus.SegmentedDropdownMenu(
expanded = showMenu,
onDismissRequest = { showMenu = false }
) {
com.sameerasw.essentials.ui.components.menus.SegmentedDropdownMenuItem(
text = {
Text(stringResource(R.string.action_what_is_this))
},
onClick = {
showMenu = false
selectedHelpFeature = featureObj
showHelpSheet = true
},
leadingIcon = {
Icon(
painter = painterResource(id = R.drawable.rounded_help_24),
contentDescription = null
)
}
)
}
}
}
}
val statusBarHeightPx = with(LocalDensity.current) {
WindowInsets.statusBars.asPaddingValues().calculateTopPadding().toPx()
}
val statusBarHeight = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()

Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.surfaceContainer)
.progressiveBlur(
blurRadius = 40f,
height = statusBarHeightPx * 1.15f,
direction = BlurDirection.TOP
)
},
floatingActionButton = {
if (featureId == "Notification lighting") {
ExtendedFloatingActionButton(
onClick = {
HapticUtil.performVirtualKeyHaptic(view)
viewModel.triggerNotificationLighting(context)
},
expanded = fabExpanded,
icon = {
Icon(
painter = painterResource(id = R.drawable.rounded_play_arrow_24),
contentDescription = null
)
},
text = { Text(stringResource(R.string.action_preview)) },
modifier = Modifier.height(64.dp)
)
}
}
) { innerPadding ->
val hasScroll =
featureId != "Sound mode tile" && featureId != "Quick settings tiles"
) {
val hasScroll = featureId != "Sound mode tile" && featureId != "Quick settings tiles"
Column(
modifier = Modifier
.padding(innerPadding)
.fillMaxSize()
.progressiveBlur(
blurRadius = 40f,
height = with(LocalDensity.current) { 150.dp.toPx() },
direction = BlurDirection.BOTTOM
)
.then(if (hasScroll) Modifier.verticalScroll(rememberScrollState()) else Modifier)
) {
// Top padding for status bar
androidx.compose.foundation.layout.Spacer(modifier = Modifier.height(statusBarHeight))

if (featureId == "Watch") {
WatchSettingsUI(
viewModel = watchViewModel,
Expand Down Expand Up @@ -670,7 +619,34 @@ class FeatureSettingsActivity : FragmentActivity() {
}

}
// Bottom padding for toolbar
androidx.compose.foundation.layout.Spacer(modifier = Modifier.height(150.dp))
}

SettingsFloatingToolbar(
title = pageTitle,
onBackClick = { finish() },
modifier = Modifier
.align(Alignment.BottomCenter)
.zIndex(1f),
menuContent = if (hasMenu) {
{
MenuItem(
text = { Text(stringResource(R.string.action_what_is_this)) },
onClick = {
selectedHelpFeature = featureObj
showHelpSheet = true
},
leadingIcon = {
Icon(
painter = painterResource(id = R.drawable.rounded_help_24),
contentDescription = null
)
}
)
}
} else null
)
}
}
}
Expand Down
Loading