-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
1,324 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,8 +100,8 @@ object ReportBugDestination : IntentDirection { | |
| val dir = LogFileWriter.logsDirectory(context) | ||
| val logsUris = context.getUrisOfFilesInDirectory(dir) | ||
| val intent = context.multipleFileSharingIntent(logsUris) | ||
| intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("[email protected]")) | ||
| intent.putExtra(Intent.EXTRA_SUBJECT, "Bug Report - Wire Beta") | ||
| intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.send_bug_report_email))) | ||
| intent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.send_bug_report_subject)) | ||
| intent.putExtra( | ||
| Intent.EXTRA_TEXT, | ||
| EmailComposer.reportBugEmailTemplate( | ||
|
|
||
46 changes: 46 additions & 0 deletions
46
app/src/main/kotlin/com/wire/android/navigation/TeamMigrationDestination.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.navigation | ||
|
|
||
| import com.ramcosta.composedestinations.spec.Direction | ||
| import com.wire.android.ui.destinations.TeamMigrationConfirmationStepScreenDestination | ||
| import com.wire.android.ui.destinations.TeamMigrationDoneStepScreenDestination | ||
|
|
||
| sealed class TeamMigrationDestination( | ||
| val direction: Direction | ||
| ) { | ||
|
|
||
| data object Confirmation : TeamMigrationDestination( | ||
| direction = TeamMigrationConfirmationStepScreenDestination | ||
| ) | ||
|
|
||
| data object MigrationDone : TeamMigrationDestination( | ||
| direction = TeamMigrationDoneStepScreenDestination | ||
| ) | ||
|
|
||
| val itemName: String get() = ITEM_NAME_PREFIX + this | ||
|
|
||
| companion object { | ||
| private const val ITEM_NAME_PREFIX = "TeamMigrationNavigationItem." | ||
| fun fromRoute(fullRoute: String): TeamMigrationDestination? = | ||
| values().find { it.direction.route.getBaseRoute() == fullRoute.getBaseRoute() } | ||
|
|
||
| fun values(): Array<TeamMigrationDestination> = | ||
| arrayOf(Confirmation, MigrationDone) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/BottomLineButtons.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.userprofile.teammigration | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.ExperimentalLayoutApi | ||
| import androidx.compose.foundation.layout.WindowInsets | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.imePadding | ||
| import androidx.compose.foundation.layout.isImeVisible | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.wire.android.R | ||
| import com.wire.android.ui.common.button.WireButtonState | ||
| import com.wire.android.ui.common.button.WirePrimaryButton | ||
| import com.wire.android.ui.common.button.WireSecondaryButton | ||
| import com.wire.android.ui.common.dimensions | ||
| import com.wire.android.ui.common.preview.MultipleThemePreviews | ||
| import com.wire.android.ui.theme.WireTheme | ||
|
|
||
| @OptIn(ExperimentalLayoutApi::class) | ||
| @Composable | ||
| fun BottomLineButtons( | ||
| isContinueButtonEnabled: Boolean, | ||
| modifier: Modifier = Modifier, | ||
| isBackButtonVisible: Boolean = true, | ||
| onBack: () -> Unit = { }, | ||
| onContinue: () -> Unit = { } | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .padding( | ||
| top = dimensions().spacing16x, | ||
| start = dimensions().spacing16x, | ||
| end = dimensions().spacing16x, | ||
| bottom = if (!WindowInsets.isImeVisible) { | ||
| dimensions().spacing32x | ||
| } else { | ||
| dimensions().spacing16x | ||
| } | ||
| ) | ||
| .imePadding() | ||
| ) { | ||
| if (isBackButtonVisible) { | ||
| WireSecondaryButton( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| text = stringResource(R.string.personal_to_team_migration_back_button_label), | ||
| onClick = onBack | ||
| ) | ||
| } | ||
|
|
||
| WirePrimaryButton( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(top = dimensions().spacing6x), | ||
| text = stringResource(R.string.label_continue), | ||
| onClick = onContinue, | ||
| state = if (isContinueButtonEnabled) { | ||
| WireButtonState.Default | ||
| } else { | ||
| WireButtonState.Disabled | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @MultipleThemePreviews | ||
| @Composable | ||
| private fun BottomLineButtonsPreview() { | ||
| WireTheme { | ||
| BottomLineButtons( | ||
| isContinueButtonEnabled = true | ||
| ) | ||
| } | ||
| } |
66 changes: 66 additions & 0 deletions
66
app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/BulletList.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.userprofile.teammigration | ||
|
|
||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.ParagraphStyle | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.style.TextIndent | ||
| import androidx.compose.ui.text.withStyle | ||
| import androidx.compose.ui.unit.sp | ||
| import com.wire.android.ui.common.colorsScheme | ||
| import com.wire.android.ui.theme.WireTheme | ||
| import com.wire.android.ui.theme.wireTypography | ||
| import com.wire.android.util.ui.PreviewMultipleThemes | ||
|
|
||
| @Composable | ||
| fun BulletList(messages: List<String>, modifier: Modifier = Modifier) { | ||
| val bullet = "\u2022" | ||
| val paragraphStyle = ParagraphStyle(textIndent = TextIndent(restLine = 12.sp)) | ||
| Text( | ||
| modifier = modifier, | ||
| text = buildAnnotatedString { | ||
| messages.forEach { | ||
| withStyle(style = paragraphStyle) { | ||
| append(bullet) | ||
| append("\t\t") | ||
| append(it) | ||
| } | ||
| } | ||
| }, | ||
| style = MaterialTheme.wireTypography.body01, | ||
| color = colorsScheme().onBackground | ||
| ) | ||
| } | ||
|
|
||
| @PreviewMultipleThemes | ||
| @Composable | ||
| private fun BulletListPreview() { | ||
| WireTheme { | ||
| BulletList( | ||
| messages = listOf( | ||
| "Item 1", | ||
| "Item 2", | ||
| "Item 3" | ||
| ) | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.