Setup Jetpack Compose #406
Merged
Conversation
This file contains 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
This fixes a bug where the help articles list couldn't be refreshed correctly
The colour schemes were auto-generated by the [Material Theme Builder using the custom preset](https://m3.material.io/theme-builder#/custom), with the following colours: * Primary: `#8d5fff` * Secondary: `#c0b1c8` * Tertiary: `#c87994` * Neutral: `#938f94` This commit also updates the `StudyBuddyTheme` composable's parameters to allow for: * whether dynamic colours should be used (defaults to `true` on devices that support it) * whether to use the new M3 colour schemes (defaults to `true`)
The `StudyBuddyTheme` composable should be used instead
* Adds a single unit test to verify that the Baloo 2 font is used for all typography styles * Remove example unit test
* Accompanist: `0.30.0` -> `0.30.1` * Compose BoM: `2023.03.00` -> `2023.04.00-beta01.1`
In preparation of an upcoming Compose module 👀
EdricChan03
added
enhancement
17 tasks
Iannnr
reviewed
May 30, 2023
| package com.edricchan.studybuddy.library | ||
|
|
||
| plugins { | ||
| id("com.edricchan.studybuddy.library.android") |
|
|
||
| android { | ||
| buildFeatures.compose = true | ||
| composeOptions.kotlinCompilerExtensionVersion = "1.4.7" |
There was a problem hiding this comment.
Version catalogs aren't natively supported in convention plugins AFAICT - see gradle/gradle#15383
| @@ -14,7 +14,7 @@ class GitHubHelpApiImpl @Inject constructor( | |||
| private val http: HttpClient | |||
| ) : HelpApi { | |||
| override suspend fun fetchHelpArticles(): List<HelpArticle> { | |||
| return http.use { it.get(urlHelpFeatured).body<HelpArticles>().articles } | |||
| return http.get(urlHelpFeatured).body<HelpArticles>().articles | |||
| */ | ||
| @Composable | ||
| fun StudyBuddyTheme( | ||
| context: Context = LocalContext.current, |
There was a problem hiding this comment.
I don't see why a context is needed as a parameter here, there's nothing that you can pass in that'll actually affect dynamicDarkColorScheme/dynamicLightColorScheme, right?
|
|
||
| private val defaultTypography = Typography() | ||
|
|
||
| val StudyBuddyTypography = Typography( |
There was a problem hiding this comment.
oh this is unfortunate 🙃 hopefully they fix it soon!
|
|
||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| val md_theme_light_primary = Color(0xFF6C39DC) |
There was a problem hiding this comment.
Respect for straight up copying all the variable names too 😂
| @@ -0,0 +1,38 @@ | |||
| plugins { | |||
| id("com.edricchan.studybuddy.library.android-compose") | |||
...idgets/compose/src/main/kotlin/com/edricchan/studybuddy/ui/widgets/compose/BackIconButton.kt
Show resolved
Hide resolved
...idgets/compose/src/main/kotlin/com/edricchan/studybuddy/ui/widgets/compose/BackIconButton.kt
Show resolved
Hide resolved
| class ExampleUnitTest { | ||
| @Test | ||
| fun addition_isCorrect() { | ||
| assertEquals(4, 2 + 2) |
EdricChan03
added a commit
that referenced
this pull request
Jun 18, 2023
* Nuke `Defaults` object as we aren't passing in any custom tooltip/icon data * Require `onClick` to be specified * Improve preview
EdricChan03
added a commit
that referenced
this pull request
Jun 23, 2023
* Address comments from #406 * Mark `moreExpanded` as a save-able
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is a preliminary requirement to migrating the whole project to Jetpack Compose (at some point...)
See #368 for more info on the progress
Additions
This PR adds the following changes:
StudyBuddyTheme+StudyBuddyCompatTheme- the latter should be used for existing compatibility with the current app's theme)SetSystemBarsColorcomposable for insets support (this just sets the colour for the status bar/navigation bar):ui:widgets:views)GitHubHelpApiImplwhere the help articles weren't refreshed correctly (this is becauseHttpClient.useactually closes the client once it's called, as per the implementation ofAutoClosable.usefrom Kotlin stdlib, so it won't be usable again without creating a newHttpClientinstance, and as we're sharing the instance throughout the app, hence the issue)