-
Notifications
You must be signed in to change notification settings - Fork 0
Updated TopicScreen and Detail Screen with changed UI
#6
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.
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
Merged
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
2d338d4
- Updated `TopicScreen` to use a `Scaffold` layout with a top app bar…
YugaJ7 c7b0c33
- Implement `CodeExampleBox` for displaying code snippets with copy f…
YugaJ7 9853a8d
- Removed unnecessary empty lines from `DetailScreen.kt` and `App.kt`.
YugaJ7 13f9ef3
- Updated Compose and Material dependencies.
YugaJ7 005c05f
Merge remote-tracking branch 'origin/master' into yuga/detail-topic-ui
YugaJ7 185e881
- Upgrade Material library to Material3.
YugaJ7 0471b58
Remove obsolete drawable resources
YugaJ7 21e0a29
- Updated app theming to Material 3.
YugaJ7 9e9265d
- Update `TopicScreen` and `DetailScreen` to use Material3 components…
YugaJ7 677fd94
Add string resources for UI elements.
YugaJ7 808d8fe
- Internationalized `TopicScreen` and `DetailScreen` using string res…
YugaJ7 d80dfe6
Merge remote-tracking branch 'origin/master' into yuga/detail-topic-ui
YugaJ7 404e829
Add new string resources for error handling.
YugaJ7 a1f5312
- Migrate `UiStateHandler` and `ShowAlertDialog` to Material 3 compon…
YugaJ7 54c2b40
Integrate `UiStateHandler` into `TopicScreen` and `DetailScreen` for …
YugaJ7 3ffb031
- Refined color scheme for both light and dark themes.
YugaJ7 851fae4
- Added previews for `CodeExampleBox`, `SearchField`, and `TopicCard`…
YugaJ7 3bdede0
- Update Android Previews to use `@PreviewLightDark` for concise ligh…
YugaJ7 608999d
Remove trailing newlines from preview files.
YugaJ7 54c0dc8
- Moved search query, filtered topics, and bookmarked states logic to…
yesshreyes 4045399
Rename preview functions
YugaJ7 b5cb6ae
- Refactored `TopicScreen` and `DetailScreen` to separate layout from…
YugaJ7 509deea
- Add preview files for Detail and Topic screens.
YugaJ7 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
11 changes: 11 additions & 0 deletions
11
composeApp/src/commonMain/composeResources/drawable/ic_bookmark.xml
YugaJ7 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="960" | ||
| android:viewportHeight="960" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://schemas.android.com/apk/res/android "> | ||
| <path | ||
| android:pathData="M200,840v-640q0,-33 23.5,-56.5T280,120h400q33,0 56.5,23.5T760,200v640L480,720 200,840ZM280,718 L480,632 680,718v-518L280,200v518ZM280,200h400,-400Z" | ||
| android:fillColor="#e3e3e3" /> | ||
| </vector> |
11 changes: 11 additions & 0 deletions
11
composeApp/src/commonMain/composeResources/drawable/ic_bookmark_filled.xml
YugaJ7 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://schemas.android.com/apk/res/android "> | ||
| <path | ||
| android:pathData="M17,3H7c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z" | ||
| android:fillColor="#EFEFEF" /> | ||
| </vector> |
9 changes: 9 additions & 0 deletions
9
composeApp/src/commonMain/composeResources/drawable/ic_check.xml
YugaJ7 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="960" | ||
| android:viewportHeight="960"> | ||
| <path | ||
| android:pathData="M382,720 L154,492l57,-57 171,171 367,-367 57,57 -424,424Z" | ||
| android:fillColor="#EFEFEF"/> | ||
| </vector> |
9 changes: 9 additions & 0 deletions
9
composeApp/src/commonMain/composeResources/drawable/ic_content_copy.xml
YugaJ7 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="960" | ||
| android:viewportHeight="960"> | ||
| <path | ||
| android:pathData="M360,720q-33,0 -56.5,-23.5T280,640v-480q0,-33 23.5,-56.5T360,80h360q33,0 56.5,23.5T800,160v480q0,33 -23.5,56.5T720,720L360,720ZM360,640h360v-480L360,160v480ZM200,880q-33,0 -56.5,-23.5T120,800v-560h80v560h440v80L200,880ZM360,640v-480,480Z" | ||
| android:fillColor="#EFEFEF"/> | ||
| </vector> |
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
9 changes: 9 additions & 0 deletions
9
.../src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/theme/Colors.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.developersbreach.kotlindictionarymultiplatform.theme | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
RajashekarRaju marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| val Brown = Color(0xFF221F1A) | ||
| val Cream = Color(0xFFFFD39A) | ||
| val Grey = Color(0xFFEFEBE8) | ||
| val White = Color(0xFFFEF9F9) | ||
| val Cream40 = Color(0xFFFDE6DA) | ||
38 changes: 38 additions & 0 deletions
38
...pp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/theme/Font.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.developersbreach.kotlindictionarymultiplatform.theme | ||
|
|
||
| import androidx.compose.material.Typography | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.font.FontFamily | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.sp | ||
| import kotlindictionarymultiplatform.composeapp.generated.resources.Res | ||
| import kotlindictionarymultiplatform.composeapp.generated.resources.noto_sans_bold | ||
| import kotlindictionarymultiplatform.composeapp.generated.resources.noto_sans_medium | ||
| import kotlindictionarymultiplatform.composeapp.generated.resources.noto_sans_regular | ||
| import org.jetbrains.compose.resources.ExperimentalResourceApi | ||
| import org.jetbrains.compose.resources.Font | ||
|
|
||
| @OptIn(ExperimentalResourceApi::class) | ||
YugaJ7 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| @Composable | ||
| fun AppTypography(): Typography { | ||
| val fontFamily = FontFamily( | ||
| Font(Res.font.noto_sans_regular, weight = FontWeight.Normal), | ||
| Font(Res.font.noto_sans_medium, weight = FontWeight.Medium), | ||
| Font(Res.font.noto_sans_bold, weight = FontWeight.Bold), | ||
| ) | ||
|
|
||
| return Typography( | ||
| h1 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Bold, fontSize = 30.sp), | ||
| h2 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Bold, fontSize = 20.sp), | ||
| h3 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Medium, fontSize = 24.sp), | ||
| h4 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Medium, fontSize = 18.sp), | ||
| body1 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 16.sp), | ||
| body2 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 14.sp), | ||
| subtitle1 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Medium, fontSize = 16.sp), | ||
| subtitle2 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Medium, fontSize = 14.sp), | ||
| button = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Bold, fontSize = 14.sp), | ||
| caption = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 12.sp), | ||
| overline = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 10.sp), | ||
| ) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.