android, desktop: wallpapers (#4109)

* android, desktop: wallpapers * changes * removed unused * changes * backgrounds moved to themes. can be exported/imported * changes and refactoring * scrollable * change * reorder * theme per background * changes * don't drop customization in same cases * changes * changes * fix state update * different defaults * fix Android * removed migration * temporary * returned theme name as uppercase back * resilient to wrong preset name * more * live color change without button * fix * Revert "temporary" This reverts commit 705c92ee56. * changes * changes * almost candy * old picker and ability to specify hex color * different image * picker * user theme override, fixes, import/export theme with image * revert when about to merge: useful layout for theming * custom image displaying and deletion work correctly * performance * moved code up * changes * color changes in picker when changing themes * reset color without closing modal * unused * log * currentTheme instead of MaterialTheme * different inheritance logic * fix and move sent/received message colors to top * remove background * performance * fix wrong base * changes * fix * small * custom image selection made normally * better color picker * better picker * refactor, fixes, optimizations * working with unknown base theme + tests * change * delete wallpaper dir when importing archive * function rename * fix bug with state update * update colors * fix text colors * update images * changes * remote desktop and theme mode dropdown * default theme * additional accent 2 changes * fix default wallpaper * removed ChatListAlwaysVisible * renaming * update messages * changes * default theme * unused * member icon background color * image quality * fix wallpaper on empty notes screen * update colors * change * update colors * fix update on android * fix update on both platforms * update colors, remove serializable * fix color --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
2024-12-17 17:20:21 +01:00 · 2024-05-25 15:52:16 +07:00
parent ab47a5a27e
commit bf91666f07
90 changed files with 3379 additions and 887 deletions
@@ -15,8 +15,10 @@ actual val dataDir: File = androidAppContext.dataDir
 actual val tmpDir: File = androidAppContext.getDir("temp", Application.MODE_PRIVATE)
 actual val filesDir: File = File(dataDir.absolutePath + File.separator + "files")
 actual val appFilesDir: File = File(filesDir.absolutePath + File.separator + "app_files")
+actual val wallpapersDir: File = File(filesDir.absolutePath + File.separator + "assets" + File.separator + "wallpapers").also { it.mkdirs() }
 actual val coreTmpDir: File = File(filesDir.absolutePath + File.separator + "temp_files")
 actual val dbAbsolutePrefixPath: String = dataDir.absolutePath + File.separator + "files"
+actual val preferencesDir = File(dataDir.absolutePath + File.separator + "shared_prefs")

 actual val chatDatabaseFileName: String = "files_chat.db"
 actual val agentDatabaseFileName: String = "files_agent.db"
@@ -7,6 +7,8 @@ import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.text.BidiFormatter
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.Font
@@ -14,9 +16,11 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.core.graphics.drawable.toBitmap
 import chat.simplex.common.model.AppPreferences
 import com.russhwolf.settings.Settings
 import com.russhwolf.settings.SharedPreferencesSettings
+import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.desc

@@ -51,3 +55,6 @@ actual fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp
 actual fun desktopExpandWindowToWidth(width: Dp) {}

 actual fun isRtl(text: CharSequence): Boolean = BidiFormatter.getInstance().isRtl(text)
+
+actual fun ImageResource.toComposeImageBitmap(): ImageBitmap? =
+  getDrawable(androidAppContext)?.toBitmap()?.asImageBitmap()
@@ -19,14 +19,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.*
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import chat.simplex.common.R
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -34,7 +30,6 @@ import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.helpers.APPLICATION_ID
 import chat.simplex.common.helpers.saveAppLocale
-import chat.simplex.common.views.usersettings.AppearanceScope.ColorEditor
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.compose.painterResource
@@ -46,9 +41,8 @@ enum class AppIcon(val image: ImageResource) {
 }

@Composable
-actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)) {
+actual fun AppearanceView(m: ChatModel) {
  val appIcon = remember { mutableStateOf(findEnabledIcon()) }
-
  fun setAppIcon(newIcon: AppIcon) {
    if (appIcon.value == newIcon) return
    val newComponent = ComponentName(APPLICATION_ID, "chat.simplex.app.MainActivity_${newIcon.name.lowercase()}")
@@ -65,18 +59,11 @@ actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatMod

    appIcon.value = newIcon
  }
-
  AppearanceScope.AppearanceLayout(
    appIcon,
    m.controller.appPrefs.appLanguage,
    m.controller.appPrefs.systemDarkTheme,
    changeIcon = ::setAppIcon,
-    showSettingsModal = showSettingsModal,
-    editColor = { name, initialColor ->
-      ModalManager.start.showModalCloseable { close ->
-        ColorEditor(name, initialColor, close)
-      }
-    },
  )
 }

@@ -86,8 +73,6 @@ fun AppearanceScope.AppearanceLayout(
  languagePref: SharedPreference<String?>,
  systemDarkTheme: SharedPreference<String?>,
  changeIcon: (AppIcon) -> Unit,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  editColor: (ThemeColor, Color) -> Unit,
 ) {
  ColumnWithScrollBar(
    Modifier.fillMaxWidth(),
@@ -120,6 +105,13 @@ fun AppearanceScope.AppearanceLayout(
      }
      //      }
    }
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ThemesSection(systemDarkTheme)
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ProfileImageSection()
+
    SectionDividerSpaced()

    SectionView(stringResource(MR.strings.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
@@ -145,11 +137,6 @@ fun AppearanceScope.AppearanceLayout(
      }
    }

-    SectionDividerSpaced(maxTopPadding = true)
-    ProfileImageSection()
-
-    SectionDividerSpaced(maxTopPadding = true)
-    ThemesSection(systemDarkTheme, showSettingsModal, editColor)
    SectionBottomSpacer()
  }
 }
@@ -169,8 +156,6 @@ fun PreviewAppearanceSettings() {
      languagePref = SharedPreference({ null }, {}),
      systemDarkTheme = SharedPreference({ null }, {}),
      changeIcon = {},
-      showSettingsModal = { {} },
-      editColor = { _, _ -> },
    )
  }
 }