Skip to content

Add AMOLED theme #216

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

Open
krypciak wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add AMOLED theme #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 0 deletions app/src/main/java/com/twofasapp/ui/main/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class MainActivity : AppCompatActivity(), AuthAware {
SelectedTheme.Auto -> (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
SelectedTheme.Light -> false
SelectedTheme.Dark -> true
SelectedTheme.AmoledDark -> true
}
}
),
Expand All @@ -80,6 +81,7 @@ class MainActivity : AppCompatActivity(), AuthAware {
SelectedTheme.Auto -> (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
SelectedTheme.Light -> false
SelectedTheme.Dark -> true
SelectedTheme.AmoledDark -> true
}
}
),
Expand All @@ -97,11 +99,16 @@ class MainActivity : AppCompatActivity(), AuthAware {
window.isNavigationBarContrastEnforced = false
}

if (selectedTheme == SelectedTheme.AmoledDark) {
window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK))
}

CompositionLocalProvider(
LocalAppTheme provides when (selectedTheme) {
SelectedTheme.Auto -> AppTheme.Auto
SelectedTheme.Light -> AppTheme.Light
SelectedTheme.Dark -> AppTheme.Dark
SelectedTheme.AmoledDark -> AppTheme.AmoledDark
},
LocalDynamicColors provides appSettings.dynamicColors,
) {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/twofasapp/ui/main/StartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class StartActivity : AppCompatActivity(), AuthAware {
SelectedTheme.Auto -> (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
SelectedTheme.Light -> false
SelectedTheme.Dark -> true
SelectedTheme.AmoledDark -> true
}
}
),
Expand All @@ -55,6 +56,7 @@ class StartActivity : AppCompatActivity(), AuthAware {
SelectedTheme.Auto -> (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
SelectedTheme.Light -> false
SelectedTheme.Dark -> true
SelectedTheme.AmoledDark -> true
}
}
),
Expand Down
1 change: 1 addition & 0 deletions core/common/src/main/java/com/twofasapp/common/domain/SelectedTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ enum class SelectedTheme {
Auto,
Light,
Dark,
AmoledDark,
}
19 changes: 17 additions & 2 deletions core/designsystem/src/main/java/com/twofasapp/designsystem/AppTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ import androidx.window.core.layout.WindowWidthSizeClass
import com.twofasapp.designsystem.internal.OverriddenDarkColors
import com.twofasapp.designsystem.internal.OverriddenLightColors
import com.twofasapp.designsystem.internal.ThemeColors
import com.twofasapp.designsystem.internal.backgroundAmoled
import com.twofasapp.designsystem.internal.surfaceAmoled
import com.twofasapp.designsystem.internal.surfaceVariantAmoled
import com.twofasapp.designsystem.internal.onSurfacePrimaryDark
import com.twofasapp.designsystem.internal.onSurfacePrimaryLight
import com.twofasapp.designsystem.internal.onSurfaceSecondaryDark
Expand All @@ -40,7 +43,7 @@ val LocalThemeColors = staticCompositionLocalOf { ThemeColors() }
val LocalDynamicColors = staticCompositionLocalOf { false }

enum class AppTheme {
Auto, Light, Dark,
Auto, Light, Dark, AmoledDark,
}

@Composable
Expand All @@ -55,15 +58,27 @@ fun MainAppTheme(
AppTheme.Auto -> isSystemInDarkTheme()
AppTheme.Light -> false
AppTheme.Dark -> true
AppTheme.AmoledDark -> true
}

