Conversation
This commit introduces the core presentation design system, including: - Color definitions for light and dark themes - Dimension constants for spacing - A base `NoteMarkLayout` composable for consistent app structure - Shape definitions for UI elements - Typography styles using the Space Grotesk font - The Space Grotesk font file Additionally, a basic `SplashScreen` composable is added, utilizing the new `NoteMarkLayout`.
This commit replaces the default `MaterialTheme` with `NoteMarkTheme` in the main `App` composable. This ensures that the custom theming defined in `NoteMarkTheme` is applied throughout the application.
This commit introduces two new button composables: - `SolidButton`: A filled button with a primary background color. - `OutlineButton`: An outlined button with a primary border and transparent background. Both buttons use the `NoteMarkTheme` and have a fixed height of `48.dp` and rounded corners of `12.dp`. Additionally, the `Typography` definition in `NoteMarkTheme` has been updated to include a `titleSmall` text style, which is now used by the new button composables.
This commit moves several files related to the presentation layer from `androidMain` to `commonMain`. This change aims to improve code organization and enable sharing of these components across different platforms in the future. The following files and directories were moved: - `me.androidbox.designsystem` theming files (Colors, Dimensions, Icons, Shapes, Theme, Typography) - `me.androidbox.designsystem.NoteMarkLayout` - Platform-specific `Platform.kt` files for apple, iosArm64, iosSimulatorArm64, iosX64, and native - `me.androidbox.authentication.register.presentation.PortraitRegisterScreen` - Other authentication-related files within `me.androidbox.authentication` for register, core, and login modules. Additionally, `bgGradient` has been added to `ColorScheme` in `commonMain/kotlin/me/androidbox/core/presentation/designsystem/theming/Colors.kt`. The `PortraitRegisterScreen` has been updated to accept `onAction` lambda and `RegisterUiState` as parameters, and uses `NoteMarkTheme` and `org.jetbrains.compose.ui.tooling.preview.Preview`.
This commit moves several files related to the presentation layer from `androidMain` to `commonMain`. This change aims to improve code organization and enable sharing of these components across different platforms in the future. The following files and directories were moved: - `me.androidbox.designsystem` theming files (Colors, Dimensions, Icons, Shapes, Theme, Typography) - `me.androidbox.designsystem.NoteMarkLayout` - Platform-specific `Platform.kt` files for apple, iosArm64, iosSimulatorArm64, iosX64, and native - `me.androidbox.authentication.register.presentation.PortraitRegisterScreen` - Other authentication-related files within `me.androidbox.authentication` for register, core, and login modules. Additionally, `bgGradient` has been added to `ColorScheme` in `commonMain/kotlin/me/androidbox/core/presentation/designsystem/theming/Colors.kt`. The `PortraitRegisterScreen` has been updated to accept `onAction` lambda and `RegisterUiState` as parameters, and uses `NoteMarkTheme` and `org.jetbrains.compose.ui.tooling.preview.Preview`.
This commit introduces the `LandingContent` composable, which displays introductory text and buttons for "Get Started" and "Log in". Key changes: - Added `LandingContent.kt` with the new composable. - Updated `lightOnSurface`, `lightOnSurfaceVariant`, and `lightSurfaceLowest` colors in `Colors.kt` for improved theming. - Set default `enabled` state to `true` for `SolidButton` and `false` for `OutlineButton`. - Minor import adjustments and package name correction for `SplashScreen`. - Ensured `RegisterViewModel` is correctly initialized in `RegisterScreen`.
This commit introduces several changes to the typography and button styles:
- **Typography:**
- Adds the Inter font family.
- Updates `bodyLarge` text style to use the Inter font, with adjusted font size and line height.
- Adds a new `titleLarge` text style using the Space Grotesk font.
- **OutlineButton:**
- Changes the `containerColor` to `Color.Transparent` to ensure the outline style is correctly applied.
- **LandingContent:**
- Minor code formatting adjustment for background modifier.
Additionally, the Inter font file (`inter.ttf`) has been added to the project resources.
This commit refactors the `LandscapeLoginScreen` to accept `state` and `onAction` as parameters, removing the direct dependency on `LoginViewModel`. This change promotes a more unidirectional data flow and makes the composable more testable and reusable by decoupling it from a specific ViewModel implementation.
# Conflicts: # composeApp/src/androidMain/AndroidManifest.xml # composeApp/src/androidMain/kotlin/me/androidbox/Platform.android.kt # composeApp/src/commonMain/kotlin/me/androidbox/authentication/login/data/Login.kt # composeApp/src/commonMain/kotlin/me/androidbox/authentication/login/domain/use_case/LoginUseCase.kt # composeApp/src/commonMain/kotlin/me/androidbox/authentication/login/presentation/LoginActions.kt # composeApp/src/commonMain/kotlin/me/androidbox/authentication/login/presentation/LoginViewModel.kt # composeApp/src/commonMain/kotlin/me/androidbox/authentication/login/presentation/PortraitLoginScreen.kt # composeApp/src/commonMain/kotlin/me/androidbox/authentication/register/data/Register.kt # composeApp/src/commonMain/kotlin/me/androidbox/core/data/imp/HttpNetworkClientImp.kt # composeApp/src/commonMain/kotlin/me/androidbox/di/NoteMarkModule.kt
…nack is being shown and navigating to blank screen
login-issue
usmon/auth-error-handling
Some bugs fixed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.