add material you color

This commit is contained in:
zarazaex69
2026-05-06 01:13:22 +03:00
parent 642bc7a437
commit 45779f0bce
7 changed files with 42 additions and 5 deletions
@@ -2,11 +2,13 @@ package xyz.zarazaex.olc
import android.app.Application
import android.content.Context
import android.os.Build
import androidx.work.Configuration
import androidx.work.WorkManager
import com.google.android.material.color.DynamicColors
import com.tencent.mmkv.MMKV
import xyz.zarazaex.olc.AppConfig.ANG_PACKAGE
import xyz.zarazaex.olc.handler.MmkvManager
import xyz.zarazaex.olc.handler.SettingsManager
class AngApplication : Application() {
@@ -32,9 +34,6 @@ class AngApplication : Application() {
*/
override fun onCreate() {
super.onCreate()
// DynamicColors отключён — на Android 12-15 он красит статус-бар в акцент ОС
// и это нельзя переопределить через statusBarColor
// DynamicColors.applyToActivitiesIfAvailable(this)
val mmkvDir = java.io.File(filesDir, "mmkv")
if (!java.io.File(mmkvDir, "MAIN").exists()) {
@@ -54,6 +53,11 @@ class AngApplication : Application() {
MMKV.initialize(this)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
MmkvManager.decodeSettingsBool(AppConfig.PREF_DYNAMIC_COLORS, false)) {
DynamicColors.applyToActivitiesIfAvailable(this)
}
// Initialize WorkManager with the custom configuration
WorkManager.initialize(this, workManagerConfiguration)
@@ -74,6 +74,7 @@ object AppConfig {
const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout_v2"
const val PREF_AUTO_SORT_AFTER_TEST = "pref_auto_sort_after_test"
const val PREF_SHOW_COPY_BUTTON = "pref_show_copy_button"
const val PREF_DYNAMIC_COLORS = "pref_dynamic_colors"
/** Cache keys. */
const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
@@ -2,6 +2,7 @@ package xyz.zarazaex.olc.ui
import android.content.Context
import android.os.Bundle
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.MenuItem
import android.view.View
@@ -185,8 +186,9 @@ abstract class BaseActivity : AppCompatActivity() {
}
private fun syncStatusBarWithToolbar(toolbar: Toolbar) {
// Статус-бар прозрачный (задан в теме). Управляем только цветом иконок.
val bgColor = ContextCompat.getColor(this, R.color.md_theme_surface)
val tv = TypedValue()
theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, tv, true)
val bgColor = tv.data
WindowCompat.getInsetsController(window, window.decorView)?.isAppearanceLightStatusBars =
ColorUtils.calculateLuminance(bgColor) > 0.5
}
@@ -1,7 +1,10 @@
package xyz.zarazaex.olc.ui
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.view.View
import android.widget.Toast
import androidx.preference.CheckBoxPreference
import androidx.preference.EditTextPreference
import androidx.preference.ListPreference
@@ -28,6 +31,7 @@ class SettingsActivity : BaseActivity() {
class SettingsFragment : PreferenceFragmentCompat() {
private val dynamicColors by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_DYNAMIC_COLORS) }
private val localDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_LOCAL_DNS_ENABLED) }
private val fakeDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_FAKE_DNS_ENABLED) }
private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) }
@@ -63,8 +67,22 @@ class SettingsActivity : BaseActivity() {
addPreferencesFromResource(R.xml.pref_settings)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
dynamicColors?.isVisible = false
}
initPreferenceSummaries()
dynamicColors?.setOnPreferenceChangeListener { _, _ ->
Toast.makeText(context, R.string.restart_required, Toast.LENGTH_SHORT).show()
val intent = requireActivity().packageManager
.getLaunchIntentForPackage(requireActivity().packageName)
?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
requireActivity().finish()
intent?.let { startActivity(it) }
true
}
localDns?.setOnPreferenceChangeListener { _, any ->
updateLocalDns(any as Boolean)
true
@@ -263,6 +263,9 @@
<string name="title_language">Язык</string>
<string name="title_ui_settings">Настройки интерфейса</string>
<string name="title_pref_ui_mode_night">Тема интерфейса</string>
<string name="title_pref_dynamic_colors">Динамические цвета (Material You)</string>
<string name="summary_pref_dynamic_colors">Использовать цвета обоев (Android 12+). Требует перезапуска.</string>
<string name="restart_required">Требуется перезапуск приложения</string>
<string name="title_pref_use_hev_tunnel">Использовать Hev TUN</string>
<string name="summary_pref_use_hev_tunnel">Если включено, TUN будет использовать hev-socks5-tunnel; иначе будет использован xray-core</string>
<string name="title_pref_hev_tunnel_loglevel">Подробность журнала HevTun</string>
@@ -270,11 +270,14 @@
<string name="title_language">Language</string>
<string name="title_ui_settings">UI settings</string>
<string name="title_pref_ui_mode_night">UI mode settings</string>
<string name="title_pref_dynamic_colors">Dynamic colors (Material You)</string>
<string name="summary_pref_dynamic_colors">Use wallpaper-based colors (Android 12+). Requires app restart.</string>
<string name="title_pref_use_hev_tunnel">Enable Hev TUN Feature</string>
<string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use xray-core.</string>
<string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="restart_required">Restart required to apply changes</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">Copy</string>
<string name="logcat_clear">Clear</string>
@@ -50,6 +50,12 @@
android:summary="%s"
android:title="@string/title_pref_ui_mode_night" />
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_dynamic_colors"
android:summary="@string/summary_pref_dynamic_colors"
android:title="@string/title_pref_dynamic_colors" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/title_vpn_settings">