diff --git a/app/src/main/java/com/codekotliners/memify/core/theme/Type.kt b/app/src/main/java/com/codekotliners/memify/core/theme/Type.kt
index 69609db9..cabf8a0b 100644
--- a/app/src/main/java/com/codekotliners/memify/core/theme/Type.kt
+++ b/app/src/main/java/com/codekotliners/memify/core/theme/Type.kt
@@ -7,7 +7,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.sp
@@ -71,18 +70,5 @@ val Typography.askPassword: TextStyle
color = MaterialTheme.colorScheme.onBackground,
)
-val Typography.ubuntuText16Sp: TextStyle
- @Composable
- get() =
- TextStyle(
- fontFamily = FontFamily(Font(R.font.ubunturegular)),
- fontSize = 16.sp,
- fontStyle = FontStyle.Normal,
- )
-val MaterialIcons =
- FontFamily(
- Font(R.font.material_icons_regular),
- )
-
val FontFamilyImpact: FontFamily
get() = FontFamily(Font(R.font.impact))
diff --git a/app/src/main/java/com/codekotliners/memify/features/create/presentation/ui/CreateScreen.kt b/app/src/main/java/com/codekotliners/memify/features/create/presentation/ui/CreateScreen.kt
index 286e05b0..2bc3aef2 100644
--- a/app/src/main/java/com/codekotliners/memify/features/create/presentation/ui/CreateScreen.kt
+++ b/app/src/main/java/com/codekotliners/memify/features/create/presentation/ui/CreateScreen.kt
@@ -83,6 +83,7 @@ import com.codekotliners.memify.features.create.presentation.viewmodel.CanvasVie
import com.codekotliners.memify.features.templates.presentation.ui.TemplatesFeedScreen
import com.codekotliners.memify.features.templates.presentation.ui.components.ErrorLoadingItem
import com.codekotliners.memify.features.viewer.presentation.viewmodel.ImageViewerViewModel
+import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class)
@@ -199,10 +200,12 @@ private fun CreateScreenBottomSheet(
topBar = {
CreateScreenTopBar(
onMenuClick = {
- if (scale == 1f) {
- coroutineScope.launch {
- showImageViewer.value = true
- val bitmapCompose = graphicsLayer.toImageBitmap()
+ coroutineScope.launch {
+ scale = 1f
+ showImageViewer.value = true
+ delay(350)
+ val bitmapCompose = graphicsLayer.toImageBitmap()
+ if (scale == 1f) {
bitmapState.value = bitmapCompose
val state = bitmapState.value
@@ -210,8 +213,6 @@ private fun CreateScreenBottomSheet(
viewModelViewer.setBitmapOnly(state.asAndroidBitmap())
}
}
- } else {
- scale = 1f
}
},
onShareClick = { viewModelViewer.onShareClick() },
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a746cc7b..119a26b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,7 +78,7 @@
Опубликовать
link vk account
change photo
- MemeMaker2011
+ Unknown
Свайп
Выбрать шаблон