Skip to content

Develop - Generalize styling, Eye dropper QS #235

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 10 commits into from
Feb 27, 2026
Merged

Develop - Generalize styling, Eye dropper QS #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c50d4a
fix: #225 Oversized single battery notification icon
sameerasw Feb 20, 2026
077acd8
feat: Applied standard styling across the app, removed toolbar styling
sameerasw Feb 25, 2026
24b2e50
fix: Top app bar button sizes
sameerasw Feb 25, 2026
6c7d5f0
fix: Bottom toolbar padding
sameerasw Feb 25, 2026
790ec3f
feat: Remove horizontal pager
sameerasw Feb 25, 2026
d910b1c
feat: Tab switch animation
sameerasw Feb 25, 2026
034a6cb
feat: re-enable bottom toolbar auto hiding
sameerasw Feb 25, 2026
d54f121
feat: Predictive back to main tab
sameerasw Feb 25, 2026
1b833b1
feat: Eye dropper QS tile
sameerasw Feb 27, 2026
fcfc353
fix: Battery notification QS tile invalid permissions
sameerasw Feb 27, 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
11 changes: 11 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 @@ -50,6 +50,7 @@
android:localeConfig="@xml/locales_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:enableOnBackInvokedCallback="true"
android:theme="@style/Theme.Essentials">
<activity
android:name=".MainActivity"
Expand Down Expand Up @@ -580,6 +581,16 @@
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</service>
<service
android:name=".services.tiles.ColorPickerTileService"
android:exported="true"
android:icon="@drawable/rounded_colorize_24"
android:label="@string/tile_color_picker"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</service>
<service
android:name=".services.tiles.DeveloperOptionsTileService"
android:exported="true"
Expand Down
10 changes: 5 additions & 5 deletions 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 @@ -226,25 +226,25 @@ class AppUpdatesActivity : FragmentActivity() {
actions = {
androidx.compose.material3.IconButton(
onClick = {
HapticUtil.performMediumHaptic(view)
HapticUtil.performVirtualKeyHaptic(view)
updatesViewModel.checkForUpdates(context)
},
enabled = refreshingRepoIds.isEmpty(),
colors = IconButtonDefaults.iconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceBright
),
modifier = Modifier.size(48.dp)
modifier = Modifier.size(40.dp)
) {
if (refreshingRepoIds.isNotEmpty()) {
CircularWavyProgressIndicator(
progress = { animatedProgress },
modifier = Modifier.size(32.dp)
modifier = Modifier.size(24.dp)
)
} else {
androidx.compose.material3.Icon(
painter = painterResource(id = R.drawable.rounded_refresh_24),
contentDescription = stringResource(R.string.action_refresh),
modifier = Modifier.size(32.dp)
modifier = Modifier.size(24.dp)
)
}
}
Expand Down Expand Up @@ -323,7 +323,7 @@ class AppUpdatesActivity : FragmentActivity() {
modifier = Modifier.fillMaxSize(),
contentPadding = androidx.compose.foundation.layout.PaddingValues(
top = innerPadding.calculateTopPadding() + 16.dp,
bottom = innerPadding.calculateBottomPadding() + 100.dp,
bottom = 150.dp,
start = 16.dp,
end = 16.dp
),
Expand Down
4 changes: 2 additions & 2 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 @@ -324,12 +324,12 @@ class FeatureSettingsActivity : FragmentActivity() {
colors = androidx.compose.material3.IconButtonDefaults.iconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceBright
),
modifier = Modifier.size(48.dp)
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(32.dp)
modifier = Modifier.size(24.dp)
)

com.sameerasw.essentials.ui.components.menus.SegmentedDropdownMenu(
Expand Down
120 changes: 84 additions & 36 deletions app/src/main/java/com/sameerasw/essentials/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -58,6 +67,11 @@ 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.compose.ui.draw.scale
import androidx.compose.ui.draw.alpha
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collect
import androidx.activity.compose.PredictiveBackHandler
import androidx.core.animation.doOnEnd
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.WindowCompat
Expand Down Expand Up @@ -242,7 +256,6 @@ class MainActivity : FragmentActivity() {
updatesViewModel.loadTrackedRepos(context)
}


// Dynamic tabs configuration
val tabs = remember { DIYTabs.entries }

Expand All @@ -251,14 +264,37 @@ class MainActivity : FragmentActivity() {
val index = tabs.indexOf(defaultTab)
if (index != -1) index else 0
}
val pagerState =
rememberPagerState(initialPage = initialPage, pageCount = { tabs.size })
var currentPage by remember { androidx.compose.runtime.mutableIntStateOf(initialPage) }
val backProgress = remember { Animatable(0f) }
val scope = rememberCoroutineScope()

// Handle predictive back button for tab navigation
PredictiveBackHandler(enabled = currentPage > 0) { progress ->
try {
progress.collect { backEvent ->
backProgress.snapTo(backEvent.progress)
}
currentPage = 0
scope.launch {
backProgress.animateTo(
targetValue = 0f,
animationSpec = tween(durationMillis = 400)
)
}
} catch (e: java.util.concurrent.CancellationException) {
scope.launch {
backProgress.animateTo(
targetValue = 0f,
animationSpec = tween(durationMillis = 300)
)
}
}
}

// Gracefully handle tab removal (e.g. disabling Developer Mode)
LaunchedEffect(tabs) {
if (pagerState.currentPage >= tabs.size) {
pagerState.scrollToPage(0)
if (currentPage >= tabs.size) {
currentPage = 0
}
}
val exitAlwaysScrollBehavior =
Expand Down Expand Up @@ -381,8 +417,8 @@ class MainActivity : FragmentActivity() {
.nestedScroll(exitAlwaysScrollBehavior),
containerColor = MaterialTheme.colorScheme.surfaceContainer,
topBar = {
val currentTab = remember(tabs, pagerState.currentPage) {
tabs.getOrNull(pagerState.currentPage) ?: tabs.firstOrNull()
val currentTab = remember(tabs, currentPage) {
tabs.getOrNull(currentPage) ?: tabs.firstOrNull()
?: DIYTabs.ESSENTIALS
}
ReusableTopAppBar(
Expand Down Expand Up @@ -420,25 +456,25 @@ class MainActivity : FragmentActivity() {
if (currentTab == DIYTabs.APPS) {
IconButton(
onClick = {
HapticUtil.performMediumHaptic(view)
HapticUtil.performVirtualKeyHaptic(view)
updatesViewModel.checkForUpdates(context)
},
enabled = refreshingRepoIds.isEmpty(),
colors = IconButtonDefaults.iconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceBright
),
modifier = Modifier.size(48.dp)
modifier = Modifier.size(40.dp)
) {
if (refreshingRepoIds.isNotEmpty()) {
CircularWavyProgressIndicator(
progress = { animatedProgress },
modifier = Modifier.size(32.dp)
modifier = Modifier.size(24.dp)
)
} else {
Icon(
painter = painterResource(id = R.drawable.rounded_refresh_24),
contentDescription = stringResource(R.string.action_refresh),
modifier = Modifier.size(32.dp)
modifier = Modifier.size(24.dp)
)
}
}
Expand All @@ -455,38 +491,51 @@ class MainActivity : FragmentActivity() {
DIYFloatingToolbar(
modifier = Modifier
.align(Alignment.BottomCenter)
.offset(y = -ScreenOffset - 12.dp)
.offset(y = -ScreenOffset)
.zIndex(1f),
currentPage = pagerState.currentPage,
currentPage = currentPage,
tabs = tabs,
onTabSelected = { index ->
HapticUtil.performUIHaptic(view)
scope.launch {
pagerState.animateScrollToPage(index)
}
currentPage = index
},
scrollBehavior = exitAlwaysScrollBehavior,
badges = mapOf(DIYTabs.APPS to viewModel.hasPendingUpdates.value)
)

HorizontalPager(
state = pagerState,
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.Top,
beyondViewportPageCount = 1
) { page ->
when (tabs[page]) {
DIYTabs.ESSENTIALS -> {
SetupFeatures(
viewModel = viewModel,
modifier = Modifier.padding(innerPadding),
searchRequested = searchRequested,
onSearchHandled = { searchRequested = false },
onHelpClick = { showInstructionsSheet = true }
AnimatedContent(
targetState = currentPage,
transitionSpec = {
val animationSpec = tween<Float>(durationMillis = 400)
val slideOffset = 150

(fadeIn(animationSpec = animationSpec) + slideInVertically(
animationSpec = tween(durationMillis = 400),
initialOffsetY = { slideOffset }
)).togetherWith(
fadeOut(animationSpec = animationSpec) + slideOutVertically(
animationSpec = tween(durationMillis = 400),
targetOffsetY = { slideOffset }
)
}
)
},
modifier = Modifier
.scale(1f - (backProgress.value * 0.05f))
.alpha(1f - (backProgress.value * 0.3f)),
label = "Tab Transition"
) { targetPage ->
when (tabs[targetPage]) {
DIYTabs.ESSENTIALS -> {
SetupFeatures(
viewModel = viewModel,
modifier = Modifier.padding(innerPadding),
searchRequested = searchRequested,
onSearchHandled = { searchRequested = false },
onHelpClick = { showInstructionsSheet = true }
)
}

DIYTabs.FREEZE -> {
DIYTabs.FREEZE -> {
FreezeGridUI(
viewModel = viewModel,
modifier = Modifier.padding(innerPadding),
Expand Down Expand Up @@ -557,7 +606,7 @@ class MainActivity : FragmentActivity() {
modifier = Modifier.fillMaxSize(),
contentPadding = androidx.compose.foundation.layout.PaddingValues(
top = innerPadding.calculateTopPadding() + 16.dp,
bottom = innerPadding.calculateBottomPadding() + 88.dp, // Extra padding for FAB
bottom = 150.dp,
start = 16.dp,
end = 16.dp
),
Expand Down Expand Up @@ -776,7 +825,7 @@ class MainActivity : FragmentActivity() {
modifier = Modifier
.align(Alignment.BottomEnd)
.padding(
bottom = innerPadding.calculateBottomPadding() + 32.dp,
bottom = 150.dp,
end = 32.dp
),
containerColor = MaterialTheme.colorScheme.primaryContainer,
Expand All @@ -794,7 +843,6 @@ class MainActivity : FragmentActivity() {
}
}


// Mark app as ready after composing (happens very quickly)
LaunchedEffect(Unit) {
isAppReady = true
Expand All @@ -803,7 +851,7 @@ class MainActivity : FragmentActivity() {
}
}
}

override fun onResume() {
super.onResume()
viewModel.check(this)
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/sameerasw/essentials/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ class SettingsActivity : ComponentActivity() {
val isPitchBlackThemeEnabled by viewModel.isPitchBlackThemeEnabled
EssentialsTheme(pitchBlackTheme = isPitchBlackThemeEnabled) {
val context = LocalContext.current
val view = LocalView.current
val scrollBehavior =
TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())

Expand Down Expand Up @@ -136,16 +137,19 @@ class SettingsActivity : ComponentActivity() {
scrollBehavior = scrollBehavior,
actions = {
androidx.compose.material3.IconButton(
onClick = { showBugReportSheet = true },
onClick = {
HapticUtil.performVirtualKeyHaptic(view)
showBugReportSheet = true
},
colors = androidx.compose.material3.IconButtonDefaults.iconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceBright
),
modifier = Modifier.size(48.dp)
modifier = Modifier.size(40.dp)
) {
Icon(
painter = painterResource(id = R.drawable.rounded_bug_report_24),
contentDescription = "Report Bug",
modifier = Modifier.size(32.dp)
modifier = Modifier.size(24.dp)
)
}
}
Expand Down
Loading