Integrate AboutLibraries to display open-source licenses in Settings #64
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
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,48 @@ | ||
| package com.rickyhu.hushkeyboard.libraries | ||
|
|
||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TopAppBar | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer | ||
| import com.rickyhu.hushkeyboard.R | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun LibrariesScreen(onBackClick: () -> Unit = {}) { | ||
| Scaffold( | ||
| topBar = { | ||
| TopAppBar( | ||
| title = { | ||
| Text( | ||
| text = stringResource(R.string.libraries), | ||
| style = MaterialTheme.typography.headlineMedium, | ||
| ) | ||
| }, | ||
| navigationIcon = { | ||
| IconButton(onClick = onBackClick) { | ||
| Icon( | ||
| painter = painterResource(R.drawable.ic_return), | ||
| contentDescription = stringResource(R.string.libraries), | ||
| ) | ||
| } | ||
| }, | ||
| ) | ||
| }, | ||
| ) { padding -> | ||
| LibrariesContainer( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(padding), | ||
| ) | ||
| } | ||
| } | ||
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
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
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 |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ package com.rickyhu.hushkeyboard.settings | |
|
|
||
| import androidx.annotation.VisibleForTesting | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
|
|
@@ -12,6 +13,7 @@ import androidx.compose.foundation.shape.CircleShape | |
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.HorizontalDivider | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.ListItem | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
|
|
@@ -38,7 +40,10 @@ import com.rickyhu.hushkeyboard.theme.HushKeyboardTheme | |
| import org.koin.androidx.compose.koinViewModel | ||
|
|
||
| @Composable | ||
| fun SettingsScreen( | ||
| viewModel: SettingsViewModel = koinViewModel(), | ||
| onLibrariesClick: () -> Unit = {}, | ||
| ) { | ||
| val state by viewModel.settingsState.collectAsState(SettingsState()) | ||
|
|
||
| SettingsContent( | ||
|
|
@@ -49,6 +54,7 @@ fun SettingsScreen(viewModel: SettingsViewModel = koinViewModel()) { | |
| onSmartDeleteChanged = viewModel::updateSmartDelete, | ||
| onAddSpaceBetweenNotationChanged = viewModel::updateAddSpaceBetweenNotation, | ||
| onVibrateOnTapChanged = viewModel::updateVibrateOnTap, | ||
| onLibrariesClick = onLibrariesClick, | ||
| ) | ||
| } | ||
|
|
||
|
|
@@ -63,6 +69,7 @@ fun SettingsContent( | |
| onSmartDeleteChanged: (smartDelete: Boolean) -> Unit, | ||
| onAddSpaceBetweenNotationChanged: (addSpaceAfterNotation: Boolean) -> Unit, | ||
| onVibrateOnTapChanged: (vibrateOnTap: Boolean) -> Unit, | ||
| onLibrariesClick: () -> Unit = {}, | ||
| ) { | ||
| val context = LocalContext.current | ||
|
|
||
|
|
@@ -197,6 +204,17 @@ fun SettingsContent( | |
| trailing = { Text(versionName) }, | ||
| ) | ||
|
|
||
| ListItem( | ||
| headlineContent = { Text(stringResource(R.string.libraries)) }, | ||
| leadingContent = { | ||
| Icon( | ||
| painter = painterResource(R.drawable.ic_library), | ||
| contentDescription = stringResource(R.string.libraries), | ||
| ) | ||
| }, | ||
| modifier = Modifier.clickable { onLibrariesClick() }, | ||
| ) | ||
|
Comment on lines
+207
to
+216
There was a problem hiding this comment. The Libraries list item should follow the established codebase pattern of using a generic composable like UrlLauncherListItem, SwitchListItem, or DropdownListItem. Currently, this directly uses ListItem with clickable modifier, which is inconsistent with the other items in SettingsContent (Version uses UrlLauncherListItem, switches use SwitchListItem, etc.). Consider creating a NavigationListItem composable similar to UrlLauncherListItem that accepts a title, leading icon, and onClick callback. This would provide consistency with the existing UI component patterns and make the code more maintainable. The pattern should be:
Comment on lines
+207
to
+216
There was a problem hiding this comment. The new Libraries list item lacks test coverage. The existing test suite (SettingsScreenUiTest.kt) includes tests for all other interactive items in SettingsContent (theme dropdown, keyboard color, switches, version, etc.). Add tests to verify:
This maintains consistency with the comprehensive test coverage pattern established for other settings UI elements. |
||
|
|
||
| UrlLauncherListItem( | ||
| title = stringResource(R.string.donate), | ||
| url = stringResource(R.string.buy_me_a_coffee_url), | ||
|
|
||
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,10 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24" | ||
| android:tint="#000000"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M18,2H6C4.9,2 4,2.9 4,4v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM9,4h2v5l-1,-0.75L9,9V4zM18,20H6V4h1v9l3,-2.25L13,13V4h5v16z" /> | ||
| </vector> |
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The content description for the back button should be more descriptive. Using "Libraries" as the content description for a back/return button is misleading for accessibility.
Consider using a more appropriate description like "Navigate back" or "Back" that accurately describes the action performed when the button is pressed, rather than repeating the screen title.