Skip to content

create screen fix 2 #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yorickyeng merged 5 commits into from
May 29, 2025
Merged

create screen fix 2 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db7e69d
create screen fix
yorickyeng May 29, 2025
08c8238
Merge branch 'develop' into create-screen-icons
yorickyeng May 29, 2025
0b4a5ad
fix
yorickyeng May 29, 2025
d5eeb7f
Merge remote-tracking branch 'origin/create-screen-icons' into create…
yorickyeng May 29, 2025
4250d2a
fix
yorickyeng May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions app/src/main/java/com/codekotliners/memify/core/theme/Type.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
13 changes: 7 additions & 6 deletions app/src/main/java/com/codekotliners/memify/features/create/presentation/ui/CreateScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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() },
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down