Merge pull request #425 from vector-im/feature/bma/material3_update

Use default material3 version again and cleanup `@OptIn` annotations.
2023-05-16 09:51:17 +02:00 · 2023-05-16 09:51:17 +02:00 · a0206b2b2f
commit a0206b2b2f
parent 1f4a442d8c 8547d5f267
62 changed files with 95 additions and 134 deletions
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@ -41,7 +41,6 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.ui.strings.R as StringR

-@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun AddPeopleView(
    state: UserListState,
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalMaterial3Api::class)
-
 package io.element.android.features.createroom.impl.configureroom

 import android.net.Uri
@ -129,6 +127,7 @@ fun ConfigureRoomView(
    }
 }

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun ConfigureRoomToolbar(
    isNextActionEnabled: Boolean,
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@ -55,7 +55,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.designsystem.R as DrawableR
 import io.element.android.libraries.ui.strings.R as StringR

-@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun CreateRoomRootView(
    state: CreateRoomRootState,
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@ -14,11 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(
-    ExperimentalMaterial3Api::class,
-    ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class,
-)
-
 package io.element.android.features.messages.impl

 import androidx.activity.compose.BackHandler
@ -84,6 +79,7 @@ import io.element.android.libraries.designsystem.utils.LogCompositions
 import kotlinx.coroutines.launch
 import timber.log.Timber

+@OptIn(ExperimentalMaterialApi::class)
@Composable
 fun MessagesView(
    state: MessagesState,
@ -239,6 +235,7 @@ fun MessagesViewContent(
    }
 }

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun MessagesViewTopBar(
    roomTitle: String?,
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalMaterialApi::class)
-
 package io.element.android.features.messages.impl.actionlist

 import androidx.compose.foundation.clickable
@ -49,6 +47,7 @@ import io.element.android.libraries.designsystem.theme.components.ModalBottomShe
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch

+@OptIn(ExperimentalMaterialApi::class)
@Composable
 fun ActionListView(
    state: ActionListState,
@ -90,6 +89,7 @@ fun ActionListView(
    )
 }

+@OptIn(ExperimentalMaterialApi::class)
@Composable
 private fun SheetContent(
    state: ActionListState,
@ -145,6 +145,7 @@ fun SheetContentLightPreview(@PreviewParameter(ActionListStateProvider::class) s
 fun SheetContentDarkPreview(@PreviewParameter(ActionListStateProvider::class) state: ActionListState) =
    ElementPreviewDark { ContentToPreview(state) }

+@OptIn(ExperimentalMaterialApi::class)
@Composable
 private fun ContentToPreview(state: ActionListState) {
    ActionListView(
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalCoroutinesApi::class)
-
 package io.element.android.features.messages.textcomposer

 import app.cash.molecule.RecompositionClock
@ -52,7 +50,6 @@ import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import io.mockk.mockk
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingScreen.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingScreen.kt
@ -41,7 +41,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.HorizontalPagerIndicator
 import com.google.accompanist.pager.rememberPagerState
@ -53,9 +52,7 @@ import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import io.element.android.libraries.ui.strings.R as StringR

-@OptIn(ExperimentalPagerApi::class)
@Composable
 fun OnBoardingScreen(
    modifier: Modifier = Modifier,
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@ -71,7 +71,6 @@ import io.element.android.libraries.matrix.ui.components.MatrixUserRow
 import kotlinx.collections.immutable.ImmutableList
 import io.element.android.libraries.ui.strings.R as StringR

-@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun RoomMemberListView(
    state: RoomMemberListState,
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
@ -116,7 +116,7 @@ fun RoomListView(
    }
 }

-@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun RoomListContent(
    state: RoomListState,
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalMaterial3Api::class)
-
 package io.element.android.features.roomlist.impl.components

 import androidx.activity.compose.BackHandler
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearch.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearch.kt
@ -20,7 +20,6 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@ -30,7 +29,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
@ -60,6 +58,7 @@ import io.element.android.libraries.designsystem.modifiers.applyIf
 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.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.copy
 import io.element.android.libraries.matrix.api.core.RoomId
@ -128,12 +127,14 @@ internal fun RoomListSearchResultContent(
                            .focusRequester(focusRequester),
                        value = filter,
                        onValueChange = { state.eventSink(RoomListEvents.UpdateFilter(it)) },
-                        colors = TextFieldDefaults.textFieldColors(
-                            containerColor = Color.Transparent,
+                        colors = TextFieldDefaults.colors(
+                            focusedContainerColor = Color.Transparent,
+                            unfocusedContainerColor = Color.Transparent,
+                            disabledContainerColor = Color.Transparent,
                            focusedIndicatorColor = Color.Transparent,
                            unfocusedIndicatorColor = Color.Transparent,
+                            disabledIndicatorColor = Color.Transparent,
                            errorIndicatorColor = Color.Transparent,
-                            disabledIndicatorColor = Color.Transparent
                        ),
                        trailingIcon = {
                            if (filter.isNotEmpty()) {