ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move TypographyAliases next to ColorAliases

Browse Source
This commit is contained in:
Benoit Marty
2023-07-11 10:47:08 +02:00
committed by Benoit Marty
parent 53501a6483
commit 253e8c1c2b
21 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonWithProgress.kt
+1 -1
View File
@@ -34,12 +34,12 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import io.element.android.libraries.designsystem.preview.ElementThemedPreview
import io.element.android.libraries.designsystem.preview.PreviewGroup
import io.element.android.libraries.designsystem.theme.aliasButtonText
import io.element.android.libraries.designsystem.theme.components.Button
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
import io.element.android.libraries.designsystem.theme.components.ElementButtonDefaults
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
/**
* A component that will display a button with an indeterminate circular progressbar.
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt
+1 -1
View File
@@ -39,11 +39,11 @@ import androidx.compose.ui.tooling.preview.Preview
import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasScreenTitle
@OptIn(ExperimentalLayoutApi::class)
@Composable
libraries/theme/src/main/kotlin/io/element/android/libraries/theme/TypographyAliases.kt → libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/TypographyAliases.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.element.android.libraries.theme
package io.element.android.libraries.designsystem.theme
import androidx.compose.ui.text.TextStyle
import io.element.android.libraries.theme.compound.generated.TypographyTokens