Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-08 15:28:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: update title styles (screens, dialog, bottom sheets) (#827)

Browse Source
This commit is contained in:
Diego Beraldin 2024-05-11 08:41:01 +02:00 committed by GitHub
parent eaff49d31e
commit f3dc42c14e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
39 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/commonui/components/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/BottomSheetHandle.kt
View File

@ -37,8 +37,8 @@ fun BottomSheetHeader(
),
text = title,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
}
}

6
core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/EditFormattedlInfoDialog.kt
View File

@ -73,7 +73,7 @@ fun EditFormattedInfoDialog(
) {
Text(
text = LocalXmlStrings.current.postActionEdit,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.s))
@ -103,8 +103,8 @@ fun EditFormattedInfoDialog(
TextFormattingBar(
modifier = Modifier.padding(
top = Spacing.s,
start = Spacing.m,
end = Spacing.m,
start = Spacing.s,
end = Spacing.s,
),
textFieldValue = textFieldValue,
onTextFieldValueChanged = {

2
core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/EditTextualInfoDialog.kt
View File

@ -61,7 +61,7 @@ fun EditTextualInfoDialog(
) {
Text(
text = LocalXmlStrings.current.postActionEdit,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.s))

2
core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/NumberPickerDialog.kt
View File

@ -52,7 +52,7 @@ fun NumberPickerDialog(
) {
Text(
text = title,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.s))

2
core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SelectLanguageDialog.kt
View File

@ -45,7 +45,7 @@ fun SelectLanguageDialog(
) {
Text(
text = LocalXmlStrings.current.settingsLanguage,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.xs))

6
feature/profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/main/ProfileMainScreen.kt
View File

@ -182,6 +182,7 @@ internal object ProfileMainScreen : Tab {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.navigationProfile,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {
@ -262,7 +263,10 @@ internal object ProfileMainScreen : Tab {
logoutConfirmDialogOpen = false
},
title = {
Text(text = LocalXmlStrings.current.actionLogout)
Text(
text = LocalXmlStrings.current.actionLogout,
style = MaterialTheme.typography.titleMedium,
)
},
text = {
Text(text = LocalXmlStrings.current.messageAreYouSure)

1
feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/advanced/AdvancedSettingsScreen.kt
View File

@ -120,6 +120,7 @@ class AdvancedSettingsScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsAdvanced,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt
View File

@ -97,6 +97,7 @@ class SettingsColorAndFontScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsColorsAndFonts,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt
View File

@ -134,6 +134,7 @@ class SettingsScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.navigationSettings,
style = MaterialTheme.typography.titleMedium,
)
},
)

2
unit/about/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/about/AboutDialog.kt
View File

@ -74,7 +74,7 @@ class AboutDialog : Screen {
) {
Text(
text = LocalXmlStrings.current.settingsAbout,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.s))

1
unit/accountsettings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/accountsettings/AccountSettingsScreen.kt
View File

@ -146,6 +146,7 @@ class AccountSettingsScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsWebPreferences,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
unit/ban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/ban/BanUserScreen.kt
View File

@ -123,6 +123,7 @@ class BanUserScreen(
Text(
text = title,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

1
unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatScreen.kt
View File

@ -152,6 +152,7 @@ class InboxChatScreen(
text = uiState.otherUserName,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleMedium,
)
}
},

2
unit/choosecolor/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/choosecolor/ColorPickerDialog.kt
View File

@ -53,7 +53,7 @@ fun ColorPickerDialog(
) {
Text(
text = LocalXmlStrings.current.settingsColorDialogTitle,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.xs))

2
unit/choosefont/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/choosefont/FontScaleBottomSheet.kt
View File

@ -71,7 +71,7 @@ class FontScaleBottomSheet(
end = Spacing.s,
),
text = title,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Column(

1
unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailScreen.kt
View File

@ -277,6 +277,7 @@ class CommunityDetailScreen(
text = uiState.community.readableName(uiState.preferNicknames),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

2
unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoScreen.kt
View File

@ -88,7 +88,7 @@ class CommunityInfoScreen(
title = {
Text(
text = title,
style = MaterialTheme.typography.bodyLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
},

1
unit/configurecontentview/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/configurecontentview/ConfigureContentViewScreen.kt
View File

@ -75,6 +75,7 @@ class ConfigureContentViewScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsConfigureContent,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
unit/configureswipeactions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/configureswipeactions/ConfigureSwipeActionsScreen.kt
View File

@ -77,6 +77,7 @@ class ConfigureSwipeActionsScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsConfigureSwipeActions,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

5
unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt
View File

@ -188,6 +188,7 @@ class CreateCommentScreen(
}
},
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {
@ -326,8 +327,8 @@ class CreateCommentScreen(
TextFormattingBar(
modifier = Modifier.padding(
top = Spacing.s,
start = Spacing.m,
end = Spacing.m,
start = Spacing.s,
end = Spacing.s,
),
textFieldValue = uiState.textValue,
onTextFieldValueChanged = { value ->

5
unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
View File

@ -252,6 +252,7 @@ class CreatePostScreen(
else -> LocalXmlStrings.current.createPostTitle
},
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {
@ -510,8 +511,8 @@ class CreatePostScreen(
TextFormattingBar(
modifier = Modifier.padding(
top = Spacing.s,
start = Spacing.m,
end = Spacing.m,
start = Spacing.s,
end = Spacing.s,
),
textFieldValue = uiState.bodyValue,
onTextFieldValueChanged = { value ->

1
unit/createreport/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createreport/CreateReportScreen.kt
View File

@ -113,6 +113,7 @@ class CreateReportScreen(
Text(
text = title,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

5
unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/components/DrawerHeader.kt
View File

@ -26,7 +26,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.commonui.components.CustomI
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.components.PlaceholderImage
import com.github.diegoberaldin.raccoonforlemmy.core.l10n.LocalXmlStrings
import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
@Composable
@ -82,7 +81,7 @@ internal fun DrawerHeader(
append(user.name)
}
},
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = fullColor,
)
Text(
@ -119,7 +118,7 @@ internal fun DrawerHeader(
) {
Text(
text = anonymousTitle,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = fullColor,
)
Row {

1
unit/editcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/editcommunity/EditCommunityScreen.kt
View File

@ -148,6 +148,7 @@ class EditCommunityScreen(
append(" ")
append(uiState.title)
},
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

2
unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoScreen.kt
View File

@ -109,8 +109,8 @@ class InstanceInfoScreen(
title = {
Text(
text = LocalXmlStrings.current.instanceDetailTitle(instanceName),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

2
unit/licences/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/licences/LicencesScreen.kt
View File

@ -34,7 +34,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.l10n.LocalXmlStrings
import com.github.diegoberaldin.raccoonforlemmy.core.navigation.di.getNavigationCoordinator
import com.github.diegoberaldin.raccoonforlemmy.core.persistence.di.getSettingsRepository
import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
import com.github.diegoberaldin.raccoonforlemmy.core.utils.url.getCustomTabsHelper
import com.github.diegoberaldin.raccoonforlemmy.core.utils.url.toUrlOpeningMode
import com.github.diegoberaldin.raccoonforlemmy.unit.licences.components.LicenceItem
@ -65,6 +64,7 @@ class LicencesScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsAboutLicences,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
unit/login/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/login/LoginBottomSheet.kt
View File

@ -119,6 +119,7 @@ class LoginBottomSheet : Screen {
Text(
text = LocalXmlStrings.current.profileButtonLogin,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanScreen.kt
View File

@ -73,6 +73,7 @@ class ManageBanScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.settingsManageBan,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

2
unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsScreen.kt
View File

@ -136,7 +136,7 @@ class ManageSubscriptionsScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.navigationDrawerTitleSubscriptions,
style = MaterialTheme.typography.titleMedium
style = MaterialTheme.typography.titleMedium,
)
},
scrollBehavior = scrollBehavior,

1
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt
View File

@ -164,6 +164,7 @@ class MultiCommunityScreen(
text = uiState.community.name,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleMedium,
)
},
scrollBehavior = scrollBehavior,

1
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorScreen.kt
View File

@ -95,6 +95,7 @@ class MultiCommunityEditorScreen(
Text(
text = LocalXmlStrings.current.multiCommunityEditorTitle,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
navigationIcon = {

1
unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt
View File

@ -298,6 +298,7 @@ class PostDetailScreen(
text = uiState.post.title,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

2
unit/rawcontent/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/rawcontent/RawContentDialog.kt
View File

@ -78,7 +78,7 @@ fun RawContentDialog(
) {
Text(
text = LocalXmlStrings.current.dialogTitleRawContent,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = fullColor,
)
Spacer(modifier = Modifier.height(Spacing.s))

1
unit/remove/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/remove/RemoveScreen.kt
View File

@ -109,6 +109,7 @@ class RemoveScreen(
Text(
text = LocalXmlStrings.current.modActionRemove,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

1
unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsScreen.kt
View File

@ -106,6 +106,7 @@ class SavedItemsScreen : Screen {
Text(
modifier = Modifier.padding(horizontal = Spacing.s),
text = LocalXmlStrings.current.navigationDrawerTitleBookmarks,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

2
unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityDialog.kt
View File

@ -68,7 +68,7 @@ class SelectCommunityDialog : Screen {
) {
Text(
text = LocalXmlStrings.current.dialogTitleSelectCommunity,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.height(Spacing.s))

2
unit/selectinstance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectinstance/dialog/ChangeInstanceDialog.kt
View File

@ -55,7 +55,7 @@ internal fun ChangeInstanceDialog(
) {
Text(
text = LocalXmlStrings.current.dialogTitleAddInstance,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
TextField(

1
unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailScreen.kt
View File

@ -218,6 +218,7 @@ class UserDetailScreen(
text = userName,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.titleMedium,
)
},
actions = {

2
unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoScreen.kt
View File

@ -92,7 +92,7 @@ class UserInfoScreen(
title = {
Text(
text = title,
style = MaterialTheme.typography.bodyLarge,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onBackground,
)
},