Merge pull request #111 from Code-Kotliners-Inc/create-screen-icons

create screen fix 2

Author: yorickyeng

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))

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,19 +200,19 @@ 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
                             if (state != null) {
                                 viewModelViewer.setBitmapOnly(state.asAndroidBitmap())
                             }
                         }
-                    } else {
-                        scale = 1f
                     }
                 },
                 onShareClick = { viewModelViewer.onShareClick() },

app/src/main/res/values/strings.xml

@@ -78,7 +78,7 @@
     <string name="publish_meme">Опубликовать</string>
     <string name="link_account_hint">link vk account</string>
     <string name="change_photo_hint">change photo</string>
-    <string name="name_blank">MemeMaker2011</string>
+    <string name="name_blank">Unknown</string>
 
     <string name="description_swipe_bottom_sheet">Свайп</string>
     <string name="choose_pattern">Выбрать шаблон</string>