summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml2
-rw-r--r--app/src/main/java/app/olauncher/MainActivity.kt4
-rw-r--r--app/src/main/java/app/olauncher/data/Constants.kt4
-rw-r--r--app/src/main/java/app/olauncher/data/Prefs.kt2
-rw-r--r--app/src/main/java/app/olauncher/helper/WallpaperWorker.kt2
-rw-r--r--app/src/main/java/app/olauncher/ui/HomeFragment.kt10
-rw-r--r--app/src/main/java/app/olauncher/ui/SettingsFragment.kt32
-rw-r--r--app/src/main/res/layout/fragment_settings.xml12
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/values/styles.xml4
10 files changed, 39 insertions, 37 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3a7b2d6..fa20f47 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
android:label="@string/app_name"
android:roundIcon="@drawable/olauncher_logo_rounded"
android:supportsRtl="true"
- android:theme="@style/BlackTheme">
+ android:theme="@style/LightTheme">
<activity
android:name=".MainActivity"
diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt
index 29b61f5..84a2631 100644
--- a/app/src/main/java/app/olauncher/MainActivity.kt
+++ b/app/src/main/java/app/olauncher/MainActivity.kt
@@ -32,8 +32,8 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
val prefs = Prefs(this)
when (prefs.themeColor) {
- Constants.THEME_COLOR_BLACK -> setTheme(R.style.BlackTheme)
- else -> setTheme(R.style.WhiteTheme)
+ Constants.THEME_MODE_LIGHT -> setTheme(R.style.LightTheme)
+ else -> setTheme(R.style.DarkTheme)
}
super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/app/olauncher/data/Constants.kt b/app/src/main/java/app/olauncher/data/Constants.kt
index a507d48..5a22c06 100644
--- a/app/src/main/java/app/olauncher/data/Constants.kt
+++ b/app/src/main/java/app/olauncher/data/Constants.kt
@@ -4,8 +4,8 @@ object Constants {
const val WALL_TYPE_LIGHT = "light"
const val WALL_TYPE_DARK = "dark"
- const val THEME_COLOR_BLACK = 0
- const val THEME_COLOR_WHITE = 1
+ const val THEME_MODE_DARK = 0
+ const val THEME_MODE_LIGHT = 1
const val FLAG_LAUNCH_APP = 100
const val FLAG_HIDDEN_APPS = 101
diff --git a/app/src/main/java/app/olauncher/data/Prefs.kt b/app/src/main/java/app/olauncher/data/Prefs.kt
index 8e6289f..ef8b4b0 100644
--- a/app/src/main/java/app/olauncher/data/Prefs.kt
+++ b/app/src/main/java/app/olauncher/data/Prefs.kt
@@ -118,7 +118,7 @@ class Prefs(context: Context) {
set(value) = prefs.edit().putBoolean(SWIPE_RIGHT_ENABLED, value).apply()
var themeColor: Int
- get() = prefs.getInt(THEME_COLOR, Constants.THEME_COLOR_WHITE)
+ get() = prefs.getInt(THEME_COLOR, Constants.THEME_MODE_DARK)
set(value) = prefs.edit().putInt(THEME_COLOR, value).apply()
var screenTimeout: Int
diff --git a/app/src/main/java/app/olauncher/helper/WallpaperWorker.kt b/app/src/main/java/app/olauncher/helper/WallpaperWorker.kt
index 401e3bd..b22e6eb 100644
--- a/app/src/main/java/app/olauncher/helper/WallpaperWorker.kt
+++ b/app/src/main/java/app/olauncher/helper/WallpaperWorker.kt
@@ -17,7 +17,7 @@ class WallpaperWorker(appContext: Context, workerParams: WorkerParameters) : Cor
if (date == Prefs(applicationContext).wallpaperUpdatedDay) Result.success()
var wallType = Constants.WALL_TYPE_DARK
- if (Prefs(applicationContext).themeColor == Constants.THEME_COLOR_BLACK)
+ if (Prefs(applicationContext).themeColor == Constants.THEME_MODE_LIGHT)
wallType = Constants.WALL_TYPE_LIGHT
val wallpaperUrl = getTodaysWallpaper(wallType)
diff --git a/app/src/main/java/app/olauncher/ui/HomeFragment.kt b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
index 6e40da3..606780a 100644
--- a/app/src/main/java/app/olauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
@@ -349,17 +349,17 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
requireActivity().window.insetsController?.show(WindowInsets.Type.statusBars())
else
@Suppress("DEPRECATION", "InlinedApi")
- if (prefs.themeColor == Constants.THEME_COLOR_BLACK)
+ if (prefs.themeColor == Constants.THEME_MODE_DARK)
+ requireActivity().window.decorView.apply {
+ systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ }
+ else
requireActivity().window.decorView.apply {
systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
}
- else
- requireActivity().window.decorView.apply {
- systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- }
}
private fun hideStatusBar() {
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index 741eafe..6907f0e 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -95,8 +95,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
R.id.statusBar -> toggleStatusBar()
R.id.dateTime -> toggleDateTime()
R.id.themeColor -> themeColorSelectLayout.visibility = View.VISIBLE
- R.id.themeBlack -> updateTheme(Constants.THEME_COLOR_BLACK)
- R.id.themeWhite -> updateTheme(Constants.THEME_COLOR_WHITE)
+ R.id.themeLight -> updateTheme(Constants.THEME_MODE_LIGHT)
+ R.id.themeDark -> updateTheme(Constants.THEME_MODE_DARK)
R.id.maxApps0 -> updateHomeAppsNum(0)
R.id.maxApps1 -> updateHomeAppsNum(1)
@@ -155,8 +155,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
swipeLeftApp.setOnClickListener(this)
swipeRightApp.setOnClickListener(this)
themeColor.setOnClickListener(this)
- themeBlack.setOnClickListener(this)
- themeWhite.setOnClickListener(this)
+ themeLight.setOnClickListener(this)
+ themeDark.setOnClickListener(this)
about.setOnClickListener(this)
share.setOnClickListener(this)
@@ -263,17 +263,17 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
requireActivity().window.insetsController?.show(WindowInsets.Type.statusBars())
else
@Suppress("DEPRECATION", "InlinedApi")
- if (prefs.themeColor == Constants.THEME_COLOR_BLACK)
+ if (prefs.themeColor == Constants.THEME_MODE_DARK)
+ requireActivity().window.decorView.apply {
+ systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ }
+ else
requireActivity().window.decorView.apply {
systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
}
- else
- requireActivity().window.decorView.apply {
- systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- }
}
private fun hideStatusBar() {
@@ -367,19 +367,19 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
prefs.themeColor = themeColor
populateThemeColorText()
when (prefs.themeColor) {
- Constants.THEME_COLOR_BLACK -> {
+ Constants.THEME_MODE_DARK -> {
if (prefs.dailyWallpaper) {
- setPlainWallpaper(requireContext(), android.R.color.white)
+ setPlainWallpaper(requireContext(), android.R.color.black)
viewModel.setWallpaperWorker()
}
- AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
}
else -> {
if (prefs.dailyWallpaper) {
- setPlainWallpaper(requireContext(), android.R.color.black)
+ setPlainWallpaper(requireContext(), android.R.color.white)
viewModel.setWallpaperWorker()
}
- AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
}
}
requireActivity().recreate()
@@ -387,8 +387,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
private fun populateThemeColorText() {
when (prefs.themeColor) {
- Constants.THEME_COLOR_BLACK -> themeColor.text = getString(R.string.black)
- else -> themeColor.text = getString(R.string.white)
+ Constants.THEME_MODE_DARK -> themeColor.text = getString(R.string.dark)
+ else -> themeColor.text = getString(R.string.light)
}
}
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index c27964d..a158721 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -434,7 +434,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:paddingVertical="8dp"
- android:text="@string/theme_color"
+ android:text="@string/theme_mode"
android:textColor="?attr/primaryColor" />
<TextView
@@ -445,7 +445,7 @@
android:layout_gravity="end|bottom"
android:layout_marginEnd="16dp"
android:padding="8dp"
- android:text="@string/white"
+ android:text="@string/dark"
android:textAllCaps="true" />
<!-- theme color select layout-->
@@ -470,24 +470,24 @@
android:layout_weight="1" />
<TextView
- android:id="@+id/themeWhite"
+ android:id="@+id/themeDark"
style="@style/TextSmallBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:gravity="center"
android:paddingVertical="8dp"
- android:text="@string/white"
+ android:text="@string/dark"
android:textAllCaps="true" />
<TextView
- android:id="@+id/themeBlack"
+ android:id="@+id/themeLight"
style="@style/TextSmallBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingVertical="8dp"
- android:text="@string/black"
+ android:text="@string/light"
android:textAllCaps="true" />
</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d29aeb..fa66a61 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,5 +53,7 @@
<string name="show_date_time">Show date time</string>
<string name="appearance">Appearance</string>
<string name="gestures">Gestures</string>
- <string name="theme_color">Theme color</string>
+ <string name="theme_mode">Theme mode</string>
+ <string name="dark">Dark</string>
+ <string name="light">Light</string>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c5dcfe0..9f23db0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -33,7 +33,7 @@
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
</style>
- <style name="WhiteTheme" parent="AppTheme">
+ <style name="DarkTheme" parent="AppTheme">
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@android:color/darker_gray</item>
<item name="colorAccent">@color/white</item>
@@ -48,7 +48,7 @@
<item name="primaryShadeDarkColor">@color/whiteInverseTrans25</item>
</style>
- <style name="BlackTheme" parent="AppTheme">
+ <style name="LightTheme" parent="AppTheme">
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@android:color/darker_gray</item>
<item name="colorAccent">@color/black</item>
generated by cgit v1.2.1 (git 2.18.0) at 2026-08-30 11:52:06 +0000