mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-22 13:11:55 +00:00
android, desktop: upgrade moko-resources to 0.27.1 (#7661)
This commit is contained in:
571 files changed
+250
-262
No files matched your search
@@ -19,7 +19,7 @@ import chat.simplex.common.ui.theme.DEFAULT_START_MODAL_WIDTH
|
||||
import chat.simplex.common.ui.theme.SimpleXTheme
|
||||
import chat.simplex.common.views.TerminalView
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
import kotlinx.coroutines.*
|
||||
|
||||
@@ -17,7 +17,7 @@ import chat.simplex.common.platform.TAG
|
||||
import chat.simplex.common.ui.theme.isInDarkTheme
|
||||
import chat.simplex.common.views.helpers.AlertManager
|
||||
import chat.simplex.common.views.helpers.generalGetString
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
import java.awt.AWTException
|
||||
|
||||
@@ -3,6 +3,7 @@ package chat.simplex.common
|
||||
import chat.simplex.common.platform.Log
|
||||
import chat.simplex.common.platform.TAG
|
||||
import chat.simplex.common.platform.dataDir
|
||||
import chat.simplex.res.*
|
||||
import java.io.IOException
|
||||
import java.nio.channels.FileChannel
|
||||
import java.nio.channels.FileLock
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import chat.simplex.common.simplexWindowState
|
||||
import chat.simplex.common.views.call.CallMediaType
|
||||
import chat.simplex.common.views.call.RcvCallInvitation
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import com.sshtools.twoslices.*
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import chat.simplex.common.views.call.RcvCallInvitation
|
||||
import chat.simplex.common.views.database.deleteOldChatArchive
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import java.util.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import java.io.File
|
||||
|
||||
actual val appPlatform = AppPlatform.DESKTOP
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import androidx.compose.runtime.*
|
||||
import chat.simplex.common.*
|
||||
import chat.simplex.common.views.helpers.AlertManager
|
||||
import chat.simplex.common.views.helpers.generalGetString
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import java.awt.Desktop
|
||||
import java.io.*
|
||||
import java.net.URI
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import androidx.compose.ui.unit.IntOffset
|
||||
import androidx.compose.ui.unit.IntSize
|
||||
import boofcv.io.image.ConvertBufferedImage
|
||||
import boofcv.struct.image.GrayU8
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import org.jetbrains.skia.Image
|
||||
import java.awt.RenderingHints
|
||||
import java.awt.geom.AffineTransform
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import androidx.compose.ui.unit.LayoutDirection
|
||||
import androidx.compose.ui.unit.dp
|
||||
import chat.simplex.common.views.chat.*
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.StringResource
|
||||
import kotlinx.coroutines.delay
|
||||
import java.awt.Image
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package chat.simplex.common.platform
|
||||
import androidx.compose.runtime.*
|
||||
import chat.simplex.common.model.*
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import kotlinx.coroutines.*
|
||||
import uk.co.caprica.vlcj.factory.MediaPlayerFactory
|
||||
import uk.co.caprica.vlcj.player.base.MediaPlayer
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.*
|
||||
import chat.simplex.common.simplexWindowState
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import com.jthemedetecor.OsThemeDetector
|
||||
import com.russhwolf.settings.*
|
||||
import dev.icerock.moko.resources.ImageResource
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ import chat.simplex.common.views.helpers.*
|
||||
import java.io.File
|
||||
import java.net.URI
|
||||
import java.net.URLEncoder
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import java.awt.Desktop
|
||||
|
||||
actual fun UriHandler.sendEmail(subject: String, body: CharSequence) {
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import androidx.compose.runtime.MutableState
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.ui.graphics.*
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import kotlinx.coroutines.*
|
||||
import org.jetbrains.compose.videoplayer.SkiaBitmapVideoSurface
|
||||
import uk.co.caprica.vlcj.media.Media
|
||||
|
||||
+13
-13
@@ -3,26 +3,26 @@ package chat.simplex.common.ui.theme
|
||||
import androidx.compose.ui.text.font.*
|
||||
import androidx.compose.ui.text.platform.Font
|
||||
import chat.simplex.common.platform.desktopPlatform
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
|
||||
actual val Inter: FontFamily = FontFamily(
|
||||
Font(MR.fonts.Inter.regular.file),
|
||||
Font(MR.fonts.Inter.italic.file, style = FontStyle.Italic),
|
||||
Font(MR.fonts.Inter.bold.file, FontWeight.Bold),
|
||||
Font(MR.fonts.Inter.semibold.file, FontWeight.SemiBold),
|
||||
Font(MR.fonts.Inter.medium.file, FontWeight.Medium),
|
||||
Font(MR.fonts.Inter.light.file, FontWeight.Light)
|
||||
Font(MR.fonts.inter_regular.file),
|
||||
Font(MR.fonts.inter_italic.file, style = FontStyle.Italic),
|
||||
Font(MR.fonts.inter_bold.file, FontWeight.Bold),
|
||||
Font(MR.fonts.inter_semibold.file, FontWeight.SemiBold),
|
||||
Font(MR.fonts.inter_medium.file, FontWeight.Medium),
|
||||
Font(MR.fonts.inter_light.file, FontWeight.Light)
|
||||
)
|
||||
|
||||
actual val EmojiFont: FontFamily = if (desktopPlatform.isMac()) {
|
||||
FontFamily.Default
|
||||
} else {
|
||||
FontFamily(
|
||||
Font(MR.fonts.NotoColorEmoji.regular.file),
|
||||
Font(MR.fonts.NotoColorEmoji.regular.file, style = FontStyle.Italic),
|
||||
Font(MR.fonts.NotoColorEmoji.regular.file, FontWeight.Bold),
|
||||
Font(MR.fonts.NotoColorEmoji.regular.file, FontWeight.SemiBold),
|
||||
Font(MR.fonts.NotoColorEmoji.regular.file, FontWeight.Medium),
|
||||
Font(MR.fonts.NotoColorEmoji.regular.file, FontWeight.Light)
|
||||
Font(MRdesktopMain.fonts.notocoloremoji_regular.file),
|
||||
Font(MRdesktopMain.fonts.notocoloremoji_regular.file, style = FontStyle.Italic),
|
||||
Font(MRdesktopMain.fonts.notocoloremoji_regular.file, FontWeight.Bold),
|
||||
Font(MRdesktopMain.fonts.notocoloremoji_regular.file, FontWeight.SemiBold),
|
||||
Font(MRdesktopMain.fonts.notocoloremoji_regular.file, FontWeight.Medium),
|
||||
Font(MRdesktopMain.fonts.notocoloremoji_regular.file, FontWeight.Light)
|
||||
)
|
||||
}
|
||||
+1
-1
@@ -6,7 +6,7 @@ import androidx.compose.ui.platform.LocalUriHandler
|
||||
import chat.simplex.common.model.*
|
||||
import chat.simplex.common.platform.*
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.datetime.Clock
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ import chat.simplex.common.model.*
|
||||
import chat.simplex.common.platform.*
|
||||
import chat.simplex.common.ui.theme.EmojiFont
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
import java.io.File
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.unit.dp
|
||||
import chat.simplex.common.model.MREmojiChar
|
||||
import chat.simplex.common.platform.desktopPlatform
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
|
||||
@Composable
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.unit.dp
|
||||
import chat.simplex.common.platform.*
|
||||
import chat.simplex.common.views.helpers.getBitmapFromByteArray
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
import org.jetbrains.compose.videoplayer.SkiaBitmapVideoSurface
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ import chat.simplex.common.ui.theme.*
|
||||
import chat.simplex.common.views.call.Call
|
||||
import chat.simplex.common.views.chat.item.ItemAction
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ import chat.simplex.common.ui.theme.ThemeManager.colorFromReadableHex
|
||||
import chat.simplex.common.views.chat.item.isHeartEmoji
|
||||
import chat.simplex.common.views.chat.item.isShortEmoji
|
||||
import chat.simplex.common.views.helpers.toDp
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
|
||||
@Composable
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
import chat.simplex.common.ui.theme.WarningOrange
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ import chat.simplex.common.model.json
|
||||
import chat.simplex.common.platform.*
|
||||
import chat.simplex.common.ui.theme.WarningOrange
|
||||
import chat.simplex.common.views.onboarding.ReadMoreButton
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.MutableState
|
||||
import androidx.compose.ui.Modifier
|
||||
import chat.simplex.common.views.newchat.ActionButton
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.window.*
|
||||
import chat.simplex.common.DialogParams
|
||||
import chat.simplex.common.platform.desktopPlatform
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import java.awt.FileDialog
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import chat.simplex.common.platform.rememberFileChooserLauncher
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import chat.simplex.common.views.newchat.ActionButton
|
||||
import java.net.URI
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import chat.simplex.common.model.SharedPreference
|
||||
import chat.simplex.common.model.User
|
||||
import chat.simplex.common.platform.chatModel
|
||||
import chat.simplex.common.ui.theme.DEFAULT_PADDING
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
|
||||
@Composable
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import chat.simplex.common.trayIsAvailable
|
||||
import chat.simplex.common.platform.*
|
||||
import chat.simplex.common.ui.theme.*
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
import kotlinx.coroutines.delay
|
||||
import java.util.Locale
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package chat.simplex.common.views.usersettings
|
||||
import SectionView
|
||||
import androidx.compose.runtime.Composable
|
||||
import chat.simplex.common.model.ChatModel
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
|
||||
@Composable
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import chat.simplex.common.model.ChatController.appPrefs
|
||||
import chat.simplex.common.model.ChatModel
|
||||
import chat.simplex.common.platform.*
|
||||
import chat.simplex.common.views.helpers.*
|
||||
import chat.simplex.res.MR
|
||||
import chat.simplex.res.*
|
||||
import dev.icerock.moko.resources.compose.painterResource
|
||||
import dev.icerock.moko.resources.compose.stringResource
|
||||
|
||||
|
||||
BIN
Binary file not shown.
Reference in new issue
Block a user