From 3410b70af4160194fa60d9f8daec4fd3b8b0453b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 30 Jan 2023 16:36:51 +0100 Subject: [PATCH 1/2] Optimize import --- .../io/element/android/x/MainActivity.kt | 2 +- .../kotlin/io/element/android/x/info/Logs.kt | 3 ++- .../x/initializer/MatrixInitializer.kt | 2 +- .../x/initializer/TimberInitializer.kt | 2 +- .../element/android/x/root/RootPresenter.kt | 2 +- .../io/element/android/x/root/RootView.kt | 2 +- .../login/changeserver/ChangeServerView.kt | 6 ++--- .../features/login/error/ErrorFormatter.kt | 2 +- .../features/login/root/LoginRootScreen.kt | 4 ++-- .../features/messages/MessagesPresenter.kt | 6 ++--- .../features/messages/MessagesState.kt | 2 +- .../android/features/messages/MessagesView.kt | 6 ++--- .../actionlist/ActionListPresenter.kt | 2 +- .../messages/actionlist/ActionListView.kt | 2 +- .../actionlist/model/TimelineItemAction.kt | 1 - .../messages/timeline/TimelineItemsFactory.kt | 2 +- .../messages/timeline/TimelineView.kt | 24 +++++++++---------- .../timeline/components/MessageEventBubble.kt | 2 +- .../components/TimelineItemTextView.kt | 4 ++-- .../messages/timeline/model/TimelineItem.kt | 2 +- .../root/PreferencesRootPresenter.kt | 4 ++-- .../preferences/root/PreferencesRootState.kt | 2 +- .../preferences/root/PreferencesRootView.kt | 4 ++-- .../rageshake/bugreport/BugReportPresenter.kt | 4 ++-- .../rageshake/bugreport/BugReportView.kt | 2 +- .../rageshake/crash/CrashDataStore.kt | 2 +- .../crash/VectorUncaughtExceptionHandler.kt | 2 +- .../crash/ui/CrashDetectionPresenter.kt | 2 +- .../detection/RageshakeDetectionView.kt | 2 +- .../RageshakePreferencesPresenter.kt | 2 +- .../rageshake/rageshake/RageshakeDataStore.kt | 2 +- .../rageshake/reporter/BugReporter.kt | 20 ++++++++-------- .../features/roomlist/RoomListPresenter.kt | 8 +++---- .../android/features/roomlist/RoomListView.kt | 2 +- .../roomlist/components/RoomSummaryRow.kt | 2 +- .../roomlist/RoomListPresenterTests.kt | 4 +--- .../template/src/main/AndroidManifest.xml | 2 +- .../android/features/template/TemplateNode.kt | 2 +- .../matrix/permalink/PermalinkParser.kt | 2 +- .../matrix/room/RoomSummaryDataSource.kt | 6 ++--- .../libraries/matrixtest/FakeMatrixClient.kt | 6 ++--- .../matrixtest/room/FakeMatrixRoom.kt | 2 +- .../android/libraries/testtags/Compose.kt | 1 - .../src/main/res/values-fa/strings.xml | 2 +- .../src/main/res/values-zh-rCN/strings.xml | 2 +- 45 files changed, 82 insertions(+), 85 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt index 9a3f7951e8..4584a95bc0 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -26,8 +26,8 @@ import androidx.core.view.WindowCompat import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integrationpoint.NodeComponentActivity import io.element.android.libraries.architecture.bindings -import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.libraries.designsystem.ElementXTheme +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.AppBindings import io.element.android.x.node.RootFlowNode diff --git a/app/src/main/kotlin/io/element/android/x/info/Logs.kt b/app/src/main/kotlin/io/element/android/x/info/Logs.kt index 882746d029..9e96f48e2d 100644 --- a/app/src/main/kotlin/io/element/android/x/info/Logs.kt +++ b/app/src/main/kotlin/io/element/android/x/info/Logs.kt @@ -19,7 +19,8 @@ package io.element.android.x.info import io.element.android.x.BuildConfig import timber.log.Timber import java.text.SimpleDateFormat -import java.util.* +import java.util.Date +import java.util.Locale fun logApplicationInfo() { val appVersion = buildString { diff --git a/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt index b6e88590a0..9af7738fa8 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/MatrixInitializer.kt @@ -18,9 +18,9 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer -import io.element.android.x.BuildConfig import io.element.android.libraries.matrix.tracing.TracingConfigurations import io.element.android.libraries.matrix.tracing.setupTracing +import io.element.android.x.BuildConfig class MatrixInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt index 477dbab79c..23286c683d 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt @@ -18,8 +18,8 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer -import io.element.android.x.BuildConfig import io.element.android.features.rageshake.logs.VectorFileLogger +import io.element.android.x.BuildConfig import timber.log.Timber class TimberInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt index dad279bf09..63881df5ae 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt @@ -19,10 +19,10 @@ package io.element.android.x.root import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.libraries.architecture.Presenter import io.element.android.features.rageshake.bugreport.BugReportPresenter import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter +import io.element.android.libraries.architecture.Presenter import javax.inject.Inject class RootPresenter @Inject constructor( diff --git a/app/src/main/kotlin/io/element/android/x/root/RootView.kt b/app/src/main/kotlin/io/element/android/x/root/RootView.kt index 048c3d8e6c..f8cbdea24f 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootView.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootView.kt @@ -24,12 +24,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import io.element.android.x.component.ShowkaseButton import io.element.android.features.rageshake.crash.ui.CrashDetectionEvents import io.element.android.features.rageshake.crash.ui.CrashDetectionView import io.element.android.features.rageshake.detection.RageshakeDetectionEvents import io.element.android.features.rageshake.detection.RageshakeDetectionView import io.element.android.tests.uitests.openShowkase +import io.element.android.x.component.ShowkaseButton @Composable fun RootView( diff --git 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 index ce9700c8af..2695163ac4 100644 --- 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 @@ -52,11 +52,11 @@ 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 io.element.android.libraries.architecture.Async -import io.element.android.libraries.designsystem.components.form.textFieldState -import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.features.login.R import io.element.android.features.login.error.changeServerError +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.designsystem.components.VectorIcon +import io.element.android.libraries.designsystem.components.form.textFieldState import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag diff --git a/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt b/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt index 4f79df3be3..6527a3a141 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt @@ -18,8 +18,8 @@ package io.element.android.features.login.error import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import io.element.android.libraries.core.uri.isValidUrl import io.element.android.features.login.root.LoginFormState +import io.element.android.libraries.core.uri.isValidUrl import io.element.android.libraries.ui.strings.R as StringR @Composable diff --git 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 index c10a4ee454..b927ae4555 100644 --- 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 @@ -58,11 +58,11 @@ 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 io.element.android.libraries.designsystem.components.form.textFieldState import io.element.android.features.login.error.loginError +import io.element.android.libraries.designsystem.components.form.textFieldState +import io.element.android.libraries.matrix.core.SessionId import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag -import io.element.android.libraries.matrix.core.SessionId import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt index 9f32bc74bd..1f8dc656b8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt @@ -24,9 +24,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.libraries.architecture.Presenter -import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.features.messages.actionlist.ActionListPresenter import io.element.android.features.messages.actionlist.model.TimelineItemAction import io.element.android.features.messages.textcomposer.MessageComposerEvents @@ -36,6 +33,9 @@ import io.element.android.features.messages.timeline.TimelineEvents import io.element.android.features.messages.timeline.TimelinePresenter import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.ui.MatrixItemHelper diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt index a3e23d0556..4270c9f2e6 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt @@ -17,10 +17,10 @@ package io.element.android.features.messages import androidx.compose.runtime.Immutable -import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.features.messages.actionlist.ActionListState import io.element.android.features.messages.textcomposer.MessageComposerState import io.element.android.features.messages.timeline.TimelineState +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.matrix.core.RoomId @Immutable diff --git 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 index b934c3ce67..706dc48c43 100644 --- 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 @@ -56,14 +56,14 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.libraries.designsystem.components.avatar.Avatar -import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.features.messages.actionlist.ActionListEvents import io.element.android.features.messages.actionlist.ActionListView import io.element.android.features.messages.actionlist.model.TimelineItemAction -import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.textcomposer.MessageComposerView 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.utils.LogCompositions import kotlinx.coroutines.launch import timber.log.Timber diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt index 08140b5a96..a0114f2420 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt @@ -21,10 +21,10 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.libraries.architecture.Presenter import io.element.android.features.messages.actionlist.model.TimelineItemAction import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.libraries.architecture.Presenter import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git 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 index c7b641a1a1..53df8d4b40 100644 --- 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 @@ -41,9 +41,9 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import io.element.android.libraries.designsystem.components.VectorIcon 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 kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt index 84551753b9..46d879b850 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt @@ -18,7 +18,6 @@ package io.element.android.features.messages.actionlist.model import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable -import io.element.android.libraries.designsystem.VectorIcons @Immutable sealed class TimelineItemAction( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt index dcc36c1388..8f9a710608 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt @@ -17,7 +17,6 @@ package io.element.android.features.messages.timeline import androidx.recyclerview.widget.DiffUtil -import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.features.messages.timeline.diff.CacheInvalidator import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback import io.element.android.features.messages.timeline.model.AggregatedReaction @@ -33,6 +32,7 @@ import io.element.android.features.messages.timeline.model.content.TimelineItemR import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent import io.element.android.features.messages.timeline.util.invalidateLast +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.media.MediaResolver import io.element.android.libraries.matrix.room.MatrixRoom diff --git 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 index 378f4c83ee..a73c724448 100644 --- 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 @@ -58,28 +58,28 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import io.element.android.libraries.designsystem.utils.PairCombinedPreviewParameter -import io.element.android.libraries.designsystem.components.avatar.Avatar -import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.features.messages.timeline.components.MessageEventBubble +import io.element.android.features.messages.timeline.components.TimelineItemEncryptedView +import io.element.android.features.messages.timeline.components.TimelineItemImageView +import io.element.android.features.messages.timeline.components.TimelineItemReactionsView +import io.element.android.features.messages.timeline.components.TimelineItemRedactedView +import io.element.android.features.messages.timeline.components.TimelineItemTextView +import io.element.android.features.messages.timeline.components.TimelineItemUnknownView import io.element.android.features.messages.timeline.model.AggregatedReaction import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition +import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.features.messages.timeline.model.TimelineItemGroupPositionProvider import io.element.android.features.messages.timeline.model.TimelineItemReactions -import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.features.messages.timeline.model.content.TimelineItemContent import io.element.android.features.messages.timeline.model.content.MessagesTimelineItemContentProvider +import io.element.android.features.messages.timeline.model.content.TimelineItemContent import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent -import io.element.android.features.messages.timeline.components.MessageEventBubble -import io.element.android.features.messages.timeline.components.TimelineItemReactionsView -import io.element.android.features.messages.timeline.components.TimelineItemEncryptedView -import io.element.android.features.messages.timeline.components.TimelineItemImageView -import io.element.android.features.messages.timeline.components.TimelineItemRedactedView -import io.element.android.features.messages.timeline.components.TimelineItemTextView -import io.element.android.features.messages.timeline.components.TimelineItemUnknownView +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.utils.PairCombinedPreviewParameter import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git 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 index cb52ae9645..9f6c1eb28d 100644 --- 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 @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip 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.LocalIsDarkTheme import io.element.android.libraries.designsystem.MessageHighlightDark import io.element.android.libraries.designsystem.MessageHighlightLight @@ -36,7 +37,6 @@ import io.element.android.libraries.designsystem.SystemGrey5Dark import io.element.android.libraries.designsystem.SystemGrey5Light import io.element.android.libraries.designsystem.SystemGrey6Dark import io.element.android.libraries.designsystem.SystemGrey6Light -import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition private val BUBBLE_RADIUS = 16.dp diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt index b0924ce999..ad1bb5edb9 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt @@ -28,10 +28,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.core.text.util.LinkifyCompat -import io.element.android.libraries.designsystem.LinkColor -import io.element.android.libraries.designsystem.components.ClickableLinkText import io.element.android.features.messages.timeline.components.html.HtmlDocument import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText @Composable fun TimelineItemTextView( diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index d54e0d602f..1216765ee8 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -17,8 +17,8 @@ package io.element.android.features.messages.timeline.model import androidx.compose.runtime.Immutable -import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.matrix.core.EventId @Immutable diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt index e798494aef..b9df73853c 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt @@ -17,10 +17,10 @@ package io.element.android.features.preferences.root import androidx.compose.runtime.Composable -import io.element.android.libraries.architecture.Async -import io.element.android.libraries.architecture.Presenter import io.element.android.features.logout.LogoutPreferencePresenter import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter import javax.inject.Inject class PreferencesRootPresenter @Inject constructor( diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt index 4a22320f48..2bcc9fc549 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt @@ -16,9 +16,9 @@ package io.element.android.features.preferences.root -import io.element.android.libraries.architecture.Async import io.element.android.features.logout.LogoutPreferenceState import io.element.android.features.rageshake.preferences.RageshakePreferencesState +import io.element.android.libraries.architecture.Async import io.element.android.libraries.matrix.ui.model.MatrixUser data class PreferencesRootState( diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt index 3c403278d3..bab68974fb 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt @@ -20,13 +20,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.libraries.architecture.Async -import io.element.android.libraries.designsystem.components.preferences.PreferenceView import io.element.android.features.logout.LogoutPreferenceState import io.element.android.features.logout.LogoutPreferenceView import io.element.android.features.preferences.user.UserPreferences import io.element.android.features.rageshake.preferences.RageshakePreferencesState import io.element.android.features.rageshake.preferences.RageshakePreferencesView +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.designsystem.components.preferences.PreferenceView import io.element.android.libraries.ui.strings.R as StringR @Composable diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt index 89289888e8..cd555e375a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt @@ -24,13 +24,13 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.core.net.toUri -import io.element.android.libraries.architecture.Async -import io.element.android.libraries.architecture.Presenter import io.element.android.features.rageshake.crash.CrashDataStore import io.element.android.features.rageshake.logs.VectorFileLogger import io.element.android.features.rageshake.reporter.BugReporter import io.element.android.features.rageshake.reporter.ReportType import io.element.android.features.rageshake.screenshot.ScreenshotHolder +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git 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 index c9ee533344..8a32f1ac7a 100644 --- 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 @@ -51,9 +51,9 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest import io.element.android.libraries.architecture.Async -import io.element.android.libraries.designsystem.components.form.textFieldState 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.utils.LogCompositions import io.element.android.libraries.ui.strings.R as StringR diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt index 166c39a101..5038d520b2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt @@ -25,10 +25,10 @@ import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import io.element.android.libraries.core.bool.orFalse import io.element.android.libraries.di.ApplicationContext -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.runBlocking +import javax.inject.Inject private val Context.dataStore: DataStore by preferencesDataStore(name = "elementx_crash") diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt index 84caffc55c..dfd09a203e 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt @@ -19,9 +19,9 @@ package io.element.android.features.rageshake.crash import android.content.Context import android.os.Build import io.element.android.libraries.core.data.tryOrNull +import timber.log.Timber import java.io.PrintWriter import java.io.StringWriter -import timber.log.Timber class VectorUncaughtExceptionHandler( context: Context diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt index 4172589a74..1f6300a5ac 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt @@ -19,8 +19,8 @@ package io.element.android.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.libraries.architecture.Presenter import io.element.android.features.rageshake.crash.CrashDataStore +import io.element.android.libraries.architecture.Presenter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt index 6d7c5ee036..de99427763 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt @@ -26,9 +26,9 @@ import androidx.lifecycle.Lifecycle import io.element.android.features.rageshake.screenshot.ImageResult import io.element.android.features.rageshake.screenshot.screenshot import io.element.android.libraries.androidutils.hardware.vibrate -import io.element.android.libraries.designsystem.utils.OnLifecycleEvent import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.libraries.designsystem.utils.LogCompositions +import io.element.android.libraries.designsystem.utils.OnLifecycleEvent import io.element.android.libraries.ui.strings.R as StringR @Composable diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt index 167c6a83b8..119e37d5e5 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt @@ -22,9 +22,9 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.libraries.architecture.Presenter import io.element.android.features.rageshake.rageshake.RageShake import io.element.android.features.rageshake.rageshake.RageshakeDataStore +import io.element.android.libraries.architecture.Presenter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt index 2f27e9d60f..1bf133d42f 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt @@ -25,9 +25,9 @@ import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.preferencesDataStore import io.element.android.libraries.core.bool.orTrue import io.element.android.libraries.di.ApplicationContext -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import javax.inject.Inject private val Context.dataStore: DataStore by preferencesDataStore(name = "elementx_rageshake") diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt index e5e0ab6e3e..f3770be719 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt @@ -18,20 +18,14 @@ package io.element.android.features.rageshake.reporter import android.content.Context import android.os.Build -import io.element.android.libraries.core.extensions.toOnOff -import io.element.android.libraries.androidutils.file.compressFile -import io.element.android.libraries.core.mimetype.MimeTypes -import io.element.android.libraries.di.ApplicationContext import io.element.android.features.rageshake.R import io.element.android.features.rageshake.crash.CrashDataStore import io.element.android.features.rageshake.logs.VectorFileLogger import io.element.android.features.rageshake.screenshot.ScreenshotHolder -import java.io.File -import java.io.IOException -import java.io.OutputStreamWriter -import java.net.HttpURLConnection -import java.util.Locale -import javax.inject.Inject +import io.element.android.libraries.androidutils.file.compressFile +import io.element.android.libraries.core.extensions.toOnOff +import io.element.android.libraries.core.mimetype.MimeTypes +import io.element.android.libraries.di.ApplicationContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first @@ -46,6 +40,12 @@ import okhttp3.Response import org.json.JSONException import org.json.JSONObject import timber.log.Timber +import java.io.File +import java.io.IOException +import java.io.OutputStreamWriter +import java.net.HttpURLConnection +import java.util.Locale +import javax.inject.Inject /** * BugReporter creates and sends the bug reports. diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt index 3421156e57..d8ff7fbe0b 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt @@ -25,14 +25,14 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import io.element.android.libraries.architecture.Presenter -import io.element.android.libraries.core.coroutine.parallelMap -import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.features.roomlist.model.RoomListEvents import io.element.android.features.roomlist.model.RoomListRoomSummary import io.element.android.features.roomlist.model.RoomListRoomSummaryPlaceholders import io.element.android.features.roomlist.model.RoomListState +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.core.coroutine.parallelMap +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.media.MediaResolver import io.element.android.libraries.matrix.room.RoomSummary diff --git 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 index 0e7d8f410b..8a67b649e3 100644 --- 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 @@ -36,13 +36,13 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Velocity -import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.features.roomlist.components.RoomListTopBar import io.element.android.features.roomlist.components.RoomSummaryRow import io.element.android.features.roomlist.model.RoomListEvents import io.element.android.features.roomlist.model.RoomListRoomSummary import io.element.android.features.roomlist.model.RoomListState import io.element.android.features.roomlist.model.stubbedRoomSummaries +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.utils.LogCompositions import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.UserId diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt index 53d275ad89..7b561d9054 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt @@ -52,8 +52,8 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.placeholder.material.placeholder -import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.features.roomlist.model.RoomListRoomSummary +import io.element.android.libraries.designsystem.components.avatar.Avatar private val minHeight = 72.dp diff --git a/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt index ce5b486f77..615353b7e8 100644 --- a/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt +++ b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt @@ -20,10 +20,8 @@ import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.libraries.matrixtest.FakeMatrixClient import io.element.android.libraries.matrix.core.SessionId -import io.element.android.features.roomlist.LastMessageFormatter -import io.element.android.features.roomlist.RoomListPresenter +import io.element.android.libraries.matrixtest.FakeMatrixClient import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/template/src/main/AndroidManifest.xml b/features/template/src/main/AndroidManifest.xml index e9c0841b6b..86d497f107 100644 --- a/features/template/src/main/AndroidManifest.xml +++ b/features/template/src/main/AndroidManifest.xml @@ -15,6 +15,6 @@ ~ limitations under the License. --> - + diff --git a/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt index 6e08d6887d..a8fec98f77 100644 --- a/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt @@ -25,8 +25,8 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.libraries.architecture.presenterConnector import io.element.android.anvilannotations.ContributesNode +import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.AppScope // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt index 411ba1576f..71509850a1 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt @@ -19,8 +19,8 @@ package io.element.android.libraries.matrix.permalink import android.net.Uri import android.net.UrlQuerySanitizer import io.element.android.libraries.matrix.core.MatrixPatterns -import java.net.URLDecoder import timber.log.Timber +import java.net.URLDecoder /** * This class turns a uri to a [PermalinkData]. diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt index 25f1af2269..7f0e955f24 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt @@ -19,9 +19,6 @@ package io.element.android.libraries.matrix.room import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.matrix.sync.roomListDiff import io.element.android.libraries.matrix.sync.state -import java.io.Closeable -import java.util.Collections -import java.util.UUID import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.SupervisorJob @@ -41,6 +38,9 @@ import org.matrix.rustcomponents.sdk.SlidingSyncView import org.matrix.rustcomponents.sdk.SlidingSyncViewRoomsListDiff import org.matrix.rustcomponents.sdk.UpdateSummary import timber.log.Timber +import java.io.Closeable +import java.util.Collections +import java.util.UUID interface RoomSummaryDataSource { fun roomSummaries(): Flow> diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt index fb2a1b2341..4593fe252a 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt @@ -20,12 +20,12 @@ import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.SessionId import io.element.android.libraries.matrix.core.UserId -import io.element.android.libraries.matrixtest.media.FakeMediaResolver import io.element.android.libraries.matrix.media.MediaResolver -import io.element.android.libraries.matrixtest.room.FakeMatrixRoom -import io.element.android.libraries.matrixtest.room.InMemoryRoomSummaryDataSource import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrixtest.media.FakeMediaResolver +import io.element.android.libraries.matrixtest.room.FakeMatrixRoom +import io.element.android.libraries.matrixtest.room.InMemoryRoomSummaryDataSource import org.matrix.rustcomponents.sdk.MediaSource class FakeMatrixClient(override val sessionId: SessionId) : MatrixClient { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt index 254f460f25..76da14418d 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt @@ -19,8 +19,8 @@ package io.element.android.libraries.matrixtest.room import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.room.MatrixRoom -import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt index 5a2d8fee19..966c88fa06 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt @@ -21,7 +21,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId -import io.element.android.libraries.testtags.TestTag /** * Add a testTag to a Modifier, to be used by external tool, like TrafficLight for instance. diff --git a/libraries/ui-strings/src/main/res/values-fa/strings.xml b/libraries/ui-strings/src/main/res/values-fa/strings.xml index 1b726a2428..e182b50dbf 100644 --- a/libraries/ui-strings/src/main/res/values-fa/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fa/strings.xml @@ -1,5 +1,5 @@ - + دعوت %s ‫%1$s، %2$s را دعوت کرد %1$s دعوتتان کرد diff --git a/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml b/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml index 1e75540acf..854a50db5d 100644 --- a/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml +++ b/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml @@ -1,5 +1,5 @@ - + %s 的邀请 %1$s 邀请了 %2$s %1$s 邀请了你 From 5b743bfac5afad4afe5f5d666009724f41244ca4 Mon Sep 17 00:00:00 2001 From: bmarty Date: Tue, 31 Jan 2023 06:06:05 +0000 Subject: [PATCH 2/2] Import strings from Element Android --- .../src/main/res/values-cs/strings.xml | 3 +- .../src/main/res/values-de/strings.xml | 3 +- .../src/main/res/values-et/strings.xml | 3 +- .../src/main/res/values-fa/strings.xml | 5 +- .../src/main/res/values-fr/strings.xml | 3 +- .../src/main/res/values-hu/strings.xml | 3 +- .../src/main/res/values-in/strings.xml | 5 +- .../src/main/res/values-ja/strings.xml | 19 ++++- .../src/main/res/values-pl/strings.xml | 42 +++++++++-- .../src/main/res/values-ru/strings.xml | 74 ++++++++++++++++--- .../src/main/res/values-sk/strings.xml | 3 +- .../src/main/res/values-uk/strings.xml | 3 +- .../src/main/res/values-zh-rCN/strings.xml | 2 +- .../src/main/res/values/donottranslate.xml | 2 + .../src/main/res/values/strings.xml | 1 + 15 files changed, 142 insertions(+), 29 deletions(-) diff --git a/libraries/ui-strings/src/main/res/values-cs/strings.xml b/libraries/ui-strings/src/main/res/values-cs/strings.xml index c9d697f560..c122de7798 100644 --- a/libraries/ui-strings/src/main/res/values-cs/strings.xml +++ b/libraries/ui-strings/src/main/res/values-cs/strings.xml @@ -2978,4 +2978,5 @@ Hlasovou zprávu nelze spustit, protože právě nahráváte živé vysílání. Ukončete prosím živé vysílání, abyste mohli začít nahrávat hlasovou zprávu Nelze spustit hlasovou zprávu - + Chyba připojení - nahrávání pozastaveno + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-de/strings.xml b/libraries/ui-strings/src/main/res/values-de/strings.xml index f0e5a7bb8d..17fa9b6e44 100644 --- a/libraries/ui-strings/src/main/res/values-de/strings.xml +++ b/libraries/ui-strings/src/main/res/values-de/strings.xml @@ -2917,4 +2917,5 @@ Du kannst keine Sprachnachricht beginnen, da du im Moment eine Echtzeitübertragung aufzeichnest. Bitte beende deine Sprachübertragung, um ein Gespräch zu beginnen Kann Sprachnachricht nicht beginnen - + Verbindungsfehler − Aufnahme pausiert + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-et/strings.xml b/libraries/ui-strings/src/main/res/values-et/strings.xml index 1d7b96d2f9..f33ade2a7e 100644 --- a/libraries/ui-strings/src/main/res/values-et/strings.xml +++ b/libraries/ui-strings/src/main/res/values-et/strings.xml @@ -2909,4 +2909,5 @@ Viga küsitluste laadimisel. Häälsõnumi esitamine ei õnnestu Kuna sa hetkel salvestad ringhäälingukõnet, siis häälsõnumi salvestamine või esitamine ei õnnestu. Selleks palun lõpeta ringhäälingukõne - + Viga võrguühenduses - salvestamine on peatatud + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-fa/strings.xml b/libraries/ui-strings/src/main/res/values-fa/strings.xml index e182b50dbf..d498f4a51b 100644 --- a/libraries/ui-strings/src/main/res/values-fa/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fa/strings.xml @@ -1,5 +1,5 @@ - + دعوت %s ‫%1$s، %2$s را دعوت کرد %1$s دعوتتان کرد @@ -2918,4 +2918,5 @@ از آن‌جا که در حال ضبط پخشی زنده‌اید، نمی‌توانید پیامی صوتی را آغاز کنید. لطفاً برای آغاز ضبط یک پیام صوتی، پخش زنده‌تان را پایان دهید نمی‌توان پخش صوتی را آغاز کرد - + خطای اتّصال - ضبط مکث شد + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-fr/strings.xml b/libraries/ui-strings/src/main/res/values-fr/strings.xml index e45211b61a..d62d208e43 100644 --- a/libraries/ui-strings/src/main/res/values-fr/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fr/strings.xml @@ -2918,4 +2918,5 @@ Vous ne pouvez pas commencer un message vocal car vous êtes en train d’enregistrer une diffusion en direct. Veuillez terminer cette diffusion pour commencer un message vocal Impossible de démarrer un message vocal - + Erreur de connexion – Enregistrement en pause + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-hu/strings.xml b/libraries/ui-strings/src/main/res/values-hu/strings.xml index 0aa70cea55..c265b79969 100644 --- a/libraries/ui-strings/src/main/res/values-hu/strings.xml +++ b/libraries/ui-strings/src/main/res/values-hu/strings.xml @@ -2918,4 +2918,5 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze Nem lehet hang üzenetet indítani élő közvetítés felvétele közben. Az élő közvetítés bejezése szükséges a hang üzenet indításához Hang üzenetet nem lehet elindítani - + Kapcsolódási hiba – Felvétel szüneteltetve + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-in/strings.xml b/libraries/ui-strings/src/main/res/values-in/strings.xml index 4c524df727..8a05481fd5 100644 --- a/libraries/ui-strings/src/main/res/values-in/strings.xml +++ b/libraries/ui-strings/src/main/res/values-in/strings.xml @@ -2858,4 +2858,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan. Tidak ada pemungutan suara aktif %1$d hari terakhir. \nMuat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk hari sebelumnya. - + Kesalahan koneksi - Perekaman dijeda + Anda tidak dapat memulai sebuah pesan suara karena Anda saat ini merekam sebuah siaran langsung. Silakan mengakhiri siaran langsung Anda untuk memulai merekam sebuah pesan suara + Tidak dapat memulai pesan suara + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-ja/strings.xml b/libraries/ui-strings/src/main/res/values-ja/strings.xml index d893156f6e..0b987ce683 100644 --- a/libraries/ui-strings/src/main/res/values-ja/strings.xml +++ b/libraries/ui-strings/src/main/res/values-ja/strings.xml @@ -198,7 +198,7 @@ メインアドレスとして設定 メインアドレスとしての設定を解除 セッションID - 文字の大きさ + フォントの大きさ とても小さい 小さい 標準 @@ -2391,7 +2391,7 @@ 招待 プッシュ通知 セッション名 - セッションを改名 + セッション名を変更 IPアドレス オペレーティングシステム 形式 @@ -2487,4 +2487,17 @@ %1$dを選択しました - + 有効にすると、このアプリケーションを使用している際にも、他のユーザーにオフラインとして表示されます。 + 最近のチャットをシステムの共有メニューに表示 + システムの既定値を使用 + 手動で設定 + 自動的に設定 + フォントの大きさを選択 + ⚠ 未認証の端末がこのルームにあります。あなたが送信するメッセージを復号化することはできません。 + このルームの未認証のセッションに暗号化されたメッセージを送信しない。 + あなたのホームサーバーはスレッドの一覧表示をまだサポートしていません。 + ここに新しいリクエストと招待が表示されます。 + リッチテキストエディターを試してみる（プレーンテキストモードは近日公開） + タブを使用してElementの表示をシンプルにする + セッションの詳細 + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-pl/strings.xml b/libraries/ui-strings/src/main/res/values-pl/strings.xml index 0aad400340..4419187ba5 100644 --- a/libraries/ui-strings/src/main/res/values-pl/strings.xml +++ b/libraries/ui-strings/src/main/res/values-pl/strings.xml @@ -345,7 +345,7 @@ Importuj klucze z lokalnego pliku Importuj Szyfruj wiadomości tylko do zaufanych sesji - Nigdy nie wysyłaj szyfrowanych wiadomości do sesji (np urządzeń innych użytkowników) które nie zostały zweryfikowane. + Nigdy nie wysyłaj szyfrowanych wiadomości do niezweryfikowanych sesji (bez zielonej tarczy) z tego urządzenia. Aby sprawdzić czy ta sesja jest zaufana, skontaktuj się z jej właścicielem używając innych form (np. osobiście lub telefonicznie) i zapytaj czy klucz, który widzą w ustawieniach użytkownika dla tego urządzenia pasuje do klucza poniżej: Jeśli klucz pasuje, potwierdź to przyciskiem poniżej. Jeśli nie, to ktoś inny najprawdopodobniej przejmuje lub podszywa się pod tą sesję i powinieneś dodać tę sesję do czarnej listy. W przyszłości proces weryfikacji będzie bardziej skomplikowany. Wyślij naklejkę @@ -1115,7 +1115,7 @@ \nKlucze nie są zaufane Podpis krzyżowy nie jest aktywowany Aktywne Sesje - Pokaż wszystkie Sesje + Pokaż wszystkie sesje Zarządzaj Sesjami Wyloguj z tej sesji Brak dostępnej informacji o kryptografii @@ -1242,7 +1242,7 @@ Zapisz Klucz Bezpieczeństwa Użyj Frazy Bezpieczeństwa Użyj klucza bezpieczeństwa - Zabezpiecza przeciwko utracie dostępu do zaszyfrowanych wiadomości oraz danych poprzez zapisanie zaszyfrowanych kluczy na Twoim serwerze. + Zabezpiecza przed utratą dostępu do zaszyfrowanych wiadomości poprzez zapisanie kluczy szyfrujących na twoim serwerze. Włącz aparat Wyłącz aparat Wyłącz wyciszenie mikrofonu @@ -1493,7 +1493,7 @@ Integracje są zablokowane To zastąpi obecny Klucz bądź Hasło. Wygeneruj nowy klucz bezpieczeństwa albo hasło dla istniejącej kopii zapasowej. - Zabezpiecza przeciwko utracie dostępu do zaszyfrowanych wiadomości oraz danych poprzez zapisanie zaszyfrowanych kluczy na Twoim serwerze. + Zabezpiecza przed utratą dostępu do zaszyfrowanych wiadomości poprzez zapisanie kluczy szyfrujących na twoim serwerze. Powiadomienie zostało kliknięte! Proszę kliknąć na powiadomieniu, Jeżeli nie widzisz powiadomienia, sprawdź ustawienia systemowe. Widzisz powiadomienia! Kliknij na mnie! @@ -2795,4 +2795,36 @@ Rozumiem Zwiń %s pokojów Rozwiń %s pokojów - + Nieaktywne sesje + Ta sesja jest gotowa do bezpiecznego przesyłania wiadomości. + Twoja bieżąca sesja jest gotowa do bezpiecznego przesyłania wiadomości. + Kontakt + Lokalizacja + Aparat + Transmisja głosowa + Rozpocznij transmisję głosową + Ostatnie ankiety + W tym pokoju nie ma aktywnych ankiet + Aktywne ankiety + Niektóre głosy mogą nie zostać policzone z powodu błędów w odszyfrowaniu + Zakończono ankietę. + Błąd połączenia - Nagrywanie wstrzymane + Nie można odtworzyć tej transmisji głosowej. + Jesteś już w trakcie nagrywania transmisji głosowej. Proszę zakończyć bieżącą transmisję, aby rozpocząć nową. + Ktoś inny nagrywa już transmisję głosową. Aby rozpocząć nową transmisję, należy poczekać na jej zakończenie. + Nie masz wymaganych uprawnień do rozpoczęcia transmisji głosowej w tym pokoju. Skontaktuj się z administratorem pokoju, aby przyznał ci uprawnienia. + Nie można rozpocząć nowej transmisji głosowej + Buforowanie… + Nie można rozpocząć wiadomości głosowej + Masz niezweryfikowane sesje + Autentyczność tej zaszyfrowanej wiadomości nie może być zagwarantowana na tym urządzeniu. + Historia ankiet + Dodaje (╯°□°）╯︵ ┻━┻ do wiadomości tekstowej + Skanuj kod QR + %1$s zakończył(a) transmisję głosową. + Zarządaj od systemu Android aby klawiatura nie zapisywała żadnych danych takich jak historia pisania lub słownik. Pamiętaj, nie niektóre klawiatury mogą nie zastosować się do tego ustawienia. + Klawiatura incognito + Witaj w ${app_name}, +\n%s. + Wszechstronna, bezpieczna aplikacja do czatowania dla zespołów, przyjaciół i organizacji. Utwórz czat lub dołącz do istniejącego pokoju, aby rozpocząć. + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-ru/strings.xml b/libraries/ui-strings/src/main/res/values-ru/strings.xml index 1255776c1f..5938200c1e 100644 --- a/libraries/ui-strings/src/main/res/values-ru/strings.xml +++ b/libraries/ui-strings/src/main/res/values-ru/strings.xml @@ -6,7 +6,7 @@ %1$s вошёл(шла) в комнату %1$s покинул(а) комнату %1$s отклонил(а) приглашение - %1$s выгнан %2$s + %1$s выгнал %2$s %1$s разблокировал(а) %2$s %1$s заблокировал(а) %2$s %1$s отозвал(а) приглашение %2$s @@ -65,7 +65,7 @@ %1$s отклонил приглашение. Причина: %2$s %1$s выгнали %2$s. Причина: %3$s %1$s разблокировано %2$s. Причина: %3$s - %1$s забанен %2$s. Причина: %3$s + %1$s забанил %2$s. Причина: %3$s %1$s принял приглашение для %2$s. Причина: %3$s %1$s отозвал приглашение %2$s. Причина: %3$s %1$s создал(а) комнату @@ -1420,7 +1420,7 @@ Посылает сообщение, окрашенное в цвет радуги Посылает данную эмоцию, окрашенную в цвет радуги Редактор сообщений - Включаем сквозное шифрование… + Включить сквозное шифрование… Включить шифрование\? После включения шифрование для комнаты нельзя отключить. Сообщения отправленные в зашифрованной комнате не будут видны серверу, только участникам комнаты. Включение шифрования может помешать правильной работе многих ботов и мостов. Включить шифрование @@ -2433,7 +2433,7 @@ Не удалось загрузить карту Карта Примечание: приложение будет перезапущено - Обсуждения сообщений + Включить обсуждения сообщений Подключиться к серверу Хотите присоединиться к существующему серверу\? Пропустить вопрос @@ -2540,7 +2540,7 @@ Домашний сервер не принимает имя пользователя, состоящее только из цифр. Пропустить этот шаг Сохранить и продолжить - Ваши предпочтения были сохранены. + Зайдите в настройки чтобы изменить Ваш профиль Выглядит хорошо! ${app_name} также отлично подходит для работы. Ему доверяют самые надёжные организации в мире. Резервная копия имеет действительную подпись для данного пользователя. @@ -2791,7 +2791,7 @@ Рассмотрите возможность выхода из старых сеансов (%1$d дней или дольше), которые вы более не используете. Голосовая трансляция - Голосовые трансляции + Включить голосовые трансляции Записывает название клиента, версию и URL-адрес для более лёгкого распознавания сеансов в менеджере сеансов. Записывать информацию о клиенте Галерея @@ -2824,9 +2824,9 @@ Развернуть дочерние элементы %s Выбрано %1$d - Выбрано %1$d - Выбрано %1$d - Выбрано %1$d + Выбраны %1$d + Выбраны %1$d + Выбраны %1$d Войти в полноэкранный режим Применить форматирование подчёркиванием @@ -2970,4 +2970,58 @@ Этот сеанс не поддерживает шифрование и поэтому не может быть заверен. %1$s завершил(а) голосовую трансляцию. Вы завершили голосовую трансляцию. - + + Нет активных опросов за %1$d день. +\nЗагрузите больше чтобы показать опросы за прошедшие дни. + Нет активных опросов за %1$d дней. +\nЗагрузите больше чтобы показать опросы за прошедшие дни. + Нет активных опросов за %1$d дней. +\nЗагрузите больше чтобы показать опросы за прошедшие дни. + Нет активных опросов за %1$d дней. +\nЗагрузите больше чтобы показать опросы за прошедшие дни. + + + Нет завершённых опросов за день %1$d. +\nЗагрузите больше чтобы показать опросы за предыдущие дни. + Нет завершённых опросов за %1$d дней +\nЗагрузите больше чтобы показать опросы за предыдущие дни. + Нет завершённых опросов за %1$d дней +\nЗагрузите больше чтобы показать опросы за предыдущие дни. + Нет завершённых опросов за %1$d дней +\nЗагрузите больше чтобы показать опросы за предыдущие дни. + + Токен доступа даёт полный доступ к аккаунту. Не делитесь им ни с кем. + Токен доступа + Завершённый опрос + Опрос + завершённый опрос. + Изменить ссылку + Создать ссылку + Ссылка + Текст + Список + Пронумерованный список + Ссылка + Ошибка считывания опросов. + Загрузить больше опросов + Показываем опросы + Нет завершённых опросов + Завершённые опросы + Нет активных опросов + Активные опросы + Из-за ошибок расшифровки, некоторые голоса могут быть не засчитаны + Опрос завершён. + Вы уверены что хотите завершить голосовую трансляцию\? Это завершит трансляцию и полная запись будет доступна в чате. + Завершить голосовую трансляцию\? + Ошибка подключения - Запись приостановлена + Невозможно прослушать голосовую трансляцию. + Голосовая трансляция + Вы не можете записать голосовое сообщение, потому-что Вы записываете голосовую трансляцию. Завершите голосовую трансляцию, чтобы записать голосовое сообщение + Не удалось записать голосовое сообщение + Убедиться что Ваш аккаунт в безопасности + Получить последнюю сборку (у вас могут быть проблемы со входом) + История опроса + Голосовая трансляция начата + Ваш домашний сервер не поддерживает список обсуждений. + Остановить + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-sk/strings.xml b/libraries/ui-strings/src/main/res/values-sk/strings.xml index ed3f47f9d3..c9e92d323b 100644 --- a/libraries/ui-strings/src/main/res/values-sk/strings.xml +++ b/libraries/ui-strings/src/main/res/values-sk/strings.xml @@ -2978,4 +2978,5 @@ Nemôžete spustiť hlasovú správu, pretože práve nahrávate živé vysielanie. Ukončite prosím živé vysielanie, aby ste mohli začať nahrávať hlasovú správu Nemožno spustiť hlasovú správu - + Chyba pripojenia - nahrávanie pozastavené + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-uk/strings.xml b/libraries/ui-strings/src/main/res/values-uk/strings.xml index 6294526be2..0f6027903f 100644 --- a/libraries/ui-strings/src/main/res/values-uk/strings.xml +++ b/libraries/ui-strings/src/main/res/values-uk/strings.xml @@ -3038,4 +3038,5 @@ Показ опитувань Ви не можете розпочати запис голосового повідомлення, оскільки ви записуєте трансляцію наживо. Будь ласка, заверште її, щоб розпочати запис голосового повідомлення Не вдалося розпочати запис голосового повідомлення - + Помилка з\'єднання - Запис призупинено + \ No newline at end of file diff --git a/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml b/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml index 854a50db5d..1e75540acf 100644 --- a/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml +++ b/libraries/ui-strings/src/main/res/values-zh-rCN/strings.xml @@ -1,5 +1,5 @@ - + %s 的邀请 %1$s 邀请了 %2$s %1$s 邀请了你 diff --git a/libraries/ui-strings/src/main/res/values/donottranslate.xml b/libraries/ui-strings/src/main/res/values/donottranslate.xml index bfe751ef5a..910ce31c41 100755 --- a/libraries/ui-strings/src/main/res/values/donottranslate.xml +++ b/libraries/ui-strings/src/main/res/values/donottranslate.xml @@ -10,6 +10,8 @@ Cut the slack from teams. + Crash the application. + © MapTiler © OpenStreetMap contributors diff --git a/libraries/ui-strings/src/main/res/values/strings.xml b/libraries/ui-strings/src/main/res/values/strings.xml index 46c175437a..e690f06bbb 100644 --- a/libraries/ui-strings/src/main/res/values/strings.xml +++ b/libraries/ui-strings/src/main/res/values/strings.xml @@ -3502,6 +3502,7 @@ Set link Toggle numbered list Toggle bullet list + Apply inline code format Toggle full screen mode Text