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

Add ElementCircularProgressIndicator and ElementOutlinedTextField.

Browse Source
This commit is contained in:
Benoit Marty
2023-01-26 17:51:39 +01:00
committed by Benoit Marty
parent e889856d1c
commit 7d85d8da30
8 changed files with 190 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt
+4 -6
View File
@@ -26,9 +26,6 @@ import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
@@ -52,11 +49,12 @@ import io.element.android.libraries.designsystem.components.LabelledCheckbox
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
import io.element.android.libraries.designsystem.components.form.textFieldState
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.ElementSurface
import io.element.android.libraries.designsystem.utils.LogCompositions
import io.element.android.libraries.ui.strings.R as StringR
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun BugReportView(
state: BugReportState,
@@ -115,7 +113,7 @@ fun BugReportView(
Column(
// modifier = Modifier.weight(1f),
) {
OutlinedTextField(
ElementOutlinedTextField(
value = descriptionFieldState,
modifier = Modifier
.fillMaxWidth()
@@ -195,7 +193,7 @@ fun BugReportView(
}
when (state.sending) {
is Async.Loading -> {
CircularProgressIndicator(
ElementCircularProgressIndicator(
progress = state.sendingProgress,
modifier = Modifier.align(Alignment.Center)
)