Skip to content

Conversation

@TarekIdrees
Copy link
Collaborator

The following changes are made to enhance the main screen:

  • Resolve spacing issue
  • Fix: No internet snackbar disappears when no internet connection label is shown.
  • Enhance view model code quality and reduce unnecessary calls.
  • Correct words
Screenshot_20251103_192156

@TarekIdrees TarekIdrees self-assigned this Nov 3, 2025
@TarekIdrees TarekIdrees added the Dukan this PR belong to Dukan feature label Nov 3, 2025
# Conflicts:
#	dukan_presentation/src/commonMain/kotlin/net/thechance/mena/dukan/presentation/screen/main/MainScreen.kt
#	dukan_presentation/src/commonMain/kotlin/net/thechance/mena/dukan/presentation/screen/main/components/bestNersetDukanSection/BestNearestDukanSection.kt
#	dukan_presentation/src/commonMain/kotlin/net/thechance/mena/dukan/presentation/viewModel/mainScreen/MainInteractionListener.kt
#	dukan_presentation/src/commonMain/kotlin/net/thechance/mena/dukan/presentation/viewModel/mainScreen/MainViewModel.kt
) { isConnected ->
if(!isConnected) return@AnimatedContent
LazyColumn (
contentPadding = PaddingValues(horizontal = Theme.spacing._16)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EditorPickDukanItem have horizontal 16 so after add on LazyColumn total became 32 maybe we need to delete form EditorPickDukanItem
image

Comment on lines +89 to +93
if (dukanState.status == DukanStatusUi.Approved) {
getCategories()
loadEditorPicksDukans()
loadBestNearestDukans()
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getDukanState is used to update the state of the Dukan icon shape in the TopAppBar. So we get the content of Home Dukan whatever happens with the Dukan icon.

LazyVerticalGrid(
columns = GridCells.Fixed(gridLayout.columnsCount),
contentPadding = PaddingValues(horizontal = Theme.spacing._16),
contentPadding = PaddingValues(horizontal = Theme.spacing._8),
Copy link
Collaborator

@ahmedNaser7 ahmedNaser7 Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the start padding in categories section is more than what expected in figma design

Image

Copy link
Collaborator

@ElsayedMagdy122 ElsayedMagdy122 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great Work Tarek

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Dukan this PR belong to Dukan feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants