Rename component. No need for Element prefix

2023-01-30 16:11:54 +01:00 · 2023-01-30 16:11:54 +01:00 · 201508678a
commit 201508678a
parent cdfc13cb15
33 changed files with 125 additions and 111 deletions
--- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt
+++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt
@ -51,9 +51,9 @@ import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementButton
-import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
-import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
+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.OutlinedTextField
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
@ -122,7 +122,7 @@ fun ChangeServerView(
                color = ElementTheme.colors.secondary,
            )
            var homeserverFieldState by textFieldState(stateValue = state.homeserver)
-            ElementOutlinedTextField(
+            OutlinedTextField(
                value = homeserverFieldState,
                modifier = Modifier
                    .fillMaxWidth()
@ -155,7 +155,7 @@ fun ChangeServerView(
                    modifier = Modifier.padding(start = 16.dp)
                )
            }
-            ElementButton(
+            Button(
                onClick = { eventSink(ChangeServerEvents.Submit) },
                enabled = state.submitEnabled,
                modifier = Modifier
@ -170,7 +170,7 @@ fun ChangeServerView(
            }
        }
        if (state.changeServerAction is Async.Loading) {
-            ElementCircularProgressIndicator(
+            CircularProgressIndicator(
                modifier = Modifier.align(Alignment.Center)
            )
        }
--- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt
+++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt
@ -52,11 +52,11 @@ import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementButton
-import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
-import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
+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.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
+import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.core.SessionId
 import io.element.android.libraries.testtags.TestTags
@ -107,7 +107,7 @@ fun LoginRootScreen(
                Box(
                    modifier = Modifier.fillMaxWidth()
                ) {
-                    ElementOutlinedTextField(
+                    OutlinedTextField(
                        value = state.homeserver,
                        modifier = Modifier.fillMaxWidth(),
                        onValueChange = { /* no op */ },
@ -119,7 +119,7 @@ fun LoginRootScreen(
                            keyboardType = KeyboardType.Uri,
                        ),
                    )
-                    ElementButton(
+                    Button(
                        onClick = onChangeServer,
                        modifier = Modifier
                            .align(Alignment.CenterEnd)
@ -130,7 +130,7 @@ fun LoginRootScreen(
                        }
                    )
                }
-                ElementOutlinedTextField(
+                OutlinedTextField(
                    value = loginFieldState,
                    modifier = Modifier
                        .fillMaxWidth()
@ -153,7 +153,7 @@ fun LoginRootScreen(
                    // Ensure password is hidden when user submits the form
                    passwordVisible = false
                }
-                ElementOutlinedTextField(
+                OutlinedTextField(
                    value = passwordFieldState,
                    modifier = Modifier
                        .fillMaxWidth()
@ -196,7 +196,7 @@ fun LoginRootScreen(
                }
            }
            // Submit
-            ElementButton(
+            Button(
                onClick = { eventSink(LoginRootEvents.Submit) },
                enabled = state.submitEnabled,
                modifier = Modifier
@ -212,7 +212,7 @@ fun LoginRootScreen(
            }
        }
        if (state.loggedInState is LoggedInState.LoggingIn) {
-            ElementCircularProgressIndicator(
+            CircularProgressIndicator(
                modifier = Modifier.align(Alignment.Center)
            )
        }
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt
@ -59,11 +59,11 @@ import io.element.android.features.messages.timeline.TimelineView
 import io.element.android.features.messages.timeline.model.TimelineItem
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.designsystem.theme.components.ElementScaffold
-import io.element.android.libraries.designsystem.theme.components.ElementTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
+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.designsystem.utils.LogCompositions
 import kotlinx.coroutines.launch
 import timber.log.Timber
@ -101,7 +101,7 @@ fun MessagesView(
        state.eventSink(MessagesEvents.HandleAction(action, messageEvent))
    }

-    ElementScaffold(
+    Scaffold(
        modifier = modifier,
        contentWindowInsets = WindowInsets.statusBars,
        topBar = {
@ -172,7 +172,7 @@ fun MessagesViewTopBar(
    modifier: Modifier = Modifier,
    onBackPressed: () -> Unit = {},
 ) {
-    ElementTopAppBar(
+    TopAppBar(
        modifier = modifier,
        navigationIcon = {
            IconButton(onClick = onBackPressed) {
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt
@ -43,7 +43,7 @@ import io.element.android.features.messages.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.timeline.model.TimelineItem
 import io.element.android.libraries.designsystem.components.VectorIcon
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementModalBottomSheetLayout
+import io.element.android.libraries.designsystem.theme.components.ModalBottomSheetLayout
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch

@ -73,7 +73,7 @@ fun ActionListView(
        }
    }

-    ElementModalBottomSheetLayout(
+    ModalBottomSheetLayout(
        modifier = modifier,
        sheetState = modalBottomSheetState,
        sheetContent = {
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt
@ -77,7 +77,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.FloatingActionButton
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
@ -345,7 +345,7 @@ internal fun TimelineLoadingMoreIndicator() {
            .padding(8.dp),
        contentAlignment = Alignment.Center,
    ) {
-        ElementCircularProgressIndicator(
+        CircularProgressIndicator(
            strokeWidth = 2.dp,
            color = ElementTheme.colors.primary
        )
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt
@ -30,7 +30,7 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.dp
 import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
+import io.element.android.libraries.designsystem.theme.components.Surface

 private val BUBBLE_RADIUS = 16.dp

@ -91,7 +91,7 @@ fun MessageEventBubble(
        }
    }
    val bubbleShape = bubbleShape()
-    ElementSurface(
+    Surface(
        modifier = modifier
            .widthIn(min = 80.dp)
            .offsetForItem()
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt
@ -32,7 +32,7 @@ import com.google.accompanist.flowlayout.FlowRow
 import io.element.android.features.messages.timeline.model.AggregatedReaction
 import io.element.android.features.messages.timeline.model.TimelineItemReactions
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
+import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text

@Composable
@ -54,7 +54,7 @@ fun TimelineItemReactionsView(

@Composable
 fun MessagesReactionButton(reaction: AggregatedReaction, modifier: Modifier = Modifier) {
-    ElementSurface(
+    Surface(
        modifier = modifier,
        color = ElementTheme.colors.surfaceVariant,
        border = BorderStroke(2.dp, ElementTheme.colors.background),
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt
@ -47,7 +47,7 @@ import io.element.android.libraries.designsystem.LinkColor
 import io.element.android.libraries.designsystem.components.ClickableLinkText
 import io.element.android.libraries.designsystem.theme.ElementColors
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
+import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.permalink.PermalinkData
 import io.element.android.libraries.matrix.permalink.PermalinkParser
@ -340,7 +340,7 @@ private fun HtmlMxReply(
 ) {
    val blockquote = mxReply.childNodes().firstOrNull() ?: return
    val shape = RoundedCornerShape(12.dp)
-    ElementSurface(
+    Surface(
        modifier = modifier
            .padding(bottom = 4.dp)
            .offset(x = -(8.dp)),
--- a/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt
+++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt
@ -43,7 +43,7 @@ import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.HorizontalPagerIndicator
 import com.google.accompanist.pager.rememberPagerState
-import io.element.android.libraries.designsystem.theme.components.ElementButton
+import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
@ -100,7 +100,7 @@ fun OnBoardingScreen(
                    .align(CenterHorizontally)
                    .padding(16.dp),
            )
-            ElementButton(
+            Button(
                onClick = {
                    onSignIn()
                },
--- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt
@ -50,9 +50,9 @@ import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementButton
-import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
-import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
+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.OutlinedTextField
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.ui.strings.R as StringR
@ -114,7 +114,7 @@ fun BugReportView(
            Column(
                // modifier = Modifier.weight(1f),
            ) {
-                ElementOutlinedTextField(
+                OutlinedTextField(
                    value = descriptionFieldState,
                    modifier = Modifier
                        .fillMaxWidth()
@ -182,7 +182,7 @@ fun BugReportView(
                }
            }
            // Submit
-            ElementButton(
+            Button(
                onClick = { eventSink(BugReportEvents.SendBugReport) },
                enabled = state.submitEnabled,
                modifier = Modifier
@ -194,7 +194,7 @@ fun BugReportView(
        }
        when (state.sending) {
            is Async.Loading -> {
-                ElementCircularProgressIndicator(
+                CircularProgressIndicator(
                    progress = state.sendingProgress,
                    modifier = Modifier.align(Alignment.Center)
                )
--- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt
+++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt
@ -42,7 +42,7 @@ import io.element.android.features.roomlist.model.stubbedRoomSummaries
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.ElementScaffold
+import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.matrix.core.RoomId
 import io.element.android.libraries.matrix.core.UserId
@ -118,7 +118,7 @@ fun RoomListView(
        }
    }

-    ElementScaffold(
+    Scaffold(
        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
        topBar = {
            RoomListTopBar(
--- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt
+++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt
@ -38,7 +38,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@ -47,12 +46,12 @@ import androidx.compose.ui.unit.sp
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.components.ElementMediumAppBar
-import io.element.android.libraries.designsystem.theme.components.ElementTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
+import io.element.android.libraries.designsystem.theme.components.MediumTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextField
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import io.element.android.libraries.ui.strings.R as StringR
@ -112,7 +111,7 @@ fun SearchRoomListTopBar(
 ) {
    var filterState by textFieldState(stateValue = text)
    val focusRequester = remember { FocusRequester() }
-    ElementTopAppBar(
+    TopAppBar(
        modifier = modifier
            .nestedScroll(scrollBehavior.nestedScrollConnection),
        title = {
@ -179,7 +178,7 @@ private fun DefaultRoomListTopBar(
    scrollBehavior: TopAppBarScrollBehavior,
    modifier: Modifier = Modifier,
 ) {
-    ElementMediumAppBar(
+    MediumTopAppBar(
        modifier = modifier
            .nestedScroll(scrollBehavior.nestedScrollConnection),
        title = {