dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-16 00:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

calls and removed unused code

Browse Source
This commit is contained in:
Avently
2024-10-15 17:47:09 +07:00
parent ee4a26ed0a
commit a4fb6739b3
13 changed files with 24 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
+1 -5
View File
@@ -5,11 +5,8 @@ import android.content.Intent
import android.net.Uri
import android.os.*
import android.view.WindowManager
import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.ClipboardManager
import androidx.fragment.app.FragmentActivity
import chat.simplex.app.model.NtfManager
@@ -17,7 +14,6 @@ import chat.simplex.app.model.NtfManager.getUserIdFromIntent
import chat.simplex.common.*
import chat.simplex.common.helpers.*
import chat.simplex.common.model.*
import chat.simplex.common.model.ChatController.appPrefs
import chat.simplex.common.ui.theme.*
import chat.simplex.common.views.chatlist.*
import chat.simplex.common.views.helpers.*
@@ -33,7 +29,7 @@ class MainActivity: FragmentActivity() {
mainActivity = WeakReference(this)
platform.androidSetNightModeIfSupported()
val c = CurrentColors.value.colors
platform.androidSetStatusAndNavBarColors(c.isLight, c.background, !appPrefs.oneHandUI.get(), appPrefs.oneHandUI.get())
platform.androidSetStatusAndNavigationBarAppearance(c.isLight)
applyAppLocale(ChatModel.controller.appPrefs.appLanguage)
super.onCreate(savedInstanceState)
// testJson()
apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
+6 -70
View File
@@ -26,7 +26,6 @@ import chat.simplex.common.model.ChatModel.withChats
import chat.simplex.common.platform.*
import chat.simplex.common.ui.theme.*
import chat.simplex.common.views.call.*
import chat.simplex.common.views.chatlist.statusBarColorAfterCall
import chat.simplex.common.views.helpers.*
import chat.simplex.common.views.onboarding.OnboardingStage
import com.jakewharton.processphoenix.ProcessPhoenix
@@ -274,80 +273,17 @@ class SimplexApp: Application(), LifecycleEventObserver {
uiModeManager.setApplicationNightMode(mode)
}
override fun androidSetDrawerStatusAndNavBarColor(
isLight: Boolean,
drawerShadingColor: Color,
toolbarOnTop: Boolean,
navBarColor: Color,
) {
val window = mainActivity.get()?.window ?: return
@Suppress("DEPRECATION")
val windowInsetController = ViewCompat.getWindowInsetsController(window.decorView)
// Blend status bar color to the animated color
// val colors = CurrentColors.value.colors
// val baseBackgroundColor = if (toolbarOnTop) colors.background.mixWith(colors.onBackground, 0.97f) else colors.background
// var statusBar = baseBackgroundColor.mixWith(drawerShadingColor.copy(1f), 1 - drawerShadingColor.alpha).toArgb()
var statusBarLight = isLight
//
// // SimplexGreen while in call
if (window.statusBarColor == SimplexGreen.toArgb()) {
// statusBarColorAfterCall.intValue = statusBar
// statusBar = SimplexGreen.toArgb()
statusBarLight = false
}
// window.statusBarColor = statusBar
// val navBar = navBarColor.toArgb()
if (windowInsetController?.isAppearanceLightStatusBars != statusBarLight) {
windowInsetController?.isAppearanceLightStatusBars = statusBarLight
}
// if (window.navigationBarColor != navBar) {
// window.navigationBarColor = navBar
// }
// if (windowInsetController?.isAppearanceLightNavigationBars != isLight) {
// windowInsetController?.isAppearanceLightNavigationBars = isLight
// }
}
override fun androidSetStatusAndNavBarColors(isLight: Boolean, backgroundColor: Color, hasTop: Boolean, hasBottom: Boolean) {
override fun androidSetStatusAndNavigationBarAppearance(isLight: Boolean) {
val window = mainActivity.get()?.window ?: return
@Suppress("DEPRECATION")
val light = isLight && chatModel.activeCall.value == null
val windowInsetController = ViewCompat.getWindowInsetsController(window.decorView)
// var statusBar = (if (hasTop && appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
// backgroundColor.mixWith(CurrentColors.value.colors.onBackground, 0.97f)
// } else {
// if (CurrentColors.value.base == DefaultTheme.SIMPLEX) {
// backgroundColor.lighter(0.4f)
// } else {
// backgroundColor
// }
// }).toArgb()
var statusBarLight = isLight
//
// // SimplexGreen while in call
if (window.statusBarColor == SimplexGreen.toArgb()) {
// statusBarColorAfterCall.intValue = statusBar
// statusBar = SimplexGreen.toArgb()
statusBarLight = false
if (windowInsetController?.isAppearanceLightStatusBars != light) {
windowInsetController?.isAppearanceLightStatusBars = light
}
// val navBar = (if (hasBottom && appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
// backgroundColor.mixWith(CurrentColors.value.colors.onBackground, 0.97f)
// } else {
// backgroundColor
// }).toArgb()
// if (window.statusBarColor != statusBar) {
// window.statusBarColor = statusBar
// }
if (windowInsetController?.isAppearanceLightStatusBars != statusBarLight) {
windowInsetController?.isAppearanceLightStatusBars = statusBarLight
}
// if (window.navigationBarColor != navBar) {
// window.navigationBarColor = navBar
// }
window.navigationBarColor = Color.Transparent.toArgb()
if (windowInsetController?.isAppearanceLightNavigationBars != isLight) {
windowInsetController?.isAppearanceLightNavigationBars = isLight
if (windowInsetController?.isAppearanceLightNavigationBars != CurrentColors.value.colors.isLight) {
windowInsetController?.isAppearanceLightNavigationBars = CurrentColors.value.colors.isLight
}
}