val colorScheme: ColorScheme = when {
var colorScheme: ColorScheme = when {
isDynamicColorEnabled && isInDarkTheme && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> dynamicDarkColorScheme(LocalContext.current)
isDynamicColorEnabled && !isInDarkTheme && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> dynamicLightColorScheme(LocalContext.current)
isInDarkTheme -> OverriddenDarkColors
else -> OverriddenLightColors
}

if (LocalAppTheme.current == AppTheme.AmoledDark) {
colorScheme = colorScheme.copy(
background = backgroundAmoled,
onBackground = onSurfacePrimaryDark,
surface = surfaceAmoled,
onSurface = onSurfacePrimaryDark,
surfaceVariant = surfaceVariantAmoled,
onSurfaceVariant = onSurfacePrimaryDark,
)
}

val themeColors = ThemeColors(
seed = if (isInDarkTheme) seedDark else seedLight,
primary = colorScheme.primary,
Expand Down
1 change: 1 addition & 0 deletions core/designsystem/src/main/java/com/twofasapp/designsystem/AppThemeState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ object AppThemeState {
val mode = when (theme) {
SelectedTheme.Light -> AppCompatDelegate.MODE_NIGHT_NO
SelectedTheme.Dark -> AppCompatDelegate.MODE_NIGHT_YES
SelectedTheme.AmoledDark -> AppCompatDelegate.MODE_NIGHT_YES
SelectedTheme.Auto -> {
when {
Build.VERSION.SDK_INT >= 28 -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
Expand Down
5 changes: 5 additions & 0 deletions core/designsystem/src/main/java/com/twofasapp/designsystem/internal/ColorPrimitives.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ internal val serviceBackgroundWithGroupsDark = Color(0xFF17181B)
internal val switchTrackDark = Color(0xFF1F2025)
internal val switchThumbDark = Color(0xFF48494E)

// AMOLED theme colors
internal val backgroundAmoled = Color(0xFF000000)
internal val surfaceAmoled = Color(0xFF000000)
internal val surfaceVariantAmoled = Color(0xFF0A0A0A)

// Light Color Scheme
internal val OverriddenLightColors = lightColorScheme(
primary = primaryLight,
Expand Down
1 change: 1 addition & 0 deletions core/locale/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@
<string name="settings__theme_option_auto_system">Auto - System Settings</string>
<string name="settings__theme_option_dark">Dark</string>
<string name="settings__theme_option_light">Light</string>
<string name="settings__theme_option_amoled_dark">AMOLED Dark</string>
<string name="tokens__copied_clipboard">Token copied to clipboard!</string>
<string name="tokens__next_copied_clipboard">Next Token copied to clipboard!</string>
<string name="tokens__do_you_really_want_to_remove_all_devices">Do you want to permanently delete this 2FA service?</string>
Expand Down
1 change: 1 addition & 0 deletions feature/appsettings/src/main/java/com/twofasapp/feature/appsettings/ui/AppSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ private fun SelectedTheme.toStringResource(): String {
SelectedTheme.Auto -> stringResource(id = R.string.settings__theme_option_auto)
SelectedTheme.Light -> stringResource(id = R.string.settings__theme_option_light)
SelectedTheme.Dark -> stringResource(id = R.string.settings__theme_option_dark)
SelectedTheme.AmoledDark -> stringResource(id = R.string.settings__theme_option_amoled_dark)
}
}

Expand Down
1 change: 1 addition & 0 deletions ...xt/src/main/java/com/twofasapp/feature/browserext/ui/request/BrowserExtRequestActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class BrowserExtRequestActivity : ComponentActivity(), AuthAware {
SelectedTheme.Auto -> AppTheme.Auto
SelectedTheme.Light -> AppTheme.Light
SelectedTheme.Dark -> AppTheme.Dark
SelectedTheme.AmoledDark -> AppTheme.AmoledDark
},
LocalDynamicColors provides settingsRepository.getAppSettings().dynamicColors,
) {
Expand Down
1 change: 1 addition & 0 deletions ...e/widget/src/main/java/com/twofasapp/feature/widget/ui/settings/WidgetSettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class WidgetSettingsActivity : ComponentActivity(), AuthAware {
SelectedTheme.Auto -> AppTheme.Auto
SelectedTheme.Light -> AppTheme.Light
SelectedTheme.Dark -> AppTheme.Dark
SelectedTheme.AmoledDark -> AppTheme.AmoledDark
},
LocalDynamicColors provides settingsRepository.getAppSettings().dynamicColors,
) {
Expand Down