From eb648cef1a98958e98f3db4d82f8e303dcb95cc2 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 19 Jan 2023 19:57:43 +0100 Subject: [PATCH 01/61] Initial feature template module --- features/template/.gitignore | 1 + features/template/build.gradle.kts | 58 +++++++++++++++++++ features/template/consumer-rules.pro | 0 features/template/proguard-rules.pro | 21 +++++++ .../template/src/main/AndroidManifest.xml | 20 +++++++ .../x/features/template/TemplateEvents.kt | 21 +++++++ .../x/features/template/TemplateNode.kt | 50 ++++++++++++++++ .../x/features/template/TemplatePresenter.kt | 38 ++++++++++++ .../x/features/template/TemplateState.kt | 21 +++++++ .../x/features/template/TemplateView.kt | 42 ++++++++++++++ .../template/TemplatePresenterTests.kt | 40 +++++++++++++ settings.gradle.kts | 1 + 12 files changed, 313 insertions(+) create mode 100644 features/template/.gitignore create mode 100644 features/template/build.gradle.kts create mode 100644 features/template/consumer-rules.pro create mode 100644 features/template/proguard-rules.pro create mode 100644 features/template/src/main/AndroidManifest.xml create mode 100644 features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt create mode 100644 features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt create mode 100644 features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt create mode 100644 features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt create mode 100644 features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt create mode 100644 features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt diff --git a/features/template/.gitignore b/features/template/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/features/template/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts new file mode 100644 index 0000000000..6550ff8e56 --- /dev/null +++ b/features/template/build.gradle.kts @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + id("io.element.android-compose-library") + alias(libs.plugins.ksp) + alias(libs.plugins.anvil) +} + +android { + namespace = "io.element.android.x.features.template" +} + +anvil { + generateDaggerFactories.set(true) +} + +dependencies { + anvil(project(":anvilcodegen")) + implementation(project(":anvilannotations")) + + implementation(project(":libraries:di")) + implementation(project(":libraries:core")) + implementation(project(":libraries:architecture")) + implementation(project(":libraries:matrix")) + implementation(project(":libraries:matrixui")) + implementation(project(":libraries:designsystem")) + implementation(project(":libraries:elementresources")) + implementation(project(":libraries:ui-strings")) + + implementation(libs.appyx.core) + + testImplementation(libs.test.junit) + testImplementation(libs.coroutines.test) + testImplementation(libs.molecule.runtime) + testImplementation(libs.test.truth) + testImplementation(libs.test.turbine) + testImplementation(project(":libraries:matrixtest")) + + androidTestImplementation(libs.test.junitext) + + ksp(libs.showkase.processor) +} diff --git a/features/template/consumer-rules.pro b/features/template/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/features/template/proguard-rules.pro b/features/template/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/features/template/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/features/template/src/main/AndroidManifest.xml b/features/template/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..e9c0841b6b --- /dev/null +++ b/features/template/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt new file mode 100644 index 0000000000..3f82f79cd4 --- /dev/null +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.features.template + +sealed interface TemplateEvents { + +} diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt new file mode 100644 index 0000000000..45b9de8164 --- /dev/null +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.features.template + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import com.bumble.appyx.core.modality.BuildContext +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.x.anvilannotations.ContributesNode +import io.element.android.x.architecture.presenterConnector +import io.element.android.x.di.AppScope + +// TODO: use the right Scope for your feature +@ContributesNode(AppScope::class) +class TemplateNode @AssistedInject constructor( + @Assisted buildContext: BuildContext, + @Assisted plugins: List, + presenter: TemplatePresenter, +) : Node(buildContext, plugins = plugins) { + + private val presenterConnector = presenterConnector(presenter) + + @Composable + override fun View(modifier: Modifier) { + val state by presenterConnector.stateFlow.collectAsState() + TemplateView( + state = state, + modifier = modifier + ) + } +} diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt new file mode 100644 index 0000000000..f306fecbf7 --- /dev/null +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.features.template + +import androidx.compose.runtime.Composable +import io.element.android.x.architecture.Presenter +import javax.inject.Inject + +class TemplatePresenter @Inject constructor() : Presenter { + + @Composable + override fun present(): TemplateState { + + fun handleEvents(event: TemplateEvents) { + when (event) { + else -> Unit + } + } + + return TemplateState( + eventSink = ::handleEvents + ) + } +} diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt new file mode 100644 index 0000000000..cd05023a31 --- /dev/null +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.features.template + +data class TemplateState( + val eventSink: (TemplateEvents) -> Unit = {} +) diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt new file mode 100644 index 0000000000..015be504bd --- /dev/null +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2022 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.features.template + +import androidx.compose.foundation.layout.Box +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview + +@Composable +fun TemplateView( + state: TemplateState, + modifier: Modifier = Modifier, +) { + Box(modifier, contentAlignment = Alignment.Center) { + Text("Template feature view") + } +} + +@Composable +@Preview +fun TemplateViewPreview() { + TemplateView( + state = TemplateState(), + ) +} diff --git a/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt b/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt new file mode 100644 index 0000000000..e470489bce --- /dev/null +++ b/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.features.template + +import app.cash.molecule.RecompositionClock +import app.cash.molecule.moleculeFlow +import app.cash.turbine.test +import com.google.common.truth.Truth +import kotlinx.coroutines.test.runTest +import org.junit.Test + +class TemplatePresenterTests { + + @Test + fun `present - `() = runTest { + + val presenter = TemplatePresenter() + moleculeFlow(RecompositionClock.Immediate) { + presenter.present() + }.test { + val initialState = awaitItem() + Truth.assertThat(initialState) + } + + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 2971994ca8..13bdc4ca01 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -55,3 +55,4 @@ include(":anvilannotations") include(":anvilcodegen") include(":libraries:architecture") include(":libraries:matrixtest") +include(":features:template") From d5f43aec370aa7a4263a7ab580173e72f4c5321a Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 19 Jan 2023 20:20:35 +0100 Subject: [PATCH 02/61] Template : fix CI --- .../io/element/android/x/features/template/TemplateEvents.kt | 2 +- .../io/element/android/x/features/template/TemplateNode.kt | 2 +- .../io/element/android/x/features/template/TemplatePresenter.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt index 3f82f79cd4..177cb1584a 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt @@ -17,5 +17,5 @@ package io.element.android.x.features.template sealed interface TemplateEvents { - + object MyEvent: TemplateEvents } diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt index 45b9de8164..e82dff2dcc 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt @@ -29,7 +29,7 @@ import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.architecture.presenterConnector import io.element.android.x.di.AppScope -// TODO: use the right Scope for your feature +// Change to use the right Scope for your feature. @ContributesNode(AppScope::class) class TemplateNode @AssistedInject constructor( @Assisted buildContext: BuildContext, diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt index f306fecbf7..3f6b5938e6 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt @@ -27,7 +27,7 @@ class TemplatePresenter @Inject constructor() : Presenter { fun handleEvents(event: TemplateEvents) { when (event) { - else -> Unit + TemplateEvents.MyEvent -> Unit } } From 73ce44f0a1bc014fc524b412e965ffee6f1f54fa Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 20 Jan 2023 10:15:46 +0100 Subject: [PATCH 03/61] testtags --- features/login/build.gradle.kts | 1 + .../login/changeserver/ChangeServerView.kt | 4 ++ .../x/features/login/root/LoginRootScreen.kt | 6 +++ features/onboarding/build.gradle.kts | 1 + .../x/features/onboarding/OnBoardingScreen.kt | 3 ++ libraries/testtags/build.gradle.kts | 23 ++++++++++ .../testtags/src/main/AndroidManifest.xml | 17 ++++++++ .../io/element/android/x/testtags/Compose.kt | 34 +++++++++++++++ .../io/element/android/x/testtags/TestTags.kt | 43 +++++++++++++++++++ settings.gradle.kts | 1 + 10 files changed, 133 insertions(+) create mode 100644 libraries/testtags/build.gradle.kts create mode 100644 libraries/testtags/src/main/AndroidManifest.xml create mode 100644 libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt create mode 100644 libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 623477f727..4b979827d7 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -40,6 +40,7 @@ dependencies { implementation(project(":libraries:matrix")) implementation(project(":libraries:designsystem")) implementation(project(":libraries:elementresources")) + implementation(project(":libraries:testtags")) implementation(libs.appyx.core) implementation(project(":libraries:ui-strings")) ksp(libs.showkase.processor) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 1ac77b16b8..0b67980f09 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -57,6 +57,8 @@ import io.element.android.x.core.compose.textFieldState import io.element.android.x.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError +import io.element.android.x.testtags.TestTags +import io.element.android.x.testtags.testTag @Composable fun ChangeServerView( @@ -129,6 +131,7 @@ fun ChangeServerView( value = homeserverFieldState, modifier = Modifier .fillMaxWidth() + .testTag(TestTags.changeServerServer) .padding(top = 200.dp), onValueChange = { homeserverFieldState = it @@ -162,6 +165,7 @@ fun ChangeServerView( enabled = state.submitEnabled, modifier = Modifier .fillMaxWidth() + .testTag(TestTags.changeServerContinue) .padding(top = 44.dp) ) { Text(text = "Continue") diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index 665064f270..f5ed8f0883 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -61,6 +61,8 @@ import androidx.compose.ui.unit.sp import io.element.android.x.core.compose.textFieldState import io.element.android.x.features.login.error.loginError import io.element.android.x.matrix.core.SessionId +import io.element.android.x.testtags.TestTags +import io.element.android.x.testtags.testTag import io.element.android.x.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @@ -127,6 +129,7 @@ fun LoginRootScreen( onClick = onChangeServer, modifier = Modifier .align(Alignment.CenterEnd) + .testTag(TestTags.loginChangeServer) .padding(top = 8.dp, end = 8.dp), content = { Text(text = "Change") @@ -137,6 +140,7 @@ fun LoginRootScreen( value = loginFieldState, modifier = Modifier .fillMaxWidth() + .testTag(TestTags.loginEmailUsername) .padding(top = 60.dp), label = { Text(text = stringResource(id = StringR.string.login_signin_username_hint)) @@ -159,6 +163,7 @@ fun LoginRootScreen( value = passwordFieldState, modifier = Modifier .fillMaxWidth() + .testTag(TestTags.loginPassword) .padding(top = 24.dp), onValueChange = { passwordFieldState = it @@ -202,6 +207,7 @@ fun LoginRootScreen( enabled = state.submitEnabled, modifier = Modifier .fillMaxWidth() + .testTag(TestTags.loginContinue) .padding(vertical = 32.dp) ) { Text(text = "Continue") diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index cdb646417a..e002cfb7d7 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -31,6 +31,7 @@ dependencies { implementation(project(":libraries:ui-strings")) implementation(project(":libraries:designsystem")) implementation(project(":libraries:architecture")) + implementation(project(":libraries:testtags")) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) implementation(libs.appyx.core) diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt index fb88a76db0..740598ed69 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -50,6 +50,8 @@ import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState import io.element.android.x.designsystem.components.VectorButton +import io.element.android.x.testtags.TestTags +import io.element.android.x.testtags.testTag import kotlinx.coroutines.delay import kotlinx.coroutines.launch import io.element.android.x.ui.strings.R as StringR @@ -127,6 +129,7 @@ fun OnBoardingScreen( enabled = true, modifier = Modifier .align(CenterHorizontally) + .testTag(TestTags.onBoardingSignIn) .padding(top = 16.dp) ) } diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts new file mode 100644 index 0000000000..8f62664002 --- /dev/null +++ b/libraries/testtags/build.gradle.kts @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id("io.element.android-compose-library") +} + +android { + namespace = "io.element.android.x.testtags" +} diff --git a/libraries/testtags/src/main/AndroidManifest.xml b/libraries/testtags/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..ab34d2c3dd --- /dev/null +++ b/libraries/testtags/src/main/AndroidManifest.xml @@ -0,0 +1,17 @@ + + + diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt new file mode 100644 index 0000000000..fa35045439 --- /dev/null +++ b/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.testtags + +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.Modifier +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.testTag +import androidx.compose.ui.semantics.testTagsAsResourceId + +/** + * Add a testTag to a Modifier, to be used by external tool, like TrafficLight for instance. + */ +@OptIn(ExperimentalComposeUiApi::class) +fun Modifier.testTag(id: TestTag) = this.then( + semantics { + testTag = id.value + testTagsAsResourceId = true + } +) diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt new file mode 100644 index 0000000000..40d70bc3ce --- /dev/null +++ b/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.testtags + +@JvmInline +value class TestTag internal constructor(val value: String) + +object TestTags { + /** + * OnBoarding screen + */ + val onBoardingSignIn = TestTag("onboarding-sign_in") + + /** + * Login screen + */ + val loginChangeServer = TestTag("login-change_server") + val loginEmailUsername = TestTag("login-email_username") + val loginPassword = TestTag("login-password") + val loginContinue = TestTag("login-continue") + + /** + * Change server screen + */ + val changeServerServer = TestTag("change_server-server") + val changeServerContinue = TestTag("change_server-continue") +} + + diff --git a/settings.gradle.kts b/settings.gradle.kts index 2971994ca8..1ac5971dc7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -41,6 +41,7 @@ include(":libraries:matrixui") include(":libraries:textcomposer") include(":libraries:elementresources") include(":libraries:ui-strings") +include(":libraries:testtags") include(":features:onboarding") include(":features:login") include(":features:logout") From c532f9694ba5c9f00d97103f92f1ca89ec2d5514 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 20 Jan 2023 12:43:49 +0100 Subject: [PATCH 04/61] Change package and fix KDoc. --- .../x/features/login/changeserver/ChangeServerView.kt | 4 ++-- .../android/x/features/login/root/LoginRootScreen.kt | 4 ++-- .../android/x/features/onboarding/OnBoardingScreen.kt | 4 ++-- libraries/testtags/build.gradle.kts | 2 +- .../element/android/x/{ => libraries}/testtags/Compose.kt | 2 +- .../android/x/{ => libraries}/testtags/TestTags.kt | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) rename libraries/testtags/src/main/kotlin/io/element/android/x/{ => libraries}/testtags/Compose.kt (95%) rename libraries/testtags/src/main/kotlin/io/element/android/x/{ => libraries}/testtags/TestTags.kt (90%) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 0b67980f09..3dfb1b1a25 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -57,8 +57,8 @@ import io.element.android.x.core.compose.textFieldState import io.element.android.x.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError -import io.element.android.x.testtags.TestTags -import io.element.android.x.testtags.testTag +import io.element.android.x.libraries.testtags.TestTags +import io.element.android.x.libraries.testtags.testTag @Composable fun ChangeServerView( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index f5ed8f0883..67a9f19d31 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -60,9 +60,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.x.core.compose.textFieldState import io.element.android.x.features.login.error.loginError +import io.element.android.x.libraries.testtags.TestTags +import io.element.android.x.libraries.testtags.testTag import io.element.android.x.matrix.core.SessionId -import io.element.android.x.testtags.TestTags -import io.element.android.x.testtags.testTag import io.element.android.x.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt index 740598ed69..138840e222 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -50,8 +50,8 @@ import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState import io.element.android.x.designsystem.components.VectorButton -import io.element.android.x.testtags.TestTags -import io.element.android.x.testtags.testTag +import io.element.android.x.libraries.testtags.TestTags +import io.element.android.x.libraries.testtags.testTag import kotlinx.coroutines.delay import kotlinx.coroutines.launch import io.element.android.x.ui.strings.R as StringR diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts index 8f62664002..21e6f2a384 100644 --- a/libraries/testtags/build.gradle.kts +++ b/libraries/testtags/build.gradle.kts @@ -19,5 +19,5 @@ plugins { } android { - namespace = "io.element.android.x.testtags" + namespace = "io.element.android.x.libraries.testtags" } diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt similarity index 95% rename from libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt rename to libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt index fa35045439..5d75a31674 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.testtags +package io.element.android.x.libraries.testtags import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt similarity index 90% rename from libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt rename to libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt index 40d70bc3ce..1e96c61373 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.element.android.x.testtags +package io.element.android.x.libraries.testtags @JvmInline value class TestTag internal constructor(val value: String) object TestTags { /** - * OnBoarding screen + * OnBoarding screen. */ val onBoardingSignIn = TestTag("onboarding-sign_in") /** - * Login screen + * Login screen. */ val loginChangeServer = TestTag("login-change_server") val loginEmailUsername = TestTag("login-email_username") @@ -34,7 +34,7 @@ object TestTags { val loginContinue = TestTag("login-continue") /** - * Change server screen + * Change server screen. */ val changeServerServer = TestTag("change_server-server") val changeServerContinue = TestTag("change_server-continue") From c8e285b6e9eb53aefe7ed241cc6907ba638f6010 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 14:57:47 +0100 Subject: [PATCH 05/61] Add some todos --- features/template/build.gradle.kts | 1 + .../io/element/android/x/features/template/TemplateEvents.kt | 1 + .../io/element/android/x/features/template/TemplateNode.kt | 2 +- .../io/element/android/x/features/template/TemplateState.kt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index 6550ff8e56..636835c609 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -23,6 +23,7 @@ plugins { } android { + // TODO change the namespace (and your classes package) namespace = "io.element.android.x.features.template" } diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt index 177cb1584a..588bbd957d 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt @@ -16,6 +16,7 @@ package io.element.android.x.features.template +// TODO Add your events or remove the file completely if no events sealed interface TemplateEvents { object MyEvent: TemplateEvents } diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt index e82dff2dcc..7c5c4e78de 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt @@ -29,7 +29,7 @@ import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.architecture.presenterConnector import io.element.android.x.di.AppScope -// Change to use the right Scope for your feature. +// TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope @ContributesNode(AppScope::class) class TemplateNode @AssistedInject constructor( @Assisted buildContext: BuildContext, diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt index cd05023a31..8f633ae8c2 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt @@ -16,6 +16,7 @@ package io.element.android.x.features.template +// TODO add your ui models. Remove the eventSink if you don't have events. data class TemplateState( val eventSink: (TemplateEvents) -> Unit = {} ) From 528c01199d707aadd08d7c1ecffaf97ea83b307b Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 16:26:43 +0100 Subject: [PATCH 06/61] Rename architecture module --- .../x/anvilcodegen/ContributesNodeCodeGenerator.kt | 4 ++-- app/src/main/kotlin/io/element/android/x/MainActivity.kt | 2 +- .../main/kotlin/io/element/android/x/di/AppComponent.kt | 2 +- .../main/kotlin/io/element/android/x/di/RoomComponent.kt | 2 +- .../kotlin/io/element/android/x/di/SessionComponent.kt | 2 +- .../kotlin/io/element/android/x/node/LoggedInFlowNode.kt | 4 ++-- .../kotlin/io/element/android/x/node/RoomFlowNode.kt | 4 ++-- .../kotlin/io/element/android/x/node/RootFlowNode.kt | 4 ++-- .../kotlin/io/element/android/x/root/RootPresenter.kt | 2 +- .../io/element/android/x/features/login/LoginFlowNode.kt | 2 +- .../x/features/login/changeserver/ChangeServerNode.kt | 2 +- .../features/login/changeserver/ChangeServerPresenter.kt | 6 +++--- .../x/features/login/changeserver/ChangeServerState.kt | 2 +- .../x/features/login/changeserver/ChangeServerView.kt | 2 +- .../android/x/features/login/root/LoginRootNode.kt | 2 +- .../android/x/features/login/root/LoginRootPresenter.kt | 2 +- .../x/features/logout/LogoutPreferencePresenter.kt | 9 +++++---- .../android/x/features/logout/LogoutPreferenceScreen.kt | 2 +- .../android/x/features/logout/LogoutPreferenceState.kt | 2 +- .../element/android/x/features/messages/MessagesNode.kt | 2 +- .../android/x/features/messages/MessagesPresenter.kt | 2 +- .../features/messages/actionlist/ActionListPresenter.kt | 2 +- .../messages/textcomposer/MessageComposerPresenter.kt | 2 +- .../x/features/messages/timeline/TimelinePresenter.kt | 2 +- .../x/features/preferences/PreferencesFlowNode.kt | 2 +- .../x/features/preferences/root/PreferencesRootNode.kt | 2 +- .../preferences/root/PreferencesRootPresenter.kt | 4 ++-- .../x/features/preferences/root/PreferencesRootState.kt | 2 +- .../x/features/preferences/root/PreferencesRootView.kt | 2 +- .../x/features/preferences/user/UserPreferences.kt | 2 +- .../x/features/rageshake/bugreport/BugReportNode.kt | 2 +- .../x/features/rageshake/bugreport/BugReportPresenter.kt | 4 ++-- .../x/features/rageshake/bugreport/BugReportState.kt | 2 +- .../x/features/rageshake/bugreport/BugReportView.kt | 2 +- .../rageshake/crash/ui/CrashDetectionPresenter.kt | 5 +++-- .../rageshake/detection/RageshakeDetectionPresenter.kt | 2 +- .../preferences/RageshakePreferencesPresenter.kt | 2 +- .../element/android/x/features/roomlist/RoomListNode.kt | 2 +- .../android/x/features/roomlist/RoomListPresenter.kt | 2 +- .../element/android/x/features/template/TemplateNode.kt | 2 +- .../android/x/features/template/TemplatePresenter.kt | 2 +- libraries/architecture/build.gradle.kts | 2 +- .../{x => libraries}/architecture/AssistedNodeFactory.kt | 2 +- .../android/{x => libraries}/architecture/Async.kt | 2 +- .../android/{x => libraries}/architecture/Bindings.kt | 2 +- .../{x => libraries}/architecture/NodeFactories.kt | 2 +- .../android/{x => libraries}/architecture/NodeKey.kt | 2 +- .../android/{x => libraries}/architecture/Presenter.kt | 2 +- .../{x => libraries}/architecture/PresenterConnector.kt | 2 +- 49 files changed, 63 insertions(+), 61 deletions(-) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/AssistedNodeFactory.kt (94%) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/Async.kt (97%) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/Bindings.kt (97%) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/NodeFactories.kt (96%) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/NodeKey.kt (94%) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/Presenter.kt (93%) rename libraries/architecture/src/main/kotlin/io/element/android/{x => libraries}/architecture/PresenterConnector.kt (96%) diff --git a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt b/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt index 0ca9da53af..895a6347fd 100644 --- a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt +++ b/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt @@ -148,7 +148,7 @@ class ContributesNodeCodeGenerator : CodeGenerator { } companion object { - private val assistedNodeFactoryFqName = FqName("io.element.android.x.architecture.AssistedNodeFactory") - private val nodeKeyFqName = FqName("io.element.android.x.architecture.NodeKey") + private val assistedNodeFactoryFqName = FqName("io.element.android.libraries.architecture.AssistedNodeFactory") + private val nodeKeyFqName = FqName("io.element.android.libraries.architecture.NodeKey") } } 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 2630c78c7e..dc050debb4 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.Modifier import androidx.core.view.WindowCompat import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integrationpoint.NodeComponentActivity -import io.element.android.x.architecture.bindings +import io.element.android.libraries.architecture.bindings import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.designsystem.ElementXTheme import io.element.android.x.di.AppBindings diff --git a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt index 342c18e3a4..c412fa9163 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt @@ -20,7 +20,7 @@ import android.content.Context import com.squareup.anvil.annotations.MergeComponent import dagger.BindsInstance import dagger.Component -import io.element.android.x.architecture.NodeFactoriesBindings +import io.element.android.libraries.architecture.NodeFactoriesBindings @SingleIn(AppScope::class) @MergeComponent(AppScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index cfd7eee471..8d19684d18 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt @@ -20,7 +20,7 @@ import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.MergeSubcomponent import dagger.BindsInstance import dagger.Subcomponent -import io.element.android.x.architecture.NodeFactoriesBindings +import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.x.matrix.room.MatrixRoom @SingleIn(RoomScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 8da31df8eb..57de09231f 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt @@ -20,7 +20,7 @@ import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.MergeSubcomponent import dagger.BindsInstance import dagger.Subcomponent -import io.element.android.x.architecture.NodeFactoriesBindings +import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.x.matrix.MatrixClient @SingleIn(SessionScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 8a5a967875..b707d1071b 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -32,8 +32,8 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.node import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push -import io.element.android.x.architecture.bindings -import io.element.android.x.architecture.createNode +import io.element.android.libraries.architecture.bindings +import io.element.android.libraries.architecture.createNode import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.di.SessionComponent import io.element.android.x.features.preferences.PreferencesFlowNode diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index 9db5f5cfb5..fc505303af 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -25,8 +25,8 @@ import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack -import io.element.android.x.architecture.bindings -import io.element.android.x.architecture.createNode +import io.element.android.libraries.architecture.bindings +import io.element.android.libraries.architecture.createNode import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.di.RoomComponent import io.element.android.x.features.messages.MessagesNode diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index 9dee857470..6784b1f7cf 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -36,8 +36,8 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.newRoot import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push -import io.element.android.x.architecture.createNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.createNode +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.features.rageshake.bugreport.BugReportNode import io.element.android.x.matrix.MatrixClient 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 2bcf49505a..0ca0efd0bb 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,7 +19,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.features.rageshake.bugreport.BugReportPresenter import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt index 12aa0887f2..f564eaf901 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt @@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push -import io.element.android.x.architecture.createNode +import io.element.android.libraries.architecture.createNode import io.element.android.x.features.login.changeserver.ChangeServerNode import io.element.android.x.features.login.root.LoginRootNode import kotlinx.parcelize.Parcelize diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt index 2e20380182..41ea7240a4 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt @@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.di.AppScope @ContributesNode(AppScope::class) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt index 13259baf42..2b010724b5 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt @@ -22,9 +22,9 @@ 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.x.architecture.Async -import io.element.android.x.architecture.Presenter -import io.element.android.x.architecture.execute +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.architecture.execute import io.element.android.x.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt index 90dcb8ce64..19405763e1 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.login.changeserver -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async data class ChangeServerState( val homeserver: String = "", diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 3dfb1b1a25..68846a70ff 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -52,7 +52,7 @@ 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.x.architecture.Async +import io.element.android.libraries.architecture.Async import io.element.android.x.core.compose.textFieldState import io.element.android.x.designsystem.components.VectorIcon import io.element.android.x.features.login.R diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt index eb1f1d304b..bccf36fb22 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt @@ -28,7 +28,7 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.core.compose.OnLifecycleEvent import io.element.android.x.di.AppScope diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt index e6908dab5b..eda3efcf57 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt @@ -22,7 +22,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt index 578de59787..b4fa7e9bd1 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt @@ -21,15 +21,16 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.x.architecture.Async -import io.element.android.x.architecture.Presenter -import io.element.android.x.architecture.execute +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter +import io.element.android.libraries.architecture.execute import io.element.android.x.matrix.MatrixClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject -class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) : Presenter { +class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) : + Presenter { @Composable override fun present(): LogoutPreferenceState { diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt index 5f76d9e3b4..28b259a989 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async import io.element.android.x.designsystem.components.ProgressDialog import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.designsystem.components.preferences.PreferenceCategory diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt index 70e637899b..cfa82c575e 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.logout -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async data class LogoutPreferenceState( val logoutAction: Async = Async.Uninitialized, diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt index dd7b435ef0..3eb489e365 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt @@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.di.RoomScope @ContributesNode(RoomScope::class) diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt index 8324dc806b..778efa5a79 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt @@ -24,7 +24,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.x.features.messages.actionlist.ActionListPresenter diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt index cc894931c6..9a4e3b3168 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt @@ -21,7 +21,7 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.timeline.model.TimelineItem import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt index aba47ec90b..63906b31da 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -21,7 +21,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import io.element.android.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.core.data.StableCharSequence import io.element.android.x.core.data.toStableCharSequence import io.element.android.x.matrix.room.MatrixRoom diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt index 9cbd2a4acf..8aaddfe705 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt @@ -24,7 +24,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.core.EventId diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt index 6a5397074f..98255fd7c4 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt @@ -24,7 +24,7 @@ import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack -import io.element.android.x.architecture.createNode +import io.element.android.libraries.architecture.createNode import io.element.android.x.features.preferences.root.PreferencesRootNode import kotlinx.parcelize.Parcelize diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt index 429609e207..e6a03ec6b1 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.di.SessionScope @ContributesNode(SessionScope::class) diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt index dbc233b805..065aef7fd3 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt @@ -17,8 +17,8 @@ package io.element.android.x.features.preferences.root import androidx.compose.runtime.Composable -import io.element.android.x.architecture.Async -import io.element.android.x.architecture.Presenter +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter import io.element.android.x.features.logout.LogoutPreferencePresenter import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter import javax.inject.Inject diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt index 9339f00464..6541eb8c6d 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.preferences.root -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState import io.element.android.x.matrix.ui.model.MatrixUser diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt index 5d3e1dab7b..ed9f72b43b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt @@ -20,7 +20,7 @@ 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.x.architecture.Async +import io.element.android.libraries.architecture.Async import io.element.android.x.designsystem.components.preferences.PreferenceView import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.logout.LogoutPreferenceView diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt index 5422a3f3f5..93a7db4d7e 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt @@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async import io.element.android.x.matrix.ui.components.MatrixUserHeader import io.element.android.x.matrix.ui.model.MatrixUser diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt index c01f153ddd..48e3b79d30 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.di.AppScope @ContributesNode(AppScope::class) diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt index c6f2f473e3..5dfd3392e7 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt @@ -24,8 +24,8 @@ 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.x.architecture.Async -import io.element.android.x.architecture.Presenter +import io.element.android.libraries.architecture.Async +import io.element.android.libraries.architecture.Presenter import io.element.android.x.features.rageshake.crash.CrashDataStore import io.element.android.x.features.rageshake.logs.VectorFileLogger import io.element.android.x.features.rageshake.reporter.BugReporter diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt index 80912a7923..85736a76e4 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.rageshake.bugreport import android.os.Parcelable -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async import kotlinx.parcelize.Parcelize data class BugReportState( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt index 009ca812ef..6fd143e5ab 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt @@ -50,7 +50,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest -import io.element.android.x.architecture.Async +import io.element.android.libraries.architecture.Async import io.element.android.x.core.compose.LogCompositions import io.element.android.x.core.compose.textFieldState import io.element.android.x.designsystem.components.LabelledCheckbox diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt index 3549bf3cb7..918a89ddbb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt @@ -19,13 +19,14 @@ package io.element.android.x.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.rememberCoroutineScope -import io.element.android.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.features.rageshake.crash.CrashDataStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject -class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) : Presenter { +class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) : + Presenter { @Composable override fun present(): CrashDetectionState { diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt index 62e974703d..96657c6933 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt @@ -23,7 +23,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.core.screenshot.ImageResult import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt index e435a1a756..9878c26417 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt @@ -22,7 +22,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.features.rageshake.rageshake.RageShake import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore import kotlinx.coroutines.CoroutineScope diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt index 246545588f..5e216dca42 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector +import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.di.SessionScope import io.element.android.x.matrix.core.RoomId diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt index 991239ba59..2ffad36aab 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -25,7 +25,7 @@ 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.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import io.element.android.x.core.coroutine.parallelMap import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarSize diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt index 7c5c4e78de..90a3954d3a 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/x/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.x.anvilannotations.ContributesNode -import io.element.android.x.architecture.presenterConnector import io.element.android.x.di.AppScope // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt index 3f6b5938e6..f552aea412 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.template import androidx.compose.runtime.Composable -import io.element.android.x.architecture.Presenter +import io.element.android.libraries.architecture.Presenter import javax.inject.Inject class TemplatePresenter @Inject constructor() : Presenter { diff --git a/libraries/architecture/build.gradle.kts b/libraries/architecture/build.gradle.kts index 2fad440e85..962c6021be 100644 --- a/libraries/architecture/build.gradle.kts +++ b/libraries/architecture/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } android { - namespace = "io.element.android.x.libraries.architecture" + namespace = "io.element.android.libraries.architecture" } dependencies { diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt similarity index 94% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt index eb1d416fa7..6852bf9adb 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt similarity index 97% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt index 9428eda509..94d81a28e2 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import androidx.compose.runtime.MutableState import androidx.compose.runtime.Stable diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt similarity index 97% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt index be09103db3..2ac135a31c 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import android.content.Context import android.content.ContextWrapper diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt similarity index 96% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt index c7a82bd481..6a4d52d20e 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt similarity index 94% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt index 59150edf5f..b28d5a8145 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import com.bumble.appyx.core.node.Node import dagger.MapKey diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt similarity index 93% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt index 6d5e7de444..9bfd089c27 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import androidx.compose.runtime.Composable diff --git a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt similarity index 96% rename from libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt rename to libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt index 61659c7f80..0e97dba712 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.architecture +package io.element.android.libraries.architecture import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope From f17dd4ccd572fcbfd4a5504ccd323c2b3173eda9 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 16:34:04 +0100 Subject: [PATCH 07/61] Rename core module --- .../main/kotlin/io/element/android/x/di/AppModule.kt | 2 +- .../x/features/login/changeserver/ChangeServerView.kt | 2 +- .../android/x/features/login/error/ErrorFormatter.kt | 2 +- .../android/x/features/login/root/LoginRootNode.kt | 2 +- .../android/x/features/login/root/LoginRootScreen.kt | 2 +- .../android/x/features/messages/MessagesView.kt | 2 +- .../messages/textcomposer/MessageComposerPresenter.kt | 4 ++-- .../messages/textcomposer/MessageComposerState.kt | 2 +- .../x/features/messages/timeline/TimelinePresenter.kt | 2 +- .../x/features/messages/timeline/TimelineView.kt | 2 +- .../x/features/rageshake/bugreport/BugReportView.kt | 4 ++-- .../x/features/rageshake/crash/CrashDataStore.kt | 2 +- .../rageshake/crash/VectorUncaughtExceptionHandler.kt | 2 +- .../rageshake/crash/ui/CrashDetectionScreen.kt | 2 +- .../rageshake/detection/RageshakeDetectionEvents.kt | 2 +- .../rageshake/detection/RageshakeDetectionPresenter.kt | 2 +- .../rageshake/detection/RageshakeDetectionView.kt | 10 +++++----- .../x/features/rageshake/logs/VectorFileLogger.kt | 2 +- .../features/rageshake/rageshake/RageshakeDataStore.kt | 2 +- .../x/features/rageshake/reporter/BugReporter.kt | 6 +++--- .../features/rageshake/screenshot/ScreenshotHolder.kt | 2 +- .../android/x/features/roomlist/RoomListPresenter.kt | 2 +- .../android/x/features/roomlist/RoomListView.kt | 2 +- .../x/features/roomlist/components/RoomListTopBar.kt | 4 ++-- libraries/core/build.gradle.kts | 2 +- .../android/{x => libraries}/core/bitmap/Bitmap.kt | 2 +- .../android/{x => libraries}/core/bool/Booleans.kt | 2 +- .../android/{x => libraries}/core/compose/Keyboard.kt | 2 +- .../{x => libraries}/core/compose/LogCompositions.kt | 6 +++--- .../{x => libraries}/core/compose/OnLifecycleEvent.kt | 2 +- .../core/compose/PairCombinedPreviewParameter.kt | 2 +- .../core/compose/TextFieldLocalState.kt | 2 +- .../core/coroutine/CoroutineDispatchers.kt | 2 +- .../{x => libraries}/core/coroutine/TimingOperators.kt | 2 +- .../android/{x => libraries}/core/coroutine/pmap.kt | 2 +- .../{x => libraries}/core/data/StableCharSequence.kt | 2 +- .../element/android/{x => libraries}/core/data/Try.kt | 2 +- .../core/extensions/BasicExtensions.kt | 2 +- .../android/{x => libraries}/core/file/compressFile.kt | 2 +- .../android/{x => libraries}/core/hardware/vibrator.kt | 2 +- .../{x => libraries}/core/mimetype/MimeTypes.kt | 6 +++--- .../{x => libraries}/core/screenshot/Screenshot.kt | 2 +- .../{x => libraries}/core/ui/DimensionConverter.kt | 2 +- .../element/android/{x => libraries}/core/ui/View.kt | 2 +- .../android/{x => libraries}/core/uri/UrlUtils.kt | 2 +- .../io/element/android/x/matrix/RustMatrixClient.kt | 2 +- .../x/matrix/auth/RustMatrixAuthenticationService.kt | 2 +- .../android/x/matrix/room/RoomSummaryDataSource.kt | 2 +- .../io/element/android/x/matrix/room/RustMatrixRoom.kt | 2 +- .../android/x/matrix/sync/SlidingSyncObserverProxy.kt | 2 +- .../android/x/matrix/timeline/RustMatrixTimeline.kt | 2 +- .../android/x/textcomposer/RichTextComposerLayout.kt | 6 +++--- 52 files changed, 67 insertions(+), 67 deletions(-) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/bitmap/Bitmap.kt (94%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/bool/Booleans.kt (93%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/compose/Keyboard.kt (96%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/compose/LogCompositions.kt (89%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/compose/OnLifecycleEvent.kt (96%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/compose/PairCombinedPreviewParameter.kt (95%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/compose/TextFieldLocalState.kt (94%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/coroutine/CoroutineDispatchers.kt (94%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/coroutine/TimingOperators.kt (98%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/coroutine/pmap.kt (94%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/data/StableCharSequence.kt (95%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/data/Try.kt (94%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/extensions/BasicExtensions.kt (97%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/file/compressFile.kt (96%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/hardware/vibrator.kt (95%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/mimetype/MimeTypes.kt (92%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/screenshot/Screenshot.kt (97%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/ui/DimensionConverter.kt (96%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/ui/View.kt (96%) rename libraries/core/src/main/kotlin/io/element/android/{x => libraries}/core/uri/UrlUtils.kt (96%) diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt index c1b3ff42e7..f9143bc4bb 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt @@ -20,7 +20,7 @@ import android.content.Context import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 68846a70ff..55bfee1935 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -53,7 +53,7 @@ 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.x.core.compose.textFieldState +import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt index 3700575b96..f708f712a6 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.login.error import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import io.element.android.x.core.uri.isValidUrl +import io.element.android.libraries.core.uri.isValidUrl import io.element.android.x.features.login.root.LoginFormState import io.element.android.x.ui.strings.R as StringR diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt index bccf36fb22..4eb0735345 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt @@ -29,7 +29,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.core.compose.OnLifecycleEvent +import io.element.android.libraries.core.compose.OnLifecycleEvent import io.element.android.x.di.AppScope @ContributesNode(AppScope::class) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index 67a9f19d31..f74b342553 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -58,7 +58,7 @@ 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.x.core.compose.textFieldState +import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.features.login.error.loginError import io.element.android.x.libraries.testtags.TestTags import io.element.android.x.libraries.testtags.testTag diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt index 7711233699..85d0ed4fc5 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt @@ -56,7 +56,7 @@ 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.x.core.compose.LogCompositions +import io.element.android.libraries.core.compose.LogCompositions import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt index 63906b31da..73465e37c3 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -22,8 +22,8 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter -import io.element.android.x.core.data.StableCharSequence -import io.element.android.x.core.data.toStableCharSequence +import io.element.android.libraries.core.data.StableCharSequence +import io.element.android.libraries.core.data.toStableCharSequence import io.element.android.x.matrix.room.MatrixRoom import io.element.android.x.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt index 44c8e73d7e..6bca89b333 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.textcomposer import androidx.compose.runtime.Immutable -import io.element.android.x.core.data.StableCharSequence +import io.element.android.libraries.core.data.StableCharSequence import io.element.android.x.textcomposer.MessageComposerMode @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt index 8aaddfe705..83af2579b2 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt @@ -25,7 +25,7 @@ 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.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.core.EventId import io.element.android.x.matrix.room.MatrixRoom diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt index b2ecc490b3..aec9b5deae 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt @@ -58,7 +58,7 @@ 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.x.core.compose.PairCombinedPreviewParameter +import io.element.android.libraries.core.compose.PairCombinedPreviewParameter import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.AggregatedReaction diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt index 6fd143e5ab..cefe6cf90a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt @@ -51,8 +51,8 @@ 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.x.core.compose.LogCompositions -import io.element.android.x.core.compose.textFieldState +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.designsystem.components.LabelledCheckbox import io.element.android.x.designsystem.components.dialogs.ErrorDialog import io.element.android.x.ui.strings.R as StringR diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt index 07783f3e0b..a489b640e2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt @@ -23,7 +23,7 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import io.element.android.x.core.bool.orFalse +import io.element.android.libraries.core.bool.orFalse import io.element.android.x.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt index 08a23da860..15ef3256f0 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.rageshake.crash import android.content.Context import android.os.Build -import io.element.android.x.core.data.tryOrNull +import io.element.android.libraries.core.data.tryOrNull import java.io.PrintWriter import java.io.StringWriter import timber.log.Timber diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt index 494cc0d843..7a676704aa 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.core.compose.LogCompositions +import io.element.android.libraries.core.compose.LogCompositions import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt index 0ba2a26bae..3d0c4cef80 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.rageshake.detection -import io.element.android.x.core.screenshot.ImageResult +import io.element.android.libraries.core.screenshot.ImageResult sealed interface RageshakeDetectionEvents { object Dismiss : RageshakeDetectionEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt index 96657c6933..92b14bad76 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt @@ -24,7 +24,7 @@ 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.x.core.screenshot.ImageResult +import io.element.android.libraries.core.screenshot.ImageResult import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.x.features.rageshake.rageshake.RageShake diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt index c438c0a600..042687c8f3 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt @@ -23,11 +23,11 @@ import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.lifecycle.Lifecycle -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.core.compose.OnLifecycleEvent -import io.element.android.x.core.hardware.vibrate -import io.element.android.x.core.screenshot.ImageResult -import io.element.android.x.core.screenshot.screenshot +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.core.compose.OnLifecycleEvent +import io.element.android.libraries.core.hardware.vibrate +import io.element.android.libraries.core.screenshot.ImageResult +import io.element.android.libraries.core.screenshot.screenshot import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt index 5b39b79cf5..0b4275b3f2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.rageshake.logs import android.content.Context import android.util.Log -import io.element.android.x.core.data.tryOrNull +import io.element.android.libraries.core.data.tryOrNull import java.io.File import java.io.PrintWriter import java.io.StringWriter diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt index 35d0198b9e..8a5bb853f7 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt @@ -23,7 +23,7 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import io.element.android.x.core.bool.orTrue +import io.element.android.libraries.core.bool.orTrue import io.element.android.x.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt index fe3ca71720..1ff95b8bb7 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt @@ -18,9 +18,9 @@ package io.element.android.x.features.rageshake.reporter import android.content.Context import android.os.Build -import io.element.android.x.core.extensions.toOnOff -import io.element.android.x.core.file.compressFile -import io.element.android.x.core.mimetype.MimeTypes +import io.element.android.libraries.core.extensions.toOnOff +import io.element.android.libraries.core.file.compressFile +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.x.di.ApplicationContext import io.element.android.x.features.rageshake.R import io.element.android.x.features.rageshake.crash.CrashDataStore diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt index 00f9d74e96..d10feb9076 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap -import io.element.android.x.core.bitmap.writeBitmap +import io.element.android.libraries.core.bitmap.writeBitmap import io.element.android.x.di.AppScope import io.element.android.x.di.ApplicationContext import io.element.android.x.di.SingleIn diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt index 2ffad36aab..223fc9c7bf 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -26,7 +26,7 @@ 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.x.core.coroutine.parallelMap +import io.element.android.libraries.core.coroutine.parallelMap import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.x.features.roomlist.model.RoomListEvents diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt index d5c51b1ea3..9a424cd894 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt @@ -36,7 +36,7 @@ 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.x.core.compose.LogCompositions +import io.element.android.libraries.core.compose.LogCompositions import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.features.roomlist.components.RoomListTopBar import io.element.android.x.features.roomlist.components.RoomSummaryRow diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt index d8fe56142b..6dcef6d66e 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt @@ -52,8 +52,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import io.element.android.x.core.compose.LogCompositions -import io.element.android.x.core.compose.textFieldState +import io.element.android.libraries.core.compose.LogCompositions +import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.designsystem.components.avatar.Avatar import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.ui.strings.R as StringR diff --git a/libraries/core/build.gradle.kts b/libraries/core/build.gradle.kts index 4004ca1041..290ec420ba 100644 --- a/libraries/core/build.gradle.kts +++ b/libraries/core/build.gradle.kts @@ -19,5 +19,5 @@ plugins { } android { - namespace = "io.element.android.x.core" + namespace = "io.element.android.libraries.core" } diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/bitmap/Bitmap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/bitmap/Bitmap.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt index 028c871041..3bb978f67d 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/bitmap/Bitmap.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.bitmap +package io.element.android.libraries.core.bitmap import android.graphics.Bitmap import java.io.File diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/bool/Booleans.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt similarity index 93% rename from libraries/core/src/main/kotlin/io/element/android/x/core/bool/Booleans.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt index 46244de753..2613176643 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/bool/Booleans.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.bool +package io.element.android.libraries.core.bool fun Boolean?.orTrue() = this ?: true diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/Keyboard.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/Keyboard.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt index b0b95fc2dc..4e66199845 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/Keyboard.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.WindowInsets diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/LogCompositions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt similarity index 89% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/LogCompositions.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt index ec88d4433a..eff24198db 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/LogCompositions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.runtime.remember -import io.element.android.x.core.BuildConfig +import io.element.android.libraries.core.BuildConfig import timber.log.Timber // Note the inline function below which ensures that this function is essentially diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/OnLifecycleEvent.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/OnLifecycleEvent.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt index 499ab20bbe..51a117bacf 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/OnLifecycleEvent.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt index 74c04cdded..253ee8fb5c 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/PairCombinedPreviewParameter.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.ui.tooling.preview.PreviewParameterProvider diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/TextFieldLocalState.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/compose/TextFieldLocalState.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt index fa4b9eea85..c1a311492b 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/compose/TextFieldLocalState.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.compose +package io.element.android.libraries.core.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/CoroutineDispatchers.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/CoroutineDispatchers.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt index d36b9240dd..39e5e0dd51 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/CoroutineDispatchers.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.coroutine +package io.element.android.libraries.core.coroutine import kotlinx.coroutines.CoroutineDispatcher diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/TimingOperators.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt similarity index 98% rename from libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/TimingOperators.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt index 67405aeb9f..68e92e0289 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/TimingOperators.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.coroutine +package io.element.android.libraries.core.coroutine import android.os.SystemClock import kotlinx.coroutines.CoroutineScope diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/pmap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/pmap.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt index a952d74222..f823116898 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/coroutine/pmap.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.coroutine +package io.element.android.libraries.core.coroutine import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/data/StableCharSequence.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/StableCharSequence.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/x/core/data/StableCharSequence.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/data/StableCharSequence.kt index 92e9cae64a..25f68f2fea 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/data/StableCharSequence.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/StableCharSequence.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.data +package io.element.android.libraries.core.data /** * Wrapper for a CharSequence, which support mutation of the CharSequence. diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/data/Try.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/x/core/data/Try.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt index ccaf5fb54b..21e4bb7738 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/data/Try.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.data +package io.element.android.libraries.core.data import timber.log.Timber diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt similarity index 97% rename from libraries/core/src/main/kotlin/io/element/android/x/core/extensions/BasicExtensions.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt index 5e77bb3b91..9ae50826c6 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/extensions/BasicExtensions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.extensions +package io.element.android.libraries.core.extensions import android.util.Patterns diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/file/compressFile.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/file/compressFile.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt index aade7bf8e3..ff6fc22178 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/file/compressFile.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.file +package io.element.android.libraries.core.file import java.io.File import java.util.zip.GZIPOutputStream diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/hardware/vibrator.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/x/core/hardware/vibrator.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt index de22f9c463..e7f95a20d9 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/hardware/vibrator.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.hardware +package io.element.android.libraries.core.hardware import android.content.Context import android.os.Build diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/mimetype/MimeTypes.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt similarity index 92% rename from libraries/core/src/main/kotlin/io/element/android/x/core/mimetype/MimeTypes.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt index fa21816cfd..082623b4de 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/mimetype/MimeTypes.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.core.mimetype +package io.element.android.libraries.core.mimetype -import io.element.android.x.core.bool.orFalse +import io.element.android.libraries.core.bool.orFalse // The Android SDK does not provide constant for mime type, add some of them here object MimeTypes { diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/screenshot/Screenshot.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt similarity index 97% rename from libraries/core/src/main/kotlin/io/element/android/x/core/screenshot/Screenshot.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt index 26a2e57c9e..c1e1a3be80 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/screenshot/Screenshot.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.screenshot +package io.element.android.libraries.core.screenshot import android.app.Activity import android.graphics.Bitmap diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/DimensionConverter.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/ui/DimensionConverter.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt index f0395b1d3d..cde1a49cda 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/DimensionConverter.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.element.android.x.core.ui +package io.element.android.libraries.core.ui import android.content.res.Resources import android.util.TypedValue diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/View.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/ui/View.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt index 99147d76a6..5d10fdd50a 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/ui/View.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.ui +package io.element.android.libraries.core.ui import android.view.View import android.view.inputmethod.InputMethodManager diff --git a/libraries/core/src/main/kotlin/io/element/android/x/core/uri/UrlUtils.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/x/core/uri/UrlUtils.kt rename to libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt index 8574727e35..4fb5e986fd 100644 --- a/libraries/core/src/main/kotlin/io/element/android/x/core/uri/UrlUtils.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.core.uri +package io.element.android.libraries.core.uri import java.net.URL diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt index b96b1e87fb..90efb11482 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.core.RoomId import io.element.android.x.matrix.core.SessionId import io.element.android.x.matrix.core.UserId diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt index 3efb6d82c8..43de690583 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt @@ -17,7 +17,7 @@ package io.element.android.x.matrix.auth import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.di.AppScope import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.RustMatrixClient diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt index 81b9f20af1..249e600c09 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.room -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.sync.roomListDiff import io.element.android.x.matrix.sync.state import java.io.Closeable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt index 7d7c2414fb..21c48fbcf9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.room -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.core.EventId import io.element.android.x.matrix.core.RoomId import io.element.android.x.matrix.timeline.MatrixTimeline diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt index 014d9c64c8..f10ff0e12d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.sync -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt index ecfce4af7a..bfb4bdf3f2 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt @@ -16,7 +16,7 @@ package io.element.android.x.matrix.timeline -import io.element.android.x.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.x.matrix.core.EventId import io.element.android.x.matrix.room.RustMatrixRoom import kotlinx.coroutines.CoroutineScope diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt index 7eb8d5dcda..27a0fc1b24 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt @@ -42,9 +42,9 @@ import androidx.core.view.updateLayoutParams import com.google.android.material.shape.MaterialShapeDrawable import io.element.android.wysiwyg.EditorEditText import io.element.android.wysiwyg.inputhandlers.models.InlineFormat -import io.element.android.x.core.ui.DimensionConverter -import io.element.android.x.core.ui.hideKeyboard -import io.element.android.x.core.ui.showKeyboard +import io.element.android.libraries.core.ui.DimensionConverter +import io.element.android.libraries.core.ui.hideKeyboard +import io.element.android.libraries.core.ui.showKeyboard import io.element.android.x.textcomposer.databinding.ComposerRichTextLayoutBinding import io.element.android.x.textcomposer.databinding.ViewRichTextMenuButtonBinding import io.element.android.x.textcomposer.tools.setTextIfDifferent From 7903e855ec8f188e34b02ff14114c61400f0ad14 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:09:12 +0100 Subject: [PATCH 08/61] Rename designsystem module --- .../kotlin/io/element/android/x/MainActivity.kt | 2 +- .../login/changeserver/ChangeServerView.kt | 2 +- .../x/features/logout/LogoutPreferenceScreen.kt | 8 ++++---- .../x/features/messages/MessagesPresenter.kt | 4 ++-- .../android/x/features/messages/MessagesState.kt | 2 +- .../android/x/features/messages/MessagesView.kt | 4 ++-- .../features/messages/actionlist/ActionListView.kt | 2 +- .../actionlist/model/TimelineItemAction.kt | 12 ++++++------ .../messages/textcomposer/MessageComposerView.kt | 2 +- .../messages/timeline/TimelineItemsFactory.kt | 2 +- .../x/features/messages/timeline/TimelineView.kt | 4 ++-- .../timeline/components/MessageEventBubble.kt | 14 +++++++------- .../timeline/components/TimelineItemTextView.kt | 4 ++-- .../timeline/components/html/HtmlDocument.kt | 4 ++-- .../messages/timeline/model/TimelineItem.kt | 2 +- .../x/features/onboarding/OnBoardingScreen.kt | 2 +- .../preferences/root/PreferencesRootView.kt | 2 +- .../features/rageshake/bugreport/BugReportView.kt | 4 ++-- .../rageshake/crash/ui/CrashDetectionScreen.kt | 2 +- .../rageshake/detection/RageshakeDetectionView.kt | 2 +- .../preferences/RageshakePreferencesView.kt | 8 ++++---- .../x/features/roomlist/RoomListPresenter.kt | 4 ++-- .../android/x/features/roomlist/RoomListView.kt | 2 +- .../features/roomlist/components/RoomListTopBar.kt | 2 +- .../features/roomlist/components/RoomSummaryRow.kt | 2 +- .../features/roomlist/model/RoomListRoomSummary.kt | 2 +- .../model/RoomListRoomSummaryPlaceholders.kt | 2 +- .../android/x/features/roomlist/model/stubbed.kt | 2 +- .../android/{x => libraries}/designsystem/Color.kt | 4 ++-- .../{x => libraries}/designsystem/ColorUtil.kt | 4 ++-- .../android/{x => libraries}/designsystem/Theme.kt | 4 ++-- .../android/{x => libraries}/designsystem/Type.kt | 4 ++-- .../{x => libraries}/designsystem/VectorIcons.kt | 2 +- .../designsystem/components/ClickableLinkText.kt | 2 +- .../designsystem/components/LabelledCheckbox.kt | 2 +- .../designsystem/components/ProgressDialog.kt | 2 +- .../designsystem/components/VectorButton.kt | 2 +- .../designsystem/components/VectorIcon.kt | 2 +- .../designsystem/components/avatar/Avatar.kt | 8 ++++---- .../designsystem/components/avatar/AvatarData.kt | 4 ++-- .../designsystem/components/avatar/AvatarSize.kt | 4 ++-- .../components/dialogs/ConfirmationDialog.kt | 4 ++-- .../designsystem/components/dialogs/ErrorDialog.kt | 4 ++-- .../designsystem/components/preferences/Config.kt | 4 ++-- .../components/preferences/PreferenceCategory.kt | 4 ++-- .../components/preferences/PreferenceScreen.kt | 4 ++-- .../components/preferences/PreferenceSlide.kt | 8 ++++---- .../components/preferences/PreferenceSwitch.kt | 8 ++++---- .../components/preferences/PreferenceText.kt | 6 +++--- .../preferences/components/PreferenceIcon.kt | 6 +++--- .../android/x/matrix/ui/MatrixItemHelper.kt | 4 ++-- .../x/matrix/ui/components/MatrixUserHeader.kt | 6 +++--- .../x/matrix/ui/components/MatrixUserRow.kt | 4 ++-- .../android/x/matrix/ui/model/MatrixUser.kt | 2 +- .../android/x/tests/uitests/ScreenshotTest.kt | 2 +- 55 files changed, 107 insertions(+), 107 deletions(-) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/Color.kt (95%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/ColorUtil.kt (91%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/Theme.kt (97%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/Type.kt (98%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/VectorIcons.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/ClickableLinkText.kt (98%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/LabelledCheckbox.kt (96%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/ProgressDialog.kt (97%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/VectorButton.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/VectorIcon.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/avatar/Avatar.kt (92%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/avatar/AvatarData.kt (93%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/avatar/AvatarSize.kt (87%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/dialogs/ConfirmationDialog.kt (96%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/dialogs/ErrorDialog.kt (95%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/Config.kt (86%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceCategory.kt (94%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceScreen.kt (97%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceSlide.kt (91%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceSwitch.kt (90%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/PreferenceText.kt (91%) rename libraries/designsystem/src/main/kotlin/io/element/android/{x => libraries}/designsystem/components/preferences/components/PreferenceIcon.kt (88%) 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 dc050debb4..796601bffe 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -27,7 +27,7 @@ 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.x.di.DaggerComponentOwner -import io.element.android.x.designsystem.ElementXTheme +import io.element.android.libraries.designsystem.ElementXTheme import io.element.android.x.di.AppBindings import io.element.android.x.node.RootFlowNode diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 55bfee1935..56d54b44d7 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -54,7 +54,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.architecture.Async import io.element.android.libraries.core.compose.textFieldState -import io.element.android.x.designsystem.components.VectorIcon +import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError import io.element.android.x.libraries.testtags.TestTags diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt index 28b259a989..147e890200 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt @@ -25,10 +25,10 @@ import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.architecture.Async -import io.element.android.x.designsystem.components.ProgressDialog -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.designsystem.components.preferences.PreferenceCategory -import io.element.android.x.designsystem.components.preferences.PreferenceText +import io.element.android.libraries.designsystem.components.ProgressDialog +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory +import io.element.android.libraries.designsystem.components.preferences.PreferenceText import io.element.android.x.ui.strings.R as StringR @Composable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt index 778efa5a79..d682133968 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt @@ -25,8 +25,8 @@ 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.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.features.messages.actionlist.ActionListPresenter import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.textcomposer.MessageComposerEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt index af3b0793b5..8d011fc6d2 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListState import io.element.android.x.features.messages.textcomposer.MessageComposerState import io.element.android.x.features.messages.timeline.TimelineState diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt index 85d0ed4fc5..a543141e6a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt @@ -57,8 +57,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.LogCompositions -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListEvents import io.element.android.x.features.messages.actionlist.ActionListView import io.element.android.x.features.messages.actionlist.model.TimelineItemAction diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt index 7984577de4..dfb3018596 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt @@ -41,7 +41,7 @@ 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.x.designsystem.components.VectorIcon +import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.timeline.model.TimelineItem import kotlinx.coroutines.flow.filter diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt index 4e23eb34f0..a43dbdb6a3 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.messages.actionlist.model import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.VectorIcons +import io.element.android.libraries.designsystem.VectorIcons @Immutable sealed class TimelineItemAction( @@ -26,9 +26,9 @@ sealed class TimelineItemAction( @DrawableRes val icon: Int, val destructive: Boolean = false ) { - object Forward : TimelineItemAction("Forward", VectorIcons.ArrowForward) - object Copy : TimelineItemAction("Copy", VectorIcons.Copy) - object Redact : TimelineItemAction("Redact", VectorIcons.Delete, destructive = true) - object Reply : TimelineItemAction("Reply", VectorIcons.Reply) - object Edit : TimelineItemAction("Edit", VectorIcons.Edit) + object Forward : TimelineItemAction("Forward", io.element.android.libraries.designsystem.VectorIcons.ArrowForward) + object Copy : TimelineItemAction("Copy", io.element.android.libraries.designsystem.VectorIcons.Copy) + object Redact : TimelineItemAction("Redact", io.element.android.libraries.designsystem.VectorIcons.Delete, destructive = true) + object Reply : TimelineItemAction("Reply", io.element.android.libraries.designsystem.VectorIcons.Reply) + object Edit : TimelineItemAction("Edit", io.element.android.libraries.designsystem.VectorIcons.Edit) } diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt index e5555bf477..0077cb8e19 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.designsystem.LocalIsDarkTheme +import io.element.android.libraries.designsystem.LocalIsDarkTheme import io.element.android.x.textcomposer.TextComposer @Composable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt index 0b8a3bfc48..3bab3ec9a2 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.timeline import androidx.recyclerview.widget.DiffUtil -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.features.messages.timeline.diff.CacheInvalidator import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback import io.element.android.x.features.messages.timeline.model.AggregatedReaction diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt index aec9b5deae..4225ec77b3 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt @@ -59,8 +59,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import io.element.android.libraries.core.compose.PairCombinedPreviewParameter -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.AggregatedReaction import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt index 7466d38e1a..e7c16eefe4 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt @@ -29,13 +29,13 @@ 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.x.designsystem.LocalIsDarkTheme -import io.element.android.x.designsystem.MessageHighlightDark -import io.element.android.x.designsystem.MessageHighlightLight -import io.element.android.x.designsystem.SystemGrey5Dark -import io.element.android.x.designsystem.SystemGrey5Light -import io.element.android.x.designsystem.SystemGrey6Dark -import io.element.android.x.designsystem.SystemGrey6Light +import io.element.android.libraries.designsystem.LocalIsDarkTheme +import io.element.android.libraries.designsystem.MessageHighlightDark +import io.element.android.libraries.designsystem.MessageHighlightLight +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.x.features.messages.timeline.model.MessagesItemGroupPosition private val BUBBLE_RADIUS = 16.dp diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt index 4751f2ae0d..8da4a0a1f4 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt @@ -28,8 +28,8 @@ 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.x.designsystem.LinkColor -import io.element.android.x.designsystem.components.ClickableLinkText +import io.element.android.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText import io.element.android.x.features.messages.timeline.components.html.HtmlDocument import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt index e5dcfc1112..b9049e55b7 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt @@ -47,8 +47,8 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow -import io.element.android.x.designsystem.LinkColor -import io.element.android.x.designsystem.components.ClickableLinkText +import io.element.android.libraries.designsystem.LinkColor +import io.element.android.libraries.designsystem.components.ClickableLinkText import io.element.android.x.matrix.permalink.PermalinkData import io.element.android.x.matrix.permalink.PermalinkParser import kotlinx.collections.immutable.persistentMapOf diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt index ef93d38aa2..f274f5c7f9 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.timeline.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent import io.element.android.x.matrix.core.EventId diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt index 138840e222..634ce740be 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -49,7 +49,7 @@ import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState -import io.element.android.x.designsystem.components.VectorButton +import io.element.android.libraries.designsystem.components.VectorButton import io.element.android.x.libraries.testtags.TestTags import io.element.android.x.libraries.testtags.testTag import kotlinx.coroutines.delay diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt index ed9f72b43b..d632c1cf87 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt @@ -21,7 +21,7 @@ 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.x.designsystem.components.preferences.PreferenceView +import io.element.android.libraries.designsystem.components.preferences.PreferenceView import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.logout.LogoutPreferenceView import io.element.android.x.features.preferences.user.UserPreferences diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt index cefe6cf90a..51ec736ffd 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt @@ -53,8 +53,8 @@ import coil.request.ImageRequest import io.element.android.libraries.architecture.Async import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState -import io.element.android.x.designsystem.components.LabelledCheckbox -import io.element.android.x.designsystem.components.dialogs.ErrorDialog +import io.element.android.libraries.designsystem.components.LabelledCheckbox +import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog import io.element.android.x.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt index 7a676704aa..578f0eb877 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.core.compose.LogCompositions -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR @Composable diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt index 042687c8f3..f2d208e359 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt @@ -28,7 +28,7 @@ import io.element.android.libraries.core.compose.OnLifecycleEvent import io.element.android.libraries.core.hardware.vibrate import io.element.android.libraries.core.screenshot.ImageResult import io.element.android.libraries.core.screenshot.screenshot -import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.ui.strings.R as StringR @Composable diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt index 43f7f94d03..83e95a52d9 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt @@ -23,10 +23,10 @@ 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.x.designsystem.components.preferences.PreferenceCategory -import io.element.android.x.designsystem.components.preferences.PreferenceSlide -import io.element.android.x.designsystem.components.preferences.PreferenceSwitch -import io.element.android.x.designsystem.components.preferences.PreferenceText +import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory +import io.element.android.libraries.designsystem.components.preferences.PreferenceSlide +import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch +import io.element.android.libraries.designsystem.components.preferences.PreferenceText import io.element.android.x.ui.strings.R as StringR @Composable diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt index 223fc9c7bf..8d0dea57ce 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -27,8 +27,8 @@ 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.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt index 9a424cd894..046e804691 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt @@ -37,7 +37,7 @@ 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.core.compose.LogCompositions -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.roomlist.components.RoomListTopBar import io.element.android.x.features.roomlist.components.RoomSummaryRow import io.element.android.x.features.roomlist.model.RoomListEvents diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt index 6dcef6d66e..ea913a30a5 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt @@ -54,7 +54,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState -import io.element.android.x.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.ui.strings.R as StringR diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt index ef8b4ac341..2c4d647cfb 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt @@ -52,7 +52,7 @@ 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.x.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.x.features.roomlist.model.RoomListRoomSummary private val minHeight = 72.dp diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt index 4bac53544c..038ffaea47 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.roomlist.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.matrix.core.RoomId @Immutable diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt index c714baf3d3..6950ab32da 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.roomlist.model -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData object RoomListRoomSummaryPlaceholders { diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt index 71ba70829f..ef3dac79d6 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.roomlist.model -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt similarity index 95% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt index c2ce45f879..936f102a85 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Color.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import androidx.compose.ui.graphics.Color import com.airbnb.android.showkase.annotation.ShowkaseColor diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt similarity index 91% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt index 7ecf7c428e..b15bfc49db 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/ColorUtil.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt similarity index 97% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt index 34bda66a21..d2168f644e 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Theme.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt similarity index 98% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt index df87fba257..6e97bfa4fb 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/Type.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Type.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt index d29ff12b9e..330da95154 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/VectorIcons.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem +package io.element.android.libraries.designsystem import io.element.android.x.libraries.designsystem.R diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt similarity index 98% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt index 1166a20f92..591baf1152 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ClickableLinkText.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt similarity index 96% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt index fcbc6f8d02..f1ad5738ac 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/LabelledCheckbox.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt similarity index 97% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt index c374dec691..8bcc77226b 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/ProgressDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt index e728636d55..928e83cfa4 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorButton.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.material3.Button import androidx.compose.material3.Text diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt index f0e93aefd0..60e7c644ad 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/VectorIcon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/VectorIcon.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components +package io.element.android.libraries.designsystem.components import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt similarity index 92% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt index e2465e3f13..bda58ec0f0 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.avatar +package io.element.android.libraries.designsystem.components.avatar import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -32,8 +32,8 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp import coil.compose.AsyncImage -import io.element.android.x.designsystem.AvatarGradientEnd -import io.element.android.x.designsystem.AvatarGradientStart +import io.element.android.libraries.designsystem.AvatarGradientEnd +import io.element.android.libraries.designsystem.AvatarGradientStart import timber.log.Timber @Composable diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt similarity index 93% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt index d4fb492901..0ccc89eeaf 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarData.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.avatar +package io.element.android.libraries.designsystem.components.avatar import androidx.compose.runtime.Immutable diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt similarity index 87% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt index a0b4643191..35689817b0 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/AvatarSize.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.avatar +package io.element.android.libraries.designsystem.components.avatar import androidx.compose.ui.unit.dp diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt similarity index 96% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt index 9d74a2da87..e5e793a703 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.dialogs +package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt similarity index 95% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt index 241d47fe9f..22f8624dad 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/dialogs/ErrorDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.dialogs +package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt similarity index 86% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt index ffce99028d..1bae5df7cc 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/Config.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/Config.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.ui.unit.dp diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt similarity index 94% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt index e74645950c..c9e6ac6740 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt similarity index 97% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt index 2d2e42c9df..4b5f007506 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt similarity index 91% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt index af6641f13d..aadb0ab236 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.annotation.FloatRange import androidx.compose.foundation.layout.Box @@ -31,8 +31,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon -import io.element.android.x.designsystem.toEnabledColor +import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon +import io.element.android.libraries.designsystem.toEnabledColor @Composable fun PreferenceSlide( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt similarity index 90% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt index 4dc6609a41..68a402296c 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -32,8 +32,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon -import io.element.android.x.designsystem.toEnabledColor +import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon +import io.element.android.libraries.designsystem.toEnabledColor @Composable fun PreferenceSwitch( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt similarity index 91% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt index 5922a1a92c..bef45830e2 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences +package io.element.android.libraries.designsystem.components.preferences import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -31,7 +31,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview -import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon +import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon @Composable fun PreferenceText( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt similarity index 88% rename from libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt index 9dc5fe0e8f..6a821333cc 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.designsystem.components.preferences.components +package io.element.android.libraries.designsystem.components.preferences.components import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding @@ -24,7 +24,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import io.element.android.x.designsystem.toEnabledColor +import io.element.android.libraries.designsystem.toEnabledColor @Composable fun PreferenceIcon( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt index 49a97b3a5f..a5f06d8f54 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt @@ -16,8 +16,8 @@ package io.element.android.x.matrix.ui -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.media.MediaResolver import io.element.android.x.matrix.room.MatrixRoom diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt index 08acd79a0c..91e4f04609 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt @@ -33,9 +33,9 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.designsystem.components.avatar.AvatarData -import io.element.android.x.designsystem.components.avatar.AvatarSize +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.x.matrix.core.UserId import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.matrix.ui.model.getBestName diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt index e121ced17c..b98275ba2d 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt @@ -33,8 +33,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import io.element.android.x.designsystem.components.avatar.Avatar -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.matrix.core.UserId import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.matrix.ui.model.getBestName diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt index 835ea35a7a..09ca3b46c7 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt @@ -17,7 +17,7 @@ package io.element.android.x.matrix.ui.model import androidx.compose.runtime.Immutable -import io.element.android.x.designsystem.components.avatar.AvatarData +import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.matrix.core.UserId @Immutable diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt index 3d1804884d..994b65675a 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt @@ -36,7 +36,7 @@ import app.cash.paparazzi.Paparazzi import com.airbnb.android.showkase.models.Showkase import com.google.testing.junit.testparameterinjector.TestParameter import com.google.testing.junit.testparameterinjector.TestParameterInjector -import io.element.android.x.designsystem.ElementXTheme +import io.element.android.libraries.designsystem.ElementXTheme import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith From c6cfe2b5e2f770ab54f0aa3895e214f7f15222ad Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:12:40 +0100 Subject: [PATCH 09/61] Rename di module --- .../main/kotlin/io/element/android/x/ElementXApplication.kt | 2 +- app/src/main/kotlin/io/element/android/x/MainActivity.kt | 2 +- app/src/main/kotlin/io/element/android/x/di/AppBindings.kt | 1 + app/src/main/kotlin/io/element/android/x/di/AppComponent.kt | 3 +++ app/src/main/kotlin/io/element/android/x/di/AppModule.kt | 3 +++ .../main/kotlin/io/element/android/x/di/RoomComponent.kt | 3 +++ .../main/kotlin/io/element/android/x/di/SessionComponent.kt | 3 +++ .../kotlin/io/element/android/x/node/LoggedInFlowNode.kt | 2 +- .../main/kotlin/io/element/android/x/node/RoomFlowNode.kt | 2 +- .../main/kotlin/io/element/android/x/node/RootFlowNode.kt | 2 +- .../x/features/login/changeserver/ChangeServerNode.kt | 2 +- .../element/android/x/features/login/root/LoginRootNode.kt | 2 +- .../io/element/android/x/features/messages/MessagesNode.kt | 2 +- .../x/features/preferences/root/PreferencesRootNode.kt | 2 +- .../android/x/features/rageshake/bugreport/BugReportNode.kt | 2 +- .../android/x/features/rageshake/crash/CrashDataStore.kt | 2 +- .../android/x/features/rageshake/rageshake/RageShake.kt | 6 +++--- .../x/features/rageshake/rageshake/RageshakeDataStore.kt | 2 +- .../android/x/features/rageshake/reporter/BugReporter.kt | 2 +- .../x/features/rageshake/screenshot/ScreenshotHolder.kt | 6 +++--- .../io/element/android/x/features/roomlist/RoomListNode.kt | 2 +- .../io/element/android/x/features/template/TemplateNode.kt | 2 +- .../io/element/android/libraries/architecture/Bindings.kt | 2 +- .../io/element/android/{x => libraries}/di/AppScope.kt | 2 +- .../android/{x => libraries}/di/ApplicationContext.kt | 2 +- .../android/{x => libraries}/di/DaggerComponentOwner.kt | 2 +- .../io/element/android/{x => libraries}/di/RoomScope.kt | 2 +- .../io/element/android/{x => libraries}/di/SessionScope.kt | 2 +- .../io/element/android/{x => libraries}/di/SingleIn.kt | 2 +- .../x/matrix/auth/RustMatrixAuthenticationService.kt | 2 +- .../kotlin/io/element/android/x/matrix/di/MatrixModule.kt | 4 ++-- .../android/x/matrix/session/PreferencesSessionStore.kt | 6 +++--- .../io/element/android/x/matrix/ui/di/MatrixUIBindings.kt | 2 +- .../android/x/matrix/ui/media/ImageLoaderFactories.kt | 2 +- 34 files changed, 49 insertions(+), 36 deletions(-) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/AppScope.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/ApplicationContext.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/DaggerComponentOwner.kt (95%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/RoomScope.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/SessionScope.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/SingleIn.kt (94%) diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index 4532276e11..a1168f4efb 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -18,7 +18,7 @@ package io.element.android.x import android.app.Application import androidx.startup.AppInitializer -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.AppComponent import io.element.android.x.di.DaggerAppComponent import io.element.android.x.initializer.CrashInitializer 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 796601bffe..364ab6396d 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -26,7 +26,7 @@ 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.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.libraries.designsystem.ElementXTheme 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/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 78f40f0322..1a52428737 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -17,6 +17,7 @@ package io.element.android.x.di import com.squareup.anvil.annotations.ContributesTo +import io.element.android.libraries.di.AppScope import io.element.android.x.matrix.auth.MatrixAuthenticationService import io.element.android.x.root.RootPresenter import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt index c412fa9163..ded3c333d7 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt @@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeComponent import dagger.BindsInstance import dagger.Component import io.element.android.libraries.architecture.NodeFactoriesBindings +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn @SingleIn(AppScope::class) @MergeComponent(AppScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt index f9143bc4bb..7cb3fb55c3 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt @@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides import io.element.android.libraries.core.coroutine.CoroutineDispatchers +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index 8d19684d18..35b1c931da 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt @@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeSubcomponent import dagger.BindsInstance import dagger.Subcomponent import io.element.android.libraries.architecture.NodeFactoriesBindings +import io.element.android.libraries.di.RoomScope +import io.element.android.libraries.di.SessionScope +import io.element.android.libraries.di.SingleIn import io.element.android.x.matrix.room.MatrixRoom @SingleIn(RoomScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 57de09231f..05c12af80b 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt @@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeSubcomponent import dagger.BindsInstance import dagger.Subcomponent import io.element.android.libraries.architecture.NodeFactoriesBindings +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.SessionScope +import io.element.android.libraries.di.SingleIn import io.element.android.x.matrix.MatrixClient @SingleIn(SessionScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index b707d1071b..138885870f 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -34,7 +34,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.SessionComponent import io.element.android.x.features.preferences.PreferencesFlowNode import io.element.android.x.features.roomlist.RoomListNode diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index fc505303af..ee38296aa9 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.RoomComponent import io.element.android.x.features.messages.MessagesNode import io.element.android.x.matrix.room.MatrixRoom diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index 6784b1f7cf..d71e193d71 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -38,7 +38,7 @@ import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.features.rageshake.bugreport.BugReportNode import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.auth.MatrixAuthenticationService diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt index 41ea7240a4..6264809ada 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt @@ -27,7 +27,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class ChangeServerNode @AssistedInject constructor( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt index 4eb0735345..b46b79e995 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt @@ -30,7 +30,7 @@ import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.core.compose.OnLifecycleEvent -import io.element.android.x.di.AppScope +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class LoginRootNode @AssistedInject constructor( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt index 3eb489e365..3bc779eb22 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt @@ -27,7 +27,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.RoomScope +import io.element.android.libraries.di.RoomScope @ContributesNode(RoomScope::class) class MessagesNode @AssistedInject constructor( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt index e6a03ec6b1..60ff67091b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.SessionScope +import io.element.android.libraries.di.SessionScope @ContributesNode(SessionScope::class) class PreferencesRootNode @AssistedInject constructor( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt index 48e3b79d30..409e429330 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class BugReportNode @AssistedInject constructor( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt index a489b640e2..886877e89b 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt @@ -24,7 +24,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import io.element.android.libraries.core.bool.orFalse -import io.element.android.x.di.ApplicationContext +import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt index ae9c3531c5..14643f8c1c 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt @@ -21,9 +21,9 @@ import android.hardware.Sensor import android.hardware.SensorManager import androidx.core.content.getSystemService import com.squareup.seismic.ShakeDetector -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import javax.inject.Inject @SingleIn(AppScope::class) diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt index 8a5bb853f7..a9e741720b 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt @@ -24,7 +24,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.preferencesDataStore import io.element.android.libraries.core.bool.orTrue -import io.element.android.x.di.ApplicationContext +import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt index 1ff95b8bb7..b12aedc0db 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt @@ -21,7 +21,7 @@ import android.os.Build import io.element.android.libraries.core.extensions.toOnOff import io.element.android.libraries.core.file.compressFile import io.element.android.libraries.core.mimetype.MimeTypes -import io.element.android.x.di.ApplicationContext +import io.element.android.libraries.di.ApplicationContext import io.element.android.x.features.rageshake.R import io.element.android.x.features.rageshake.crash.CrashDataStore import io.element.android.x.features.rageshake.logs.VectorFileLogger diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt index d10feb9076..e57513d0fa 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt @@ -19,9 +19,9 @@ package io.element.android.x.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap import io.element.android.libraries.core.bitmap.writeBitmap -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import java.io.File import javax.inject.Inject diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt index 5e216dca42..84ff93680e 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.SessionScope +import io.element.android.libraries.di.SessionScope import io.element.android.x.matrix.core.RoomId @ContributesNode(SessionScope::class) diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt index 90a3954d3a..ca0f5ce7fe 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt @@ -27,7 +27,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.libraries.architecture.presenterConnector import io.element.android.x.anvilannotations.ContributesNode -import io.element.android.x.di.AppScope +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 @ContributesNode(AppScope::class) diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt index 2ac135a31c..e4a6d7ae7d 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt @@ -19,7 +19,7 @@ package io.element.android.libraries.architecture import android.content.Context import android.content.ContextWrapper import com.bumble.appyx.core.node.Node -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner inline fun Node.bindings() = bindings(T::class.java) inline fun Context.bindings() = bindings(T::class.java) diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt index 79782c60d9..2b40d59894 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class AppScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt index 7ed9251cee..2108678097 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di import javax.inject.Qualifier diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt similarity index 95% rename from libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt index eaf3371be3..57f5540c16 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di /** * A [DaggerComponentOwner] is anything that "owns" a Dagger Component. diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt index bcdb76c31d..af25c4cda5 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class RoomScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt index 55fbb71a8e..8ebd6ecaee 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class SessionScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt index 9e9fb7e24e..42a6b860ca 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di import javax.inject.Scope import kotlin.reflect.KClass diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt index 43de690583..daebb759f8 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt @@ -18,7 +18,7 @@ package io.element.android.x.matrix.auth import com.squareup.anvil.annotations.ContributesBinding import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.di.AppScope +import io.element.android.libraries.di.AppScope import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.RustMatrixClient import io.element.android.x.matrix.core.SessionId diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt index 2808c3667b..2a4516aa37 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt @@ -19,8 +19,8 @@ package io.element.android.x.matrix.di import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides -import io.element.android.x.di.AppScope -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.SingleIn import org.matrix.rustcomponents.sdk.AuthenticationService import java.io.File diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt index 6c8f6498e3..9b18cb25b4 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt @@ -23,9 +23,9 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt index 557d896cb8..4502c4dc94 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt @@ -17,7 +17,7 @@ package io.element.android.x.matrix.ui.di import com.squareup.anvil.annotations.ContributesTo -import io.element.android.x.di.SessionScope +import io.element.android.libraries.di.SessionScope import io.element.android.x.matrix.ui.media.LoggedInImageLoaderFactory import io.element.android.x.matrix.ui.media.NotLoggedInImageLoaderFactory diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt index eecb25f9f2..655b909db5 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt @@ -19,7 +19,7 @@ package io.element.android.x.matrix.ui.media import android.content.Context import coil.ImageLoader import coil.ImageLoaderFactory -import io.element.android.x.di.ApplicationContext +import io.element.android.libraries.di.ApplicationContext import io.element.android.x.matrix.MatrixClient import javax.inject.Inject From 0a3697bfe89f5ef4315e7738321600c9b11aadf1 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:27:47 +0100 Subject: [PATCH 10/61] Rename matrix modules --- .../io/element/android/x/di/AppBindings.kt | 2 +- .../io/element/android/x/di/RoomComponent.kt | 2 +- .../element/android/x/di/SessionComponent.kt | 2 +- .../x/initializer/MatrixInitializer.kt | 4 +-- .../android/x/node/LoggedInFlowNode.kt | 8 ++--- .../io/element/android/x/node/RoomFlowNode.kt | 2 +- .../io/element/android/x/node/RootFlowNode.kt | 6 ++-- .../changeserver/ChangeServerPresenter.kt | 2 +- .../features/login/root/LoginRootPresenter.kt | 2 +- .../x/features/login/root/LoginRootScreen.kt | 2 +- .../x/features/login/root/LoginRootState.kt | 2 +- .../logout/LogoutPreferencePresenter.kt | 2 +- .../x/features/messages/MessagesPresenter.kt | 6 ++-- .../x/features/messages/MessagesState.kt | 2 +- .../textcomposer/MessageComposerPresenter.kt | 2 +- .../messages/timeline/TimelineEvents.kt | 2 +- .../messages/timeline/TimelineItemsFactory.kt | 10 +++---- .../messages/timeline/TimelinePresenter.kt | 12 ++++---- .../messages/timeline/TimelineState.kt | 2 +- .../messages/timeline/TimelineView.kt | 2 +- .../timeline/components/html/HtmlDocument.kt | 4 +-- .../diff/MatrixTimelineItemsDiffCallback.kt | 2 +- .../messages/timeline/model/TimelineItem.kt | 2 +- .../model/content/TimelineItemImageContent.kt | 2 +- .../preferences/root/PreferencesRootState.kt | 2 +- .../preferences/user/UserPreferences.kt | 4 +-- .../x/features/roomlist/RoomListNode.kt | 2 +- .../x/features/roomlist/RoomListPresenter.kt | 8 ++--- .../x/features/roomlist/RoomListView.kt | 6 ++-- .../roomlist/components/RoomListTopBar.kt | 2 +- .../roomlist/model/RoomListRoomSummary.kt | 2 +- .../features/roomlist/model/RoomListState.kt | 2 +- .../roomlist/RoomListPresenterTests.kt | 4 +-- libraries/designsystem/build.gradle.kts | 2 +- .../libraries/designsystem/VectorIcons.kt | 4 +-- libraries/matrix/build.gradle.kts | 2 +- .../android/{x => libraries}/matrix/LogTag.kt | 2 +- .../{x => libraries}/matrix/MatrixClient.kt | 14 ++++----- .../matrix/RustMatrixClient.kt | 30 +++++++++---------- .../auth/MatrixAuthenticationService.kt | 6 ++-- .../auth/RustMatrixAuthenticationService.kt | 14 ++++----- .../{x => libraries}/matrix/core/EventId.kt | 2 +- .../matrix/core/MatrixPatterns.kt | 6 ++-- .../{x => libraries}/matrix/core/RoomId.kt | 2 +- .../{x => libraries}/matrix/core/SessionId.kt | 2 +- .../{x => libraries}/matrix/core/UserId.kt | 2 +- .../matrix/di/MatrixModule.kt | 2 +- .../matrix/media/MediaResolver.kt | 2 +- .../matrix/media/RustMediaResolver.kt | 4 +-- .../matrix/permalink/MatrixToConverter.kt | 2 +- .../matrix/permalink/PermalinkData.kt | 2 +- .../matrix/permalink/PermalinkParser.kt | 6 ++-- .../matrix/room/MatrixRoom.kt | 8 ++--- .../matrix/room/RoomListenerFlows.kt | 2 +- .../matrix/room/RoomSummary.kt | 6 ++-- .../matrix/room/RoomSummaryDataSource.kt | 8 ++--- .../matrix/room/RoomSummaryDetailsFactory.kt | 8 ++--- .../matrix/room/RustMatrixRoom.kt | 12 ++++---- .../matrix/room/message/RoomMessage.kt | 8 ++--- .../matrix/room/message/RoomMessageFactory.kt | 8 ++--- .../matrix/session/PreferencesSessionStore.kt | 2 +- .../matrix/session/Session.kt | 4 +-- .../matrix/session/SessionStore.kt | 2 +- .../matrix/sync/SlidingSyncObserverProxy.kt | 2 +- .../matrix/sync/SlidingSyncViewFlows.kt | 6 ++-- .../matrix/timeline/MatrixTimeline.kt | 4 +-- .../matrix/timeline/MatrixTimelineItem.kt | 2 +- .../matrix/timeline/RustMatrixTimeline.kt | 8 ++--- .../matrix/tracing/TracingConfiguration.kt | 2 +- .../matrix/util/CallbackFlow.kt | 2 +- .../{x => libraries}/matrix/util/Error.kt | 2 +- libraries/matrixtest/build.gradle.kts | 2 +- .../libraries/matrixtest/FakeMatrixClient.kt | 22 +++++++------- .../matrixtest/media/FakeMediaResolver.kt | 4 +-- .../matrixtest/room/FakeMatrixRoom.kt | 12 ++++---- .../room/InMemoryRoomSummaryDataSource.kt | 6 ++-- .../matrixtest/timeline/FakeMatrixTimeline.kt | 8 ++--- libraries/matrixui/build.gradle.kts | 2 +- .../matrix/ui/MatrixItemHelper.kt | 12 ++++---- .../matrix/ui/components/MatrixUserHeader.kt | 10 +++---- .../matrix/ui/components/MatrixUserRow.kt | 10 +++---- .../matrix/ui/di/MatrixUIBindings.kt | 6 ++-- .../matrix/ui/media/ImageLoaderFactories.kt | 4 +-- .../matrix/ui/media/MediaFetcher.kt | 8 ++--- .../matrix/ui/media/MediaKeyer.kt | 4 +-- .../matrix/ui/model/MatrixUser.kt | 6 ++-- .../x/textcomposer/MessageComposerMode.kt | 2 +- 87 files changed, 217 insertions(+), 219 deletions(-) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/LogTag.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/MatrixClient.kt (76%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/RustMatrixClient.kt (87%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/auth/MatrixAuthenticationService.kt (86%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/auth/RustMatrixAuthenticationService.kt (89%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/core/EventId.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/core/MatrixPatterns.kt (98%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/core/RoomId.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/core/SessionId.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/core/UserId.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/di/MatrixModule.kt (96%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/media/MediaResolver.kt (95%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/media/RustMediaResolver.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/permalink/MatrixToConverter.kt (97%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/permalink/PermalinkData.kt (96%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/permalink/PermalinkParser.kt (97%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/MatrixRoom.kt (85%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/RoomListenerFlows.kt (96%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/RoomSummary.kt (88%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/RoomSummaryDataSource.kt (97%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/RoomSummaryDetailsFactory.kt (88%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/RustMatrixRoom.kt (92%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/message/RoomMessage.kt (77%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/room/message/RoomMessageFactory.kt (84%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/session/PreferencesSessionStore.kt (98%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/session/Session.kt (86%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/session/SessionStore.kt (94%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/sync/SlidingSyncObserverProxy.kt (97%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/sync/SlidingSyncViewFlows.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/timeline/MatrixTimeline.kt (93%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/timeline/MatrixTimelineItem.kt (96%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/timeline/RustMatrixTimeline.kt (96%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/tracing/TracingConfiguration.kt (97%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/util/CallbackFlow.kt (95%) rename libraries/matrix/src/main/kotlin/io/element/android/{x => libraries}/matrix/util/Error.kt (94%) rename libraries/matrixtest/src/main/kotlin/io/element/android/{x => }/libraries/matrixtest/FakeMatrixClient.kt (72%) rename libraries/matrixtest/src/main/kotlin/io/element/android/{x => }/libraries/matrixtest/media/FakeMediaResolver.kt (88%) rename libraries/matrixtest/src/main/kotlin/io/element/android/{x => }/libraries/matrixtest/room/FakeMatrixRoom.kt (83%) rename libraries/matrixtest/src/main/kotlin/io/element/android/{x => }/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt (83%) rename libraries/matrixtest/src/main/kotlin/io/element/android/{x => }/libraries/matrixtest/timeline/FakeMatrixTimeline.kt (87%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/MatrixItemHelper.kt (87%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/components/MatrixUserHeader.kt (92%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/components/MatrixUserRow.kt (91%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/di/MatrixUIBindings.kt (81%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/media/ImageLoaderFactories.kt (93%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/media/MediaFetcher.kt (88%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/media/MediaKeyer.kt (87%) rename libraries/matrixui/src/main/kotlin/io/element/android/{x => libraries}/matrix/ui/model/MatrixUser.kt (86%) diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 1a52428737..f63a68f922 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -18,7 +18,7 @@ package io.element.android.x.di import com.squareup.anvil.annotations.ContributesTo import io.element.android.libraries.di.AppScope -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.x.root.RootPresenter import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index 35b1c931da..c60eba1575 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt @@ -24,7 +24,7 @@ import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.libraries.di.RoomScope import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SingleIn -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.MatrixRoom @SingleIn(RoomScope::class) @MergeSubcomponent(RoomScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 05c12af80b..be558f6f63 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt @@ -24,7 +24,7 @@ import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SingleIn -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient @SingleIn(SessionScope::class) @MergeSubcomponent(SessionScope::class) 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 bfcdaea612..b6e88590a0 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 @@ -19,8 +19,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.x.matrix.tracing.TracingConfigurations -import io.element.android.x.matrix.tracing.setupTracing +import io.element.android.libraries.matrix.tracing.TracingConfigurations +import io.element.android.libraries.matrix.tracing.setupTracing class MatrixInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 138885870f..65836f3f4c 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -38,10 +38,10 @@ import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.SessionComponent import io.element.android.x.features.preferences.PreferencesFlowNode import io.element.android.x.features.roomlist.RoomListNode -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.ui.di.MatrixUIBindings +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.ui.di.MatrixUIBindings import kotlinx.parcelize.Parcelize class LoggedInFlowNode( diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index ee38296aa9..e4db559128 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -30,7 +30,7 @@ import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.RoomComponent import io.element.android.x.features.messages.MessagesNode -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.MatrixRoom import kotlinx.parcelize.Parcelize import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index d71e193d71..e922b14e7d 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -40,9 +40,9 @@ import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.features.rageshake.bugreport.BugReportNode -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.auth.MatrixAuthenticationService -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.core.SessionId import io.element.android.x.root.RootPresenter import io.element.android.x.root.RootView import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt index 2b010724b5..b1050d59e1 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt @@ -25,7 +25,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.execute -import io.element.android.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt index eda3efcf57..e6a6ec6c9e 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt @@ -23,7 +23,7 @@ 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.x.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index f74b342553..671b58ac32 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -62,7 +62,7 @@ import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.features.login.error.loginError import io.element.android.x.libraries.testtags.TestTags import io.element.android.x.libraries.testtags.testTag -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import io.element.android.x.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt index 4481b3afff..6fc80bcfb6 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.login.root import android.os.Parcelable -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import kotlinx.parcelize.Parcelize data class LoginRootState( diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt index b4fa7e9bd1..f29a687f23 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.rememberCoroutineScope import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.execute -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt index d682133968..50a3e23a0f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt @@ -36,9 +36,9 @@ import io.element.android.x.features.messages.timeline.TimelineEvents import io.element.android.x.features.messages.timeline.TimelinePresenter import io.element.android.x.features.messages.timeline.model.TimelineItem import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.ui.MatrixItemHelper +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.ui.MatrixItemHelper import io.element.android.x.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt index 8d011fc6d2..1e3fea4c67 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt @@ -21,7 +21,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.actionlist.ActionListState import io.element.android.x.features.messages.textcomposer.MessageComposerState import io.element.android.x.features.messages.timeline.TimelineState -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId @Immutable data class MessagesState( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt index 73465e37c3..fc72fef5bb 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -24,7 +24,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.data.StableCharSequence import io.element.android.libraries.core.data.toStableCharSequence -import io.element.android.x.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.x.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt index 733a082d73..31a53849cd 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.messages.timeline -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId sealed interface TimelineEvents { object LoadMore : TimelineEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt index 3bab3ec9a2..9438152e6a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt @@ -33,11 +33,11 @@ import io.element.android.x.features.messages.timeline.model.content.TimelineIte import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextContent import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent import io.element.android.x.features.messages.timeline.util.invalidateLast -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.timeline.MatrixTimelineItem -import io.element.android.x.matrix.ui.MatrixItemHelper +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.ui.MatrixItemHelper import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.MutableStateFlow diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt index 83af2579b2..5844534219 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt @@ -26,12 +26,12 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimelineItem -import io.element.android.x.matrix.ui.MatrixItemHelper +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.ui.MatrixItemHelper import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt index c4ea612334..ec43aa2057 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.messages.timeline import androidx.compose.runtime.Immutable import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt index 4225ec77b3..1ba9c5a19e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt @@ -80,7 +80,7 @@ import io.element.android.x.features.messages.timeline.components.TimelineItemIm import io.element.android.x.features.messages.timeline.components.TimelineItemRedactedView import io.element.android.x.features.messages.timeline.components.TimelineItemTextView import io.element.android.x.features.messages.timeline.components.TimelineItemUnknownView -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt index b9049e55b7..efb22538da 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt @@ -49,8 +49,8 @@ import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow import io.element.android.libraries.designsystem.LinkColor import io.element.android.libraries.designsystem.components.ClickableLinkText -import io.element.android.x.matrix.permalink.PermalinkData -import io.element.android.x.matrix.permalink.PermalinkParser +import io.element.android.libraries.matrix.permalink.PermalinkData +import io.element.android.libraries.matrix.permalink.PermalinkParser import kotlinx.collections.immutable.persistentMapOf import org.jsoup.nodes.Document import org.jsoup.nodes.Element diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt index 45b754043a..1de27134a0 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.messages.timeline.diff import androidx.recyclerview.widget.DiffUtil -import io.element.android.x.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem internal class MatrixTimelineItemsDiffCallback( private val oldList: List, diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt index f274f5c7f9..fba7009f68 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.messages.timeline.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId @Immutable sealed interface TimelineItem { diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt index 25e983d6a4..e361ff11a8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.messages.timeline.model.content -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver data class TimelineItemImageContent( val body: String, diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt index 6541eb8c6d..b813d0a99b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.preferences.root import io.element.android.libraries.architecture.Async import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser data class PreferencesRootState( val logoutState: LogoutPreferenceState, diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt index 93a7db4d7e..24fd0e2292 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt @@ -22,8 +22,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import io.element.android.libraries.architecture.Async -import io.element.android.x.matrix.ui.components.MatrixUserHeader -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.components.MatrixUserHeader +import io.element.android.libraries.matrix.ui.model.MatrixUser @Composable fun UserPreferences( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt index 84ff93680e..3c2c3ae19b 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt @@ -29,7 +29,7 @@ import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.SessionScope -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId @ContributesNode(SessionScope::class) class RoomListNode @AssistedInject constructor( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt index 8d0dea57ce..bf35b48710 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -33,10 +33,10 @@ import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders import io.element.android.x.features.roomlist.model.RoomListState -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt index 046e804691..1bca826ad6 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt @@ -44,9 +44,9 @@ import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.features.roomlist.model.RoomListRoomSummary import io.element.android.x.features.roomlist.model.RoomListState import io.element.android.x.features.roomlist.model.stubbedRoomSummaries -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList @Composable diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt index ea913a30a5..096c00a910 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt @@ -55,7 +55,7 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.avatar.Avatar -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser import io.element.android.x.ui.strings.R as StringR @Composable diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt index 038ffaea47..12a8982989 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.roomlist.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId @Immutable data class RoomListRoomSummary( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt index ce2e679fa0..3b54057b44 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.roomlist.model import androidx.compose.runtime.Immutable -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.collections.immutable.ImmutableList @Immutable diff --git a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt b/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt index cd1b148ce5..658d15beb0 100644 --- a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt +++ b/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt @@ -20,8 +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.x.libraries.matrixtest.FakeMatrixClient -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrixtest.FakeMatrixClient +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts index 597d8a4514..00f635eb69 100644 --- a/libraries/designsystem/build.gradle.kts +++ b/libraries/designsystem/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.libraries.designsystem" + namespace = "io.element.android.libraries.designsystem" dependencies { // Should not be there, but this is a POC diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt index 330da95154..a11b0b96bb 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package io.element.android.libraries.designsystem -import io.element.android.x.libraries.designsystem.R - object VectorIcons { val Copy = R.drawable.ic_content_copy val ArrowForward = R.drawable.ic_content_arrow_forward diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts index 56f33523a7..fcf2c78eea 100644 --- a/libraries/matrix/build.gradle.kts +++ b/libraries/matrix/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.matrix" + namespace = "io.element.android.libraries.matrix" } anvil { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt index b48137013e..85c1e6010e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/LogTag.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/LogTag.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix internal const val LOG_TAG = "Matrix" diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt similarity index 76% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt index d0d446909b..1d3fc62ff7 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/MatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/MatrixClient.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource +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.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import org.matrix.rustcomponents.sdk.MediaSource import java.io.Closeable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt similarity index 87% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index 90efb11482..64b1cb4e34 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,22 +14,22 @@ * limitations under the License. */ -package io.element.android.x.matrix +package io.element.android.libraries.matrix import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.media.RustMediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource -import io.element.android.x.matrix.room.RustMatrixRoom -import io.element.android.x.matrix.room.RustRoomSummaryDataSource -import io.element.android.x.matrix.session.PreferencesSessionStore -import io.element.android.x.matrix.session.SessionStore -import io.element.android.x.matrix.session.sessionId -import io.element.android.x.matrix.sync.SlidingSyncObserverProxy +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.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.RustMediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.room.RustMatrixRoom +import io.element.android.libraries.matrix.room.RustRoomSummaryDataSource +import io.element.android.libraries.matrix.session.PreferencesSessionStore +import io.element.android.libraries.matrix.session.SessionStore +import io.element.android.libraries.matrix.session.sessionId +import io.element.android.libraries.matrix.sync.SlidingSyncObserverProxy import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.withContext import org.matrix.rustcomponents.sdk.Client diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt index f353a4d789..122c079971 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/MatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.auth +package io.element.android.libraries.matrix.auth -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.flow.Flow interface MatrixAuthenticationService { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt similarity index 89% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt index daebb759f8..d0d115123f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.element.android.x.matrix.auth +package io.element.android.libraries.matrix.auth import com.squareup.anvil.annotations.ContributesBinding import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.di.AppScope -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.RustMatrixClient -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.session.SessionStore -import io.element.android.x.matrix.session.sessionId -import io.element.android.x.matrix.util.logError +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.RustMatrixClient +import io.element.android.libraries.matrix.core.SessionId +import io.element.android.libraries.matrix.session.SessionStore +import io.element.android.libraries.matrix.session.sessionId +import io.element.android.libraries.matrix.util.logError import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt index 77460d5b86..7ad4235e5e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/EventId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/EventId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt similarity index 98% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt index c6a4ae4dcd..b2043d216b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/MatrixPatterns.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/MatrixPatterns.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core -import io.element.android.x.matrix.BuildConfig +import io.element.android.libraries.matrix.BuildConfig import timber.log.Timber /** diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt index db166d57a0..1a50c6a83a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/RoomId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/RoomId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt index d75f4c15a7..bf1ce0c04b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/SessionId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/SessionId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt index 685d4627ef..63f2c85216 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/core/UserId.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/core/UserId.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.core +package io.element.android.libraries.matrix.core import java.io.Serializable diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt index 2a4516aa37..9b0583d2d1 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/di/MatrixModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.di +package io.element.android.libraries.matrix.di import com.squareup.anvil.annotations.ContributesTo import dagger.Module diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt index 0fb796a421..aad5d11d58 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/MediaResolver.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/MediaResolver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.media +package io.element.android.libraries.matrix.media import org.matrix.rustcomponents.sdk.MediaSource diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt index f8c1ca3868..1b1eaf7bc9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/media/RustMediaResolver.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/media/RustMediaResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.media +package io.element.android.libraries.matrix.media -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import org.matrix.rustcomponents.sdk.mediaSourceFromUrl internal class RustMediaResolver(private val client: MatrixClient) : MediaResolver { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt index 8b0468277e..8ef0bbcd08 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/MatrixToConverter.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/MatrixToConverter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt index e1c489331e..b5f8b7fd92 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkData.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt index a69d71516c..411ba1576f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/permalink/PermalinkParser.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/permalink/PermalinkParser.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.permalink +package io.element.android.libraries.matrix.permalink import android.net.Uri import android.net.UrlQuerySanitizer -import io.element.android.x.matrix.core.MatrixPatterns +import io.element.android.libraries.matrix.core.MatrixPatterns import java.net.URLDecoder import timber.log.Timber diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt similarity index 85% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt index f2ecdb2b70..06c1fa0f76 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/MatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/MatrixRoom.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.timeline.MatrixTimeline import kotlinx.coroutines.flow.Flow interface MatrixRoom { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt index 2fc0a23a21..e307bf0dad 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomListenerFlows.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomListenerFlows.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt index 56e479e1d5..8b922b322d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummary.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummary.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.RoomId +import io.element.android.libraries.matrix.core.RoomId sealed interface RoomSummary { data class Empty(val identifier: String) : RoomSummary diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt index 249e600c09..25f1af2269 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDataSource.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDataSource.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.sync.roomListDiff -import io.element.android.x.matrix.sync.state +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 diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt similarity index 88% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt index 93202ef742..d295f9848e 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RoomSummaryDetailsFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RoomSummaryDetailsFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.room.message.RoomMessageFactory +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.room.message.RoomMessageFactory import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.SlidingSyncRoom diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt similarity index 92% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt index 21c48fbcf9..c481b7c3d5 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/RustMatrixRoom.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/RustMatrixRoom.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.room +package io.element.android.libraries.matrix.room import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.RustMatrixTimeline +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.RoomId +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.RustMatrixTimeline import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt similarity index 77% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt index da9e097540..3bfe5b5edb 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessage.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessage.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room.message +package io.element.android.libraries.matrix.room.message -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.UserId data class RoomMessage( val eventId: EventId, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt similarity index 84% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt index 318e429070..348551835d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/room/message/RoomMessageFactory.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/room/message/RoomMessageFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.matrix.room.message +package io.element.android.libraries.matrix.room.message -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.core.UserId import org.matrix.rustcomponents.sdk.EventTimelineItem class RoomMessageFactory { diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt similarity index 98% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt index 9b18cb25b4..02241bc0f9 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session import android.content.Context import androidx.datastore.core.DataStore diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt similarity index 86% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt index 53b69ce975..a1943f273c 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/Session.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/Session.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session -import io.element.android.x.matrix.core.SessionId +import io.element.android.libraries.matrix.core.SessionId import org.matrix.rustcomponents.sdk.Session fun Session.sessionId() = SessionId("${userId}_${deviceId}") diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt index 4380518ce9..07c40ab54a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/SessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.session +package io.element.android.libraries.matrix.session import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.Session diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt index f10ff0e12d..5774e23cb4 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncObserverProxy.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.sync +package io.element.android.libraries.matrix.sync import io.element.android.libraries.core.coroutine.CoroutineDispatchers import kotlinx.coroutines.CoroutineScope diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt index 0fed5ee936..a3d323b8d0 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncViewFlows.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.sync +package io.element.android.libraries.matrix.sync -import io.element.android.x.matrix.util.mxCallbackFlow +import io.element.android.libraries.matrix.util.mxCallbackFlow import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt similarity index 93% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt index 2f383cebf2..67ab8969b3 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimeline.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.TimelineListener diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt index 365319d803..022988fd4f 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/MatrixTimelineItem.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/MatrixTimelineItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline import org.matrix.rustcomponents.sdk.EventTimelineItem import org.matrix.rustcomponents.sdk.TimelineItem diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt similarity index 96% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt index bfb4bdf3f2..1f6722d823 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/timeline/RustMatrixTimeline.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/timeline/RustMatrixTimeline.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.timeline +package io.element.android.libraries.matrix.timeline import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.room.RustMatrixRoom +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.room.RustMatrixRoom import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt similarity index 97% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt index e73449c43f..9c7dc1632d 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/tracing/TracingConfiguration.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/tracing/TracingConfiguration.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.tracing +package io.element.android.libraries.matrix.tracing data class TracingConfiguration( val common: LogLevel = LogLevel.Warn, diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt similarity index 95% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt index 8625325cab..3b82cc2489 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/CallbackFlow.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/CallbackFlow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.util +package io.element.android.libraries.matrix.util import kotlinx.coroutines.channels.ProducerScope import kotlinx.coroutines.channels.awaitClose diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt similarity index 94% rename from libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt rename to libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt index a2d1720041..d480262f81 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/util/Error.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/util/Error.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.util +package io.element.android.libraries.matrix.util import org.matrix.rustcomponents.sdk.ClientException import timber.log.Timber diff --git a/libraries/matrixtest/build.gradle.kts b/libraries/matrixtest/build.gradle.kts index f4ba43aaac..5bb1e92df3 100644 --- a/libraries/matrixtest/build.gradle.kts +++ b/libraries/matrixtest/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } android { - namespace = "io.element.android.x.libraries.matrix.test" + namespace = "io.element.android.libraries.matrix.test" } dependencies { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt similarity index 72% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt index 5e55b6dc79..fb2a1b2341 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/FakeMatrixClient.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest +package io.element.android.libraries.matrixtest -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.core.SessionId -import io.element.android.x.matrix.core.UserId -import io.element.android.x.libraries.matrixtest.media.FakeMediaResolver -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.libraries.matrixtest.room.FakeMatrixRoom -import io.element.android.x.libraries.matrixtest.room.InMemoryRoomSummaryDataSource -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummaryDataSource +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 org.matrix.rustcomponents.sdk.MediaSource class FakeMatrixClient(override val sessionId: SessionId) : MatrixClient { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt similarity index 88% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt index 07fc24c468..ef171e5a09 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/media/FakeMediaResolver.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.media +package io.element.android.libraries.matrixtest.media -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver class FakeMediaResolver : MediaResolver { override suspend fun resolve(url: String?, kind: MediaResolver.Kind): ByteArray? { diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt similarity index 83% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt index fca74a59d9..254f460f25 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/FakeMatrixRoom.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.room +package io.element.android.libraries.matrixtest.room -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.core.RoomId -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.libraries.matrixtest.timeline.FakeMatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimeline +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 kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt similarity index 83% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt index eaa75e1448..cb4f002859 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/InMemoryRoomSummaryDataSource.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.room +package io.element.android.libraries.matrixtest.room -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.room.RoomSummaryDataSource +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.room.RoomSummaryDataSource import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt similarity index 87% rename from libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt rename to libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt index 27443bde6f..60fa211b1d 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/x/libraries/matrixtest/timeline/FakeMatrixTimeline.kt +++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.libraries.matrixtest.timeline +package io.element.android.libraries.matrixtest.timeline -import io.element.android.x.matrix.core.EventId -import io.element.android.x.matrix.timeline.MatrixTimeline -import io.element.android.x.matrix.timeline.MatrixTimelineItem +import io.element.android.libraries.matrix.core.EventId +import io.element.android.libraries.matrix.timeline.MatrixTimeline +import io.element.android.libraries.matrix.timeline.MatrixTimelineItem import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import org.matrix.rustcomponents.sdk.TimelineListener diff --git a/libraries/matrixui/build.gradle.kts b/libraries/matrixui/build.gradle.kts index 9e32aea0a8..2187a36b07 100644 --- a/libraries/matrixui/build.gradle.kts +++ b/libraries/matrixui/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.matrix.ui" + namespace = "io.element.android.libraries.matrix.ui" } anvil { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt similarity index 87% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt index a5f06d8f54..d1060bd39a 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/MatrixItemHelper.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/MatrixItemHelper.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui +package io.element.android.libraries.matrix.ui import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver -import io.element.android.x.matrix.room.MatrixRoom -import io.element.android.x.matrix.room.RoomSummary -import io.element.android.x.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver +import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.room.RoomSummary +import io.element.android.libraries.matrix.ui.model.MatrixUser import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt similarity index 92% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt index 91e4f04609..ca4ffb247b 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.components +package io.element.android.libraries.matrix.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -36,9 +36,9 @@ 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.libraries.designsystem.components.avatar.AvatarSize -import io.element.android.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.matrix.ui.model.getBestName +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.getBestName @Composable fun MatrixUserHeader( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt similarity index 91% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt index b98275ba2d..1a9b7e0c18 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.components +package io.element.android.libraries.matrix.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -35,9 +35,9 @@ 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.x.matrix.core.UserId -import io.element.android.x.matrix.ui.model.MatrixUser -import io.element.android.x.matrix.ui.model.getBestName +import io.element.android.libraries.matrix.core.UserId +import io.element.android.libraries.matrix.ui.model.MatrixUser +import io.element.android.libraries.matrix.ui.model.getBestName @Composable fun MatrixUserRow( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt similarity index 81% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt index 4502c4dc94..a5734f5b9c 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/di/MatrixUIBindings.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.di +package io.element.android.libraries.matrix.ui.di import com.squareup.anvil.annotations.ContributesTo import io.element.android.libraries.di.SessionScope -import io.element.android.x.matrix.ui.media.LoggedInImageLoaderFactory -import io.element.android.x.matrix.ui.media.NotLoggedInImageLoaderFactory +import io.element.android.libraries.matrix.ui.media.LoggedInImageLoaderFactory +import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactory @ContributesTo(SessionScope::class) interface MatrixUIBindings { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt similarity index 93% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt index 655b909db5..19f84f4393 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import android.content.Context import coil.ImageLoader import coil.ImageLoaderFactory import io.element.android.libraries.di.ApplicationContext -import io.element.android.x.matrix.MatrixClient +import io.element.android.libraries.matrix.MatrixClient import javax.inject.Inject class LoggedInImageLoaderFactory @Inject constructor( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt similarity index 88% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt index a443f7486d..dc90947a87 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaFetcher.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import coil.ImageLoader import coil.fetch.FetchResult import coil.fetch.Fetcher import coil.request.Options -import io.element.android.x.matrix.MatrixClient -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.media.MediaResolver import java.nio.ByteBuffer internal class MediaFetcher( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt similarity index 87% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt index 0831f6815e..1ce5390fc9 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/MediaKeyer.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.media +package io.element.android.libraries.matrix.ui.media import coil.key.Keyer import coil.request.Options -import io.element.android.x.matrix.media.MediaResolver +import io.element.android.libraries.matrix.media.MediaResolver internal class MediaKeyer : Keyer { override fun key(data: MediaResolver.Meta, options: Options): String? { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt similarity index 86% rename from libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt index 09ca3b46c7..3d673628ff 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/model/MatrixUser.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.matrix.ui.model +package io.element.android.libraries.matrix.ui.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.matrix.core.UserId +import io.element.android.libraries.matrix.core.UserId @Immutable data class MatrixUser( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt index 715b9c6cd6..39c601a2d4 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt @@ -17,7 +17,7 @@ package io.element.android.x.textcomposer import android.os.Parcelable -import io.element.android.x.matrix.core.EventId +import io.element.android.libraries.matrix.core.EventId import kotlinx.parcelize.Parcelize sealed interface MessageComposerMode : Parcelable { From c2177beb139caa0ff34cad7c2d476304fbe31a4d Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:30:35 +0100 Subject: [PATCH 11/61] Rename testtags module --- .../android/x/features/login/changeserver/ChangeServerView.kt | 4 ++-- .../element/android/x/features/login/root/LoginRootScreen.kt | 4 ++-- .../element/android/x/features/onboarding/OnBoardingScreen.kt | 4 ++-- libraries/testtags/build.gradle.kts | 2 +- .../io/element/android/{x => }/libraries/testtags/Compose.kt | 3 ++- .../io/element/android/{x => }/libraries/testtags/TestTags.kt | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) rename libraries/testtags/src/main/kotlin/io/element/android/{x => }/libraries/testtags/Compose.kt (91%) rename libraries/testtags/src/main/kotlin/io/element/android/{x => }/libraries/testtags/TestTags.kt (96%) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 56d54b44d7..8e7a98f919 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -57,8 +57,8 @@ import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +import io.element.android.libraries.testtags.TestTags +import io.element.android.libraries.testtags.testTag @Composable fun ChangeServerView( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index 671b58ac32..306fc593c2 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -60,8 +60,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.features.login.error.loginError -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +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.x.ui.strings.R as StringR diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt index 634ce740be..8af5c68c3c 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -50,8 +50,8 @@ import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState import io.element.android.libraries.designsystem.components.VectorButton -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +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.x.ui.strings.R as StringR diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts index 21e6f2a384..88ad19677c 100644 --- a/libraries/testtags/build.gradle.kts +++ b/libraries/testtags/build.gradle.kts @@ -19,5 +19,5 @@ plugins { } android { - namespace = "io.element.android.x.libraries.testtags" + namespace = "io.element.android.libraries.testtags" } diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt similarity index 91% rename from libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt rename to libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt index 5d75a31674..5a2d8fee19 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt @@ -14,13 +14,14 @@ * limitations under the License. */ -package io.element.android.x.libraries.testtags +package io.element.android.libraries.testtags import androidx.compose.ui.ExperimentalComposeUiApi 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/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt similarity index 96% rename from libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt rename to libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt index 1e96c61373..a254a636ef 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.libraries.testtags +package io.element.android.libraries.testtags @JvmInline value class TestTag internal constructor(val value: String) From 465b74e177ea300fca4d156bf6417a6c292e9d42 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:38:04 +0100 Subject: [PATCH 12/61] Rename textcomposer module --- .../android/x/features/messages/MessagesPresenter.kt | 2 +- .../messages/textcomposer/MessageComposerEvents.kt | 2 +- .../messages/textcomposer/MessageComposerPresenter.kt | 2 +- .../messages/textcomposer/MessageComposerState.kt | 2 +- .../messages/textcomposer/MessageComposerView.kt | 2 +- libraries/textcomposer/build.gradle.kts | 2 +- .../textcomposer/MessageComposerMode.kt | 4 ++-- .../textcomposer/MessageComposerView.kt | 4 ++-- .../textcomposer/RichTextComposerLayout.kt | 10 +++++----- .../{x => libraries}/textcomposer/TextComposer.kt | 4 ++-- .../textcomposer/tools/EditTextExtensions.kt | 4 ++-- .../textcomposer/tools/SimpleTransitionListener.kt | 2 +- .../textcomposer/tools/ViewExtensions.kt | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/MessageComposerMode.kt (94%) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/MessageComposerView.kt (94%) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/RichTextComposerLayout.kt (98%) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/TextComposer.kt (98%) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/tools/EditTextExtensions.kt (94%) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/tools/SimpleTransitionListener.kt (95%) rename libraries/textcomposer/src/main/kotlin/io/element/android/{x => libraries}/textcomposer/tools/ViewExtensions.kt (93%) diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt index 50a3e23a0f..7b9368e2b3 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt @@ -39,7 +39,7 @@ import io.element.android.x.features.messages.timeline.model.content.TimelineIte import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.ui.MatrixItemHelper -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt index 8e4e3ffddd..7272f29969 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt @@ -16,7 +16,7 @@ package io.element.android.x.features.messages.textcomposer -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.textcomposer.MessageComposerMode sealed interface MessageComposerEvents { object ToggleFullScreenState : MessageComposerEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt index fc72fef5bb..2d1e5401bd 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -25,7 +25,7 @@ import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.data.StableCharSequence import io.element.android.libraries.core.data.toStableCharSequence import io.element.android.libraries.matrix.room.MatrixRoom -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.textcomposer.MessageComposerMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt index 6bca89b333..396b3c4f19 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt @@ -18,7 +18,7 @@ package io.element.android.x.features.messages.textcomposer import androidx.compose.runtime.Immutable import io.element.android.libraries.core.data.StableCharSequence -import io.element.android.x.textcomposer.MessageComposerMode +import io.element.android.libraries.textcomposer.MessageComposerMode @Immutable data class MessageComposerState( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt index 0077cb8e19..5acfd7d954 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import io.element.android.libraries.designsystem.LocalIsDarkTheme -import io.element.android.x.textcomposer.TextComposer +import io.element.android.libraries.textcomposer.TextComposer @Composable fun MessageComposerView( diff --git a/libraries/textcomposer/build.gradle.kts b/libraries/textcomposer/build.gradle.kts index 41cc543ba2..5e84aca979 100644 --- a/libraries/textcomposer/build.gradle.kts +++ b/libraries/textcomposer/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.textcomposer" + namespace = "io.element.android.libraries.textcomposer" buildFeatures { viewBinding = true } diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerMode.kt similarity index 94% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerMode.kt index 39c601a2d4..fed8265656 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerMode.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerMode.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.os.Parcelable import io.element.android.libraries.matrix.core.EventId diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerView.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerView.kt similarity index 94% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerView.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerView.kt index 8592ec1809..d646a09ffc 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/MessageComposerView.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerView.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.net.Uri import android.text.Editable diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt similarity index 98% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index 27a0fc1b24..fbad3680ca 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.annotation.SuppressLint import android.content.Context @@ -45,9 +45,9 @@ import io.element.android.wysiwyg.inputhandlers.models.InlineFormat import io.element.android.libraries.core.ui.DimensionConverter import io.element.android.libraries.core.ui.hideKeyboard import io.element.android.libraries.core.ui.showKeyboard -import io.element.android.x.textcomposer.databinding.ComposerRichTextLayoutBinding -import io.element.android.x.textcomposer.databinding.ViewRichTextMenuButtonBinding -import io.element.android.x.textcomposer.tools.setTextIfDifferent +import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLayoutBinding +import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuButtonBinding +import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction import io.element.android.x.element.resources.R as ElementR diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt similarity index 98% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index 6dbc649acb..6d40cdaa5f 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer +package io.element.android.libraries.textcomposer import android.graphics.Color import android.net.Uri diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/EditTextExtensions.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/EditTextExtensions.kt similarity index 94% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/EditTextExtensions.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/EditTextExtensions.kt index d429385a9a..03d501f258 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/EditTextExtensions.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/EditTextExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer.tools +package io.element.android.libraries.textcomposer.tools import android.text.Spanned import android.widget.EditText diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/SimpleTransitionListener.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/SimpleTransitionListener.kt similarity index 95% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/SimpleTransitionListener.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/SimpleTransitionListener.kt index e165f18dc7..0aab1bdb6a 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/SimpleTransitionListener.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/SimpleTransitionListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer.tools +package io.element.android.libraries.textcomposer.tools import androidx.transition.Transition diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/ViewExtensions.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/ViewExtensions.kt similarity index 93% rename from libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/ViewExtensions.kt rename to libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/ViewExtensions.kt index 94b1e4613e..8f1a1aacca 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/tools/ViewExtensions.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/tools/ViewExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.textcomposer.tools +package io.element.android.libraries.textcomposer.tools import android.view.ViewGroup import androidx.transition.ChangeBounds From d7b4cb97a7fbf757c7934537b8fe0cc4c9b7e24c Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:42:09 +0100 Subject: [PATCH 13/61] Rename uistrings module --- .../io/element/android/x/features/login/error/ErrorFormatter.kt | 2 +- .../io/element/android/x/features/login/root/LoginRootScreen.kt | 2 +- .../element/android/x/features/logout/LogoutPreferenceScreen.kt | 2 +- .../element/android/x/features/onboarding/OnBoardingScreen.kt | 2 +- .../android/x/features/onboarding/SplashCarouselStateFactory.kt | 2 +- .../android/x/features/preferences/root/PreferencesRootView.kt | 2 +- .../android/x/features/rageshake/bugreport/BugReportView.kt | 2 +- .../x/features/rageshake/crash/ui/CrashDetectionScreen.kt | 2 +- .../x/features/rageshake/detection/RageshakeDetectionView.kt | 2 +- .../features/rageshake/preferences/RageshakePreferencesView.kt | 2 +- .../android/x/features/roomlist/components/RoomListTopBar.kt | 2 +- .../designsystem/components/dialogs/ConfirmationDialog.kt | 2 +- .../libraries/designsystem/components/dialogs/ErrorDialog.kt | 2 +- .../android/libraries/textcomposer/RichTextComposerLayout.kt | 2 +- .../io/element/android/libraries/textcomposer/TextComposer.kt | 2 +- libraries/ui-strings/build.gradle.kts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt index f708f712a6..eb90f40936 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt @@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import io.element.android.libraries.core.uri.isValidUrl import io.element.android.x.features.login.root.LoginFormState -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun loginError( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index 306fc593c2..31030f56f1 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -63,7 +63,7 @@ import io.element.android.x.features.login.error.loginError 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.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt index 147e890200..e7bc9d3f7f 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt @@ -29,7 +29,7 @@ import io.element.android.libraries.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory import io.element.android.libraries.designsystem.components.preferences.PreferenceText -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun LogoutPreferenceView( diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt index 8af5c68c3c..be5b4f646a 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -54,7 +54,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.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalPagerApi::class) @Composable diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt index c25fb89815..681eb09466 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.onboarding import androidx.annotation.DrawableRes -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR class SplashCarouselStateFactory { fun create(): SplashCarouselState { diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt index d632c1cf87..c467aa15bb 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt @@ -27,7 +27,7 @@ import io.element.android.x.features.logout.LogoutPreferenceView import io.element.android.x.features.preferences.user.UserPreferences import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun PreferencesRootView( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt index 51ec736ffd..945661d6b0 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt @@ -55,7 +55,7 @@ import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.LabelledCheckbox import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt index 578f0eb877..bcde245e0a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun CrashDetectionView( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt index f2d208e359..e376d7cbcf 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt @@ -29,7 +29,7 @@ import io.element.android.libraries.core.hardware.vibrate import io.element.android.libraries.core.screenshot.ImageResult import io.element.android.libraries.core.screenshot.screenshot import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RageshakeDetectionView( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt index 83e95a52d9..d1c9c201f2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt @@ -27,7 +27,7 @@ import io.element.android.libraries.designsystem.components.preferences.Preferen import io.element.android.libraries.designsystem.components.preferences.PreferenceSlide import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch import io.element.android.libraries.designsystem.components.preferences.PreferenceText -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RageshakePreferencesView( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt index 096c00a910..79f14fd3f8 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt @@ -56,7 +56,7 @@ import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.matrix.ui.model.MatrixUser -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RoomListTopBar( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt index e5e793a703..6059b6b998 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun ConfirmationDialog( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt index 22f8624dad..99e473fdbd 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun ErrorDialog( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index fbad3680ca..f58e0634eb 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -51,7 +51,7 @@ import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction import io.element.android.x.element.resources.R as ElementR -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR // Imported from Element Android class RichTextComposerLayout @JvmOverloads constructor( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index 6d40cdaa5f..930b5d6f77 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.view.isInvisible import androidx.core.view.isVisible -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun TextComposer( diff --git a/libraries/ui-strings/build.gradle.kts b/libraries/ui-strings/build.gradle.kts index dc4693ad7f..33dc7d6ba6 100644 --- a/libraries/ui-strings/build.gradle.kts +++ b/libraries/ui-strings/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.ui.strings" + namespace = "io.element.android.libraries.ui.strings" } // forcing the stem string template generator to be cacheable, without this the templates From 6cc38c9c49a4dd3a3f90b33532756a050efe043a Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:51:52 +0100 Subject: [PATCH 14/61] Rename tests/uitest modules --- app/src/main/kotlin/io/element/android/x/root/RootView.kt | 2 +- tests/uitests/build.gradle.kts | 2 +- .../{x => }/tests/uitests/ElementXShowkaseRootModule.kt | 2 +- .../element/android/{x => }/tests/uitests/ShowkaseButton.kt | 4 ++-- .../android/{x => }/tests/uitests/ShowkaseNavigation.kt | 2 +- .../io/element/android/x/tests/uitests/ScreenshotTest.kt | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) rename tests/uitests/src/main/kotlin/io/element/android/{x => }/tests/uitests/ElementXShowkaseRootModule.kt (94%) rename tests/uitests/src/main/kotlin/io/element/android/{x => }/tests/uitests/ShowkaseButton.kt (96%) rename tests/uitests/src/main/kotlin/io/element/android/{x => }/tests/uitests/ShowkaseNavigation.kt (94%) 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 b767fb164f..534f7edfda 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 @@ -29,7 +29,7 @@ import io.element.android.x.features.rageshake.crash.ui.CrashDetectionEvents import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents import io.element.android.x.features.rageshake.detection.RageshakeDetectionView -import io.element.android.x.tests.uitests.openShowkase +import io.element.android.tests.uitests.openShowkase @Composable fun RootView( diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts index e8f2ca47ad..6d970e34b0 100644 --- a/tests/uitests/build.gradle.kts +++ b/tests/uitests/build.gradle.kts @@ -26,7 +26,7 @@ plugins { } android { - namespace = "io.element.android.x.tests.uitests" + namespace = "io.element.android.tests.uitests" } dependencies { diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt similarity index 94% rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt index 6250bcaba8..0c3fab67eb 100644 --- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt +++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import com.airbnb.android.showkase.annotation.ShowkaseRoot import com.airbnb.android.showkase.annotation.ShowkaseRootModule diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt similarity index 96% rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt index ba8f111f13..9ae1b78577 100644 --- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt +++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt similarity index 94% rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt index 4ed7328ad3..bf252a1755 100644 --- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt +++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import android.app.Activity import com.airbnb.android.showkase.models.Showkase diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt index 994b65675a..e05cb7c971 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt @@ -37,6 +37,7 @@ import com.airbnb.android.showkase.models.Showkase import com.google.testing.junit.testparameterinjector.TestParameter import com.google.testing.junit.testparameterinjector.TestParameterInjector import io.element.android.libraries.designsystem.ElementXTheme +import io.element.android.libraries.tests.uitests.getMetadata import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith From f800e22477b230adf1a3be82c91b0ed2f7875804 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 18:35:03 +0100 Subject: [PATCH 15/61] Rename all features modules --- .../android/x/initializer/CrashInitializer.kt | 2 +- .../x/initializer/TimberInitializer.kt | 2 +- .../android/x/node/LoggedInFlowNode.kt | 4 +- .../android/x/node/NotLoggedInFlowNode.kt | 4 +- .../io/element/android/x/node/RoomFlowNode.kt | 2 +- .../io/element/android/x/node/RootFlowNode.kt | 2 +- .../element/android/x/root/RootPresenter.kt | 6 +-- .../io/element/android/x/root/RootState.kt | 6 +-- .../io/element/android/x/root/RootView.kt | 8 ++-- features/login/build.gradle.kts | 2 +- .../features/login/ExampleInstrumentedTest.kt | 2 +- .../{x => }/features/login/LoginFlowNode.kt | 6 +-- .../login/changeserver/ChangeServerEvents.kt | 2 +- .../login/changeserver/ChangeServerNode.kt | 2 +- .../changeserver/ChangeServerPresenter.kt | 2 +- .../login/changeserver/ChangeServerState.kt | 2 +- .../login/changeserver/ChangeServerView.kt | 6 +-- .../features/login/error/ErrorFormatter.kt | 4 +- .../features/login/root/LoginRootEvents.kt | 2 +- .../features/login/root/LoginRootNode.kt | 2 +- .../features/login/root/LoginRootPresenter.kt | 2 +- .../features/login/root/LoginRootScreen.kt | 4 +- .../features/login/root/LoginRootState.kt | 2 +- .../features/login/ExampleUnitTest.kt | 2 +- features/logout/build.gradle.kts | 2 +- .../logout}/ExampleInstrumentedTest.kt | 2 +- .../features/logout/LogoutPreferenceEvents.kt | 2 +- .../logout/LogoutPreferencePresenter.kt | 2 +- .../features/logout/LogoutPreferenceScreen.kt | 2 +- .../features/logout/LogoutPreferenceState.kt | 2 +- .../features/logout}/ExampleUnitTest.kt | 2 +- features/messages/build.gradle.kts | 2 +- .../messages/ExampleInstrumentedTest.kt | 2 +- .../features/messages/MessagesEvents.kt | 6 +-- .../{x => }/features/messages/MessagesNode.kt | 2 +- .../features/messages/MessagesPresenter.kt | 20 +++++----- .../features/messages/MessagesState.kt | 8 ++-- .../{x => }/features/messages/MessagesView.kt | 14 +++---- .../messages/actionlist/ActionListEvents.kt | 4 +- .../actionlist/ActionListPresenter.kt | 8 ++-- .../messages/actionlist/ActionListState.kt | 6 +-- .../messages/actionlist/ActionListView.kt | 6 +-- .../actionlist/model/TimelineItemAction.kt | 2 +- .../textcomposer/MessageComposerEvents.kt | 2 +- .../textcomposer/MessageComposerPresenter.kt | 2 +- .../textcomposer/MessageComposerState.kt | 2 +- .../textcomposer/MessageComposerView.kt | 2 +- .../messages/timeline/TimelineEvents.kt | 2 +- .../messages/timeline/TimelineItemsFactory.kt | 32 +++++++-------- .../messages/timeline/TimelinePresenter.kt | 2 +- .../messages/timeline/TimelineState.kt | 4 +- .../messages/timeline/TimelineView.kt | 40 +++++++++---------- .../timeline/components/MessageEventBubble.kt | 4 +- .../components/TimelineItemEncryptedView.kt | 4 +- .../components/TimelineItemImageView.kt | 4 +- .../components/TimelineItemInformativeView.kt | 2 +- .../components/TimelineItemReactionsView.kt | 6 +-- .../components/TimelineItemRedactedView.kt | 4 +- .../components/TimelineItemTextView.kt | 6 +-- .../components/TimelineItemUnknownView.kt | 4 +- .../timeline/components/html/HtmlDocument.kt | 2 +- .../timeline/diff/CacheInvalidator.kt | 6 +-- .../diff/MatrixTimelineItemsDiffCallback.kt | 2 +- .../messages/timeline/model/TimelineItem.kt | 4 +- .../model/TimelineItemGroupPosition.kt | 2 +- .../timeline/model/TimelineItemReactions.kt | 2 +- .../model/content/TimelineItemContent.kt | 2 +- .../model/content/TimelineItemEmoteContent.kt | 2 +- .../content/TimelineItemEncryptedContent.kt | 2 +- .../model/content/TimelineItemImageContent.kt | 2 +- .../content/TimelineItemNoticeContent.kt | 2 +- .../content/TimelineItemRedactedContent.kt | 2 +- .../content/TimelineItemTextBasedContent.kt | 2 +- .../model/content/TimelineItemTextContent.kt | 2 +- .../content/TimelineItemUnknownContent.kt | 2 +- .../messages/timeline/util/MutableListExt.kt | 2 +- .../features/messages}/ExampleUnitTest.kt | 2 +- features/onboarding/build.gradle.kts | 2 +- .../login}/ExampleInstrumentedTest.kt | 2 +- .../features/onboarding/OnBoardingScreen.kt | 2 +- .../onboarding/SplashCarouselState.kt | 2 +- .../onboarding/SplashCarouselStateFactory.kt | 2 +- .../features/login/ExampleUnitTest.kt | 2 +- features/preferences/build.gradle.kts | 2 +- .../preferences/ExampleInstrumentedTest.kt | 2 +- .../preferences/PreferencesFlowNode.kt | 4 +- .../preferences/root/PreferencesRootNode.kt | 2 +- .../root/PreferencesRootPresenter.kt | 6 +-- .../preferences/root/PreferencesRootState.kt | 6 +-- .../preferences/root/PreferencesRootView.kt | 12 +++--- .../preferences/user/UserPreferences.kt | 2 +- .../features/preferences}/ExampleUnitTest.kt | 2 +- .../x/features/preferences/ExampleUnitTest.kt | 32 --------------- features/rageshake/build.gradle.kts | 2 +- .../rageshake/bugreport/BugReportEvents.kt | 2 +- .../rageshake/bugreport/BugReportNode.kt | 2 +- .../rageshake/bugreport/BugReportPresenter.kt | 12 +++--- .../rageshake/bugreport/BugReportState.kt | 2 +- .../rageshake/bugreport/BugReportView.kt | 2 +- .../rageshake/crash/CrashDataStore.kt | 2 +- .../crash/VectorUncaughtExceptionHandler.kt | 2 +- .../crash/ui/CrashDetectionEvents.kt | 2 +- .../crash/ui/CrashDetectionPresenter.kt | 4 +- .../crash/ui/CrashDetectionScreen.kt | 2 +- .../rageshake/crash/ui/CrashDetectionState.kt | 2 +- .../detection/RageshakeDetectionEvents.kt | 2 +- .../detection/RageshakeDetectionPresenter.kt | 10 ++--- .../detection/RageshakeDetectionState.kt | 4 +- .../detection/RageshakeDetectionView.kt | 2 +- .../features/rageshake/logs/LogFormatter.kt | 2 +- .../rageshake/logs/VectorFileLogger.kt | 2 +- .../preferences/RageshakePreferencesEvents.kt | 2 +- .../RageshakePreferencesPresenter.kt | 6 +-- .../preferences/RageshakePreferencesState.kt | 2 +- .../preferences/RageshakePreferencesView.kt | 2 +- .../features/rageshake/rageshake/RageShake.kt | 2 +- .../rageshake/rageshake/RageshakeDataStore.kt | 2 +- .../rageshake/reporter/BugReporter.kt | 10 ++--- .../reporter/BugReporterMultipartBody.java | 2 +- .../features/rageshake/reporter/ReportType.kt | 2 +- .../rageshake/screenshot/ScreenshotHolder.kt | 2 +- .../android/features/login/ExampleUnitTest.kt | 32 +++++++++++++++ features/roomlist/build.gradle.kts | 2 +- .../roomlist/ExampleInstrumentedTest.kt | 2 +- .../features/roomlist/LastMessageFormatter.kt | 2 +- .../{x => }/features/roomlist/RoomListNode.kt | 2 +- .../features/roomlist/RoomListPresenter.kt | 10 ++--- .../{x => }/features/roomlist/RoomListView.kt | 14 +++---- .../roomlist/components/RoomListTopBar.kt | 2 +- .../roomlist/components/RoomSummaryRow.kt | 4 +- .../features/roomlist/model/RoomListEvents.kt | 2 +- .../roomlist/model/RoomListRoomSummary.kt | 2 +- .../model/RoomListRoomSummaryPlaceholders.kt | 2 +- .../features/roomlist/model/RoomListState.kt | 2 +- .../features/roomlist/model/stubbed.kt | 2 +- .../roomlist/RoomListPresenterTests.kt | 7 +++- features/template/build.gradle.kts | 2 +- .../features/template/TemplateEvents.kt | 2 +- .../{x => }/features/template/TemplateNode.kt | 2 +- .../features/template/TemplatePresenter.kt | 2 +- .../features/template/TemplateState.kt | 2 +- .../{x => }/features/template/TemplateView.kt | 2 +- .../template/TemplatePresenterTests.kt | 2 +- .../{x => }/tests/uitests/BaseDeviceConfig.kt | 2 +- .../{x => }/tests/uitests/ColorTestPreview.kt | 2 +- .../tests/uitests/ComponentTestPreview.kt | 2 +- .../{x => }/tests/uitests/ScreenshotTest.kt | 3 +- .../{x => }/tests/uitests/TestPreview.kt | 2 +- .../tests/uitests/TypographyTestPreview.kt | 2 +- 149 files changed, 311 insertions(+), 309 deletions(-) rename features/login/src/androidTest/kotlin/io/element/android/{x => }/features/login/ExampleInstrumentedTest.kt (96%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/LoginFlowNode.kt (92%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/changeserver/ChangeServerEvents.kt (92%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/changeserver/ChangeServerNode.kt (96%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/changeserver/ChangeServerPresenter.kt (97%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/changeserver/ChangeServerState.kt (94%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/changeserver/ChangeServerView.kt (97%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/error/ErrorFormatter.kt (93%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/root/LoginRootEvents.kt (94%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/root/LoginRootNode.kt (97%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/root/LoginRootPresenter.kt (98%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/root/LoginRootScreen.kt (98%) rename features/login/src/main/kotlin/io/element/android/{x => }/features/login/root/LoginRootState.kt (96%) rename features/{onboarding/src/test/kotlin/io/element/android/x => login/src/test/kotlin/io/element/android}/features/login/ExampleUnitTest.kt (95%) rename features/{onboarding/src/androidTest/kotlin/io/element/android/x/features/login => logout/src/androidTest/kotlin/io/element/android/features/logout}/ExampleInstrumentedTest.kt (96%) rename features/logout/src/main/kotlin/io/element/android/{x => }/features/logout/LogoutPreferenceEvents.kt (93%) rename features/logout/src/main/kotlin/io/element/android/{x => }/features/logout/LogoutPreferencePresenter.kt (97%) rename features/logout/src/main/kotlin/io/element/android/{x => }/features/logout/LogoutPreferenceScreen.kt (98%) rename features/logout/src/main/kotlin/io/element/android/{x => }/features/logout/LogoutPreferenceState.kt (94%) rename features/{login/src/test/kotlin/io/element/android/x/features/login => logout/src/test/kotlin/io/element/android/features/logout}/ExampleUnitTest.kt (95%) rename features/messages/src/androidTest/kotlin/io/element/android/{x => }/features/messages/ExampleInstrumentedTest.kt (96%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/MessagesEvents.kt (78%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/MessagesNode.kt (97%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/MessagesPresenter.kt (86%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/MessagesState.kt (79%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/MessagesView.kt (93%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/actionlist/ActionListEvents.kt (85%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/actionlist/ActionListPresenter.kt (89%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/actionlist/ActionListState.kt (84%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/actionlist/ActionListView.kt (95%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/actionlist/model/TimelineItemAction.kt (95%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/textcomposer/MessageComposerEvents.kt (94%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/textcomposer/MessageComposerPresenter.kt (98%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/textcomposer/MessageComposerState.kt (94%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/textcomposer/MessageComposerView.kt (96%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/TimelineEvents.kt (93%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/TimelineItemsFactory.kt (87%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/TimelinePresenter.kt (98%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/TimelineState.kt (88%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/TimelineView.kt (88%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/MessageEventBubble.kt (96%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemEncryptedView.kt (86%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemImageView.kt (93%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemInformativeView.kt (96%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemReactionsView.kt (91%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemRedactedView.kt (86%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemTextView.kt (92%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/TimelineItemUnknownView.kt (86%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/components/html/HtmlDocument.kt (99%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/diff/CacheInvalidator.kt (89%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt (96%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/TimelineItem.kt (90%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/TimelineItemGroupPosition.kt (95%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/TimelineItemReactions.kt (93%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemContent.kt (95%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemEmoteContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemImageContent.kt (92%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemNoticeContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemRedactedContent.kt (90%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemTextContent.kt (91%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/model/content/TimelineItemUnknownContent.kt (90%) rename features/messages/src/main/kotlin/io/element/android/{x => }/features/messages/timeline/util/MutableListExt.kt (92%) rename features/{logout/src/test/kotlin/io/element/android/x/features/logout => messages/src/test/kotlin/io/element/android/features/messages}/ExampleUnitTest.kt (95%) rename features/{logout/src/androidTest/kotlin/io/element/android/x/features/logout => onboarding/src/androidTest/kotlin/io/element/android/features/login}/ExampleInstrumentedTest.kt (96%) rename features/onboarding/src/main/kotlin/io/element/android/{x => }/features/onboarding/OnBoardingScreen.kt (99%) rename features/onboarding/src/main/kotlin/io/element/android/{x => }/features/onboarding/SplashCarouselState.kt (94%) rename features/onboarding/src/main/kotlin/io/element/android/{x => }/features/onboarding/SplashCarouselStateFactory.kt (98%) rename features/{rageshake/src/test/kotlin/io/element/android/x => onboarding/src/test/kotlin/io/element/android}/features/login/ExampleUnitTest.kt (95%) rename features/preferences/src/androidTest/kotlin/io/element/android/{x => }/features/preferences/ExampleInstrumentedTest.kt (96%) rename features/preferences/src/main/kotlin/io/element/android/{x => }/features/preferences/PreferencesFlowNode.kt (94%) rename features/preferences/src/main/kotlin/io/element/android/{x => }/features/preferences/root/PreferencesRootNode.kt (97%) rename features/preferences/src/main/kotlin/io/element/android/{x => }/features/preferences/root/PreferencesRootPresenter.kt (86%) rename features/preferences/src/main/kotlin/io/element/android/{x => }/features/preferences/root/PreferencesRootState.kt (81%) rename features/preferences/src/main/kotlin/io/element/android/{x => }/features/preferences/root/PreferencesRootView.kt (81%) rename features/preferences/src/main/kotlin/io/element/android/{x => }/features/preferences/user/UserPreferences.kt (96%) rename features/{messages/src/test/kotlin/io/element/android/x/features/messages => preferences/src/test/kotlin/io/element/android/features/preferences}/ExampleUnitTest.kt (95%) delete mode 100644 features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/bugreport/BugReportEvents.kt (94%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/bugreport/BugReportNode.kt (97%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/bugreport/BugReportPresenter.kt (93%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/bugreport/BugReportState.kt (96%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/bugreport/BugReportView.kt (99%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/crash/CrashDataStore.kt (97%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/crash/VectorUncaughtExceptionHandler.kt (98%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/crash/ui/CrashDetectionEvents.kt (92%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/crash/ui/CrashDetectionPresenter.kt (93%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/crash/ui/CrashDetectionScreen.kt (97%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/crash/ui/CrashDetectionState.kt (92%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/detection/RageshakeDetectionEvents.kt (94%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/detection/RageshakeDetectionPresenter.kt (92%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/detection/RageshakeDetectionState.kt (86%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/detection/RageshakeDetectionView.kt (98%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/logs/LogFormatter.kt (97%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/logs/VectorFileLogger.kt (98%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/preferences/RageshakePreferencesEvents.kt (93%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/preferences/RageshakePreferencesPresenter.kt (92%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/preferences/RageshakePreferencesState.kt (93%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/preferences/RageshakePreferencesView.kt (98%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/rageshake/RageShake.kt (97%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/rageshake/RageshakeDataStore.kt (97%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/reporter/BugReporter.kt (98%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/reporter/BugReporterMultipartBody.java (99%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/reporter/ReportType.kt (92%) rename features/rageshake/src/main/kotlin/io/element/android/{x => }/features/rageshake/screenshot/ScreenshotHolder.kt (95%) create mode 100644 features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt rename features/roomlist/src/androidTest/kotlin/io/element/android/{x => }/features/roomlist/ExampleInstrumentedTest.kt (96%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/LastMessageFormatter.kt (98%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/RoomListNode.kt (97%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/RoomListPresenter.kt (95%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/RoomListView.kt (92%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/components/RoomListTopBar.kt (99%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/components/RoomSummaryRow.kt (97%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/model/RoomListEvents.kt (93%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/model/RoomListRoomSummary.kt (95%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt (96%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/model/RoomListState.kt (94%) rename features/roomlist/src/main/kotlin/io/element/android/{x => }/features/roomlist/model/stubbed.kt (96%) rename features/roomlist/src/test/kotlin/io/element/android/{x => }/features/roomlist/RoomListPresenterTests.kt (87%) rename features/template/src/main/kotlin/io/element/android/{x => }/features/template/TemplateEvents.kt (94%) rename features/template/src/main/kotlin/io/element/android/{x => }/features/template/TemplateNode.kt (97%) rename features/template/src/main/kotlin/io/element/android/{x => }/features/template/TemplatePresenter.kt (95%) rename features/template/src/main/kotlin/io/element/android/{x => }/features/template/TemplateState.kt (94%) rename features/template/src/main/kotlin/io/element/android/{x => }/features/template/TemplateView.kt (96%) rename features/template/src/test/kotlin/io/element/android/{x => }/features/template/TemplatePresenterTests.kt (96%) rename tests/uitests/src/test/kotlin/io/element/android/{x => }/tests/uitests/BaseDeviceConfig.kt (94%) rename tests/uitests/src/test/kotlin/io/element/android/{x => }/tests/uitests/ColorTestPreview.kt (97%) rename tests/uitests/src/test/kotlin/io/element/android/{x => }/tests/uitests/ComponentTestPreview.kt (95%) rename tests/uitests/src/test/kotlin/io/element/android/{x => }/tests/uitests/ScreenshotTest.kt (97%) rename tests/uitests/src/test/kotlin/io/element/android/{x => }/tests/uitests/TestPreview.kt (94%) rename tests/uitests/src/test/kotlin/io/element/android/{x => }/tests/uitests/TypographyTestPreview.kt (97%) diff --git a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt index df3dcacdbb..fa7e904e72 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt @@ -18,7 +18,7 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer -import io.element.android.x.features.rageshake.crash.VectorUncaughtExceptionHandler +import io.element.android.features.rageshake.crash.VectorUncaughtExceptionHandler class CrashInitializer : 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 10b7e17ffd..477dbab79c 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 @@ -19,7 +19,7 @@ package io.element.android.x.initializer import android.content.Context import androidx.startup.Initializer import io.element.android.x.BuildConfig -import io.element.android.x.features.rageshake.logs.VectorFileLogger +import io.element.android.features.rageshake.logs.VectorFileLogger import timber.log.Timber class TimberInitializer : Initializer { diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 65836f3f4c..774b42b220 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -36,8 +36,8 @@ import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.SessionComponent -import io.element.android.x.features.preferences.PreferencesFlowNode -import io.element.android.x.features.roomlist.RoomListNode +import io.element.android.features.preferences.PreferencesFlowNode +import io.element.android.features.roomlist.RoomListNode import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.SessionId diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index 3c619c5e38..91a85c1e85 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -27,8 +27,8 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.node import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.replace -import io.element.android.x.features.login.LoginFlowNode -import io.element.android.x.features.onboarding.OnBoardingScreen +import io.element.android.features.login.LoginFlowNode +import io.element.android.features.onboarding.OnBoardingScreen import kotlinx.parcelize.Parcelize import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index e4db559128..0048b143cf 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -29,7 +29,7 @@ import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.RoomComponent -import io.element.android.x.features.messages.MessagesNode +import io.element.android.features.messages.MessagesNode import io.element.android.libraries.matrix.room.MatrixRoom import kotlinx.parcelize.Parcelize import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index e922b14e7d..cf7346f801 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -39,7 +39,7 @@ import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner -import io.element.android.x.features.rageshake.bugreport.BugReportNode +import io.element.android.features.rageshake.bugreport.BugReportNode import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.core.SessionId 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 0ca0efd0bb..dad279bf09 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 @@ -20,9 +20,9 @@ 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.x.features.rageshake.bugreport.BugReportPresenter -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter -import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter +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 javax.inject.Inject class RootPresenter @Inject constructor( diff --git a/app/src/main/kotlin/io/element/android/x/root/RootState.kt b/app/src/main/kotlin/io/element/android/x/root/RootState.kt index 6a062d2925..6d516c5c70 100644 --- a/app/src/main/kotlin/io/element/android/x/root/RootState.kt +++ b/app/src/main/kotlin/io/element/android/x/root/RootState.kt @@ -17,9 +17,9 @@ package io.element.android.x.root import androidx.compose.runtime.Stable -import io.element.android.x.features.rageshake.bugreport.BugReportState -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionState -import io.element.android.x.features.rageshake.detection.RageshakeDetectionState +import io.element.android.features.rageshake.bugreport.BugReportState +import io.element.android.features.rageshake.crash.ui.CrashDetectionState +import io.element.android.features.rageshake.detection.RageshakeDetectionState @Stable data class RootState( 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 534f7edfda..048c3d8e6c 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 @@ -25,10 +25,10 @@ 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.x.features.rageshake.crash.ui.CrashDetectionEvents -import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView -import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents -import io.element.android.x.features.rageshake.detection.RageshakeDetectionView +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 @Composable diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 4b979827d7..1f424d86d5 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "io.element.android.x.features.login" + namespace = "io.element.android.features.login" } anvil { diff --git a/features/login/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt similarity index 96% rename from features/login/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt rename to features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt index 88ae6c4133..3fc011ddf8 100644 --- a/features/login/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt +++ b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt similarity index 92% rename from features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt rename to features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index f564eaf901..ae0f6268a0 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import android.os.Parcelable import androidx.compose.runtime.Composable @@ -26,8 +26,8 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.createNode -import io.element.android.x.features.login.changeserver.ChangeServerNode -import io.element.android.x.features.login.root.LoginRootNode +import io.element.android.features.login.changeserver.ChangeServerNode +import io.element.android.features.login.root.LoginRootNode import kotlinx.parcelize.Parcelize class LoginFlowNode( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerEvents.kt similarity index 92% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerEvents.kt index 78e4e64ffd..70b57b5038 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver sealed interface ChangeServerEvents { data class SetServer(val server: String) : ChangeServerEvents diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt similarity index 96% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt index 6264809ada..01163664b6 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenter.kt similarity index 97% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenter.kt index b1050d59e1..038d2ecea1 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerState.kt similarity index 94% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerState.kt index 19405763e1..9c1b9ac7e2 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import io.element.android.libraries.architecture.Async diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt similarity index 97% rename from features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt rename to features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt index 8e7a98f919..b0ddd10efd 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.login.changeserver +package io.element.android.features.login.changeserver import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -55,8 +55,8 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.architecture.Async import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.VectorIcon -import io.element.android.x.features.login.R -import io.element.android.x.features.login.error.changeServerError +import io.element.android.features.login.R +import io.element.android.features.login.error.changeServerError 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/x/features/login/error/ErrorFormatter.kt b/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt similarity index 93% rename from features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt rename to features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt index eb90f40936..4f79df3be3 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/error/ErrorFormatter.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.x.features.login.error +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.x.features.login.root.LoginFormState +import io.element.android.features.login.root.LoginFormState import io.element.android.libraries.ui.strings.R as StringR @Composable diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootEvents.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootEvents.kt similarity index 94% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootEvents.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootEvents.kt index de72602775..623f80abc7 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootEvents.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root sealed interface LoginRootEvents { object RefreshHomeServer : LoginRootEvents diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt similarity index 97% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index b46b79e995..089f629e6b 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootPresenter.kt similarity index 98% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootPresenter.kt index e6a6ec6c9e..cb80d3784a 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt similarity index 98% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt index 31030f56f1..04d8a474e2 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.login.root +package io.element.android.features.login.root import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -59,7 +59,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.textFieldState -import io.element.android.x.features.login.error.loginError +import io.element.android.features.login.error.loginError import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag import io.element.android.libraries.matrix.core.SessionId diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootState.kt similarity index 96% rename from features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt rename to features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootState.kt index 6fc80bcfb6..fab74370f0 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootState.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login.root +package io.element.android.features.login.root import android.os.Parcelable import io.element.android.libraries.matrix.core.SessionId diff --git a/features/onboarding/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt b/features/login/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt similarity index 95% rename from features/onboarding/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt rename to features/login/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt index 39a03196df..ee6363e624 100644 --- a/features/onboarding/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt +++ b/features/login/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/logout/build.gradle.kts b/features/logout/build.gradle.kts index 93f9c4f6f2..e022a4cb87 100644 --- a/features/logout/build.gradle.kts +++ b/features/logout/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.features.logout" + namespace = "io.element.android.features.logout" } anvil { diff --git a/features/onboarding/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt similarity index 96% rename from features/onboarding/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt rename to features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt index 88ae6c4133..5fea153e9f 100644 --- a/features/onboarding/src/androidTest/kotlin/io/element/android/x/features/login/ExampleInstrumentedTest.kt +++ b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.logout import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceEvents.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceEvents.kt similarity index 93% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceEvents.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceEvents.kt index 83aa2fe14f..b381668974 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceEvents.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout sealed interface LogoutPreferenceEvents { object Logout : LogoutPreferenceEvents diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferencePresenter.kt similarity index 97% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferencePresenter.kt index f29a687f23..3aa626f1fa 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferencePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceScreen.kt similarity index 98% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceScreen.kt index e7bc9d3f7f..cc94f56806 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceScreen.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Logout diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceState.kt similarity index 94% rename from features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt rename to features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceState.kt index cfa82c575e..e594a04870 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt +++ b/features/logout/src/main/kotlin/io/element/android/features/logout/LogoutPreferenceState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.logout import io.element.android.libraries.architecture.Async diff --git a/features/login/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt b/features/logout/src/test/kotlin/io/element/android/features/logout/ExampleUnitTest.kt similarity index 95% rename from features/login/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt rename to features/logout/src/test/kotlin/io/element/android/features/logout/ExampleUnitTest.kt index 39a03196df..065f4e917d 100644 --- a/features/login/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt +++ b/features/logout/src/test/kotlin/io/element/android/features/logout/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.logout import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index 861cb183c4..02c0a245d8 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.features.messages" + namespace = "io.element.android.features.messages" } anvil { diff --git a/features/messages/src/androidTest/kotlin/io/element/android/x/features/messages/ExampleInstrumentedTest.kt b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt similarity index 96% rename from features/messages/src/androidTest/kotlin/io/element/android/x/features/messages/ExampleInstrumentedTest.kt rename to features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt index 86305659f1..30e9a85c26 100644 --- a/features/messages/src/androidTest/kotlin/io/element/android/x/features/messages/ExampleInstrumentedTest.kt +++ b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt similarity index 78% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt index 88e8c52221..d8d5c0c795 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesEvents.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem sealed interface MessagesEvents { data class HandleAction(val action: TimelineItemAction, val messageEvent: TimelineItem.MessageEvent) : MessagesEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt similarity index 97% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt index 3bc779eb22..dbbf1a1d8a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt index 7b9368e2b3..9f32bc74bd 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -27,15 +27,15 @@ 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.x.features.messages.actionlist.ActionListPresenter -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.textcomposer.MessageComposerEvents -import io.element.android.x.features.messages.textcomposer.MessageComposerPresenter -import io.element.android.x.features.messages.textcomposer.MessageComposerState -import io.element.android.x.features.messages.timeline.TimelineEvents -import io.element.android.x.features.messages.timeline.TimelinePresenter -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent +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 +import io.element.android.features.messages.textcomposer.MessageComposerPresenter +import io.element.android.features.messages.textcomposer.MessageComposerState +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.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/x/features/messages/MessagesState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt similarity index 79% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt index 1e3fea4c67..a3e23d0556 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesState.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.actionlist.ActionListState -import io.element.android.x.features.messages.textcomposer.MessageComposerState -import io.element.android.x.features.messages.timeline.TimelineState +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.matrix.core.RoomId @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt index a543141e6a..dbcf0011a4 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt @@ -19,7 +19,7 @@ ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class, ) -package io.element.android.x.features.messages +package io.element.android.features.messages import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -59,12 +59,12 @@ import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.actionlist.ActionListEvents -import io.element.android.x.features.messages.actionlist.ActionListView -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.textcomposer.MessageComposerView -import io.element.android.x.features.messages.timeline.TimelineView +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 kotlinx.coroutines.launch import timber.log.Timber diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt similarity index 85% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt index 65b26cf84a..f760f08640 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.TimelineItem sealed interface ActionListEvents { object Clear : ActionListEvents diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt similarity index 89% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt index 9a4e3b3168..08140b5a96 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -22,9 +22,9 @@ 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.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent +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 kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt similarity index 84% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt index 00c3ec59ab..6bc7630ec8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListState.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist import androidx.compose.runtime.Immutable -import io.element.android.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem import kotlinx.collections.immutable.ImmutableList @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt index dfb3018596..c7b641a1a1 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/ActionListView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterialApi::class) -package io.element.android.x.features.messages.actionlist +package io.element.android.features.messages.actionlist import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -42,8 +42,8 @@ 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.x.features.messages.actionlist.model.TimelineItemAction -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.actionlist.model.TimelineItemAction +import io.element.android.features.messages.timeline.model.TimelineItem import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt index a43dbdb6a3..84551753b9 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/model/TimelineItemAction.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/actionlist/model/TimelineItemAction.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.actionlist.model +package io.element.android.features.messages.actionlist.model import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerEvents.kt similarity index 94% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerEvents.kt index 7272f29969..656229555b 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import io.element.android.libraries.textcomposer.MessageComposerMode diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt similarity index 98% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt index 2d1e5401bd..24e3f2461d 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerState.kt similarity index 94% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerState.kt index 396b3c4f19..2b5396cb9e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import androidx.compose.runtime.Immutable import io.element.android.libraries.core.data.StableCharSequence diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerView.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerView.kt index 5acfd7d954..e3b674d32a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/textcomposer/MessageComposerView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.textcomposer +package io.element.android.features.messages.textcomposer import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineEvents.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineEvents.kt index 31a53849cd..c59b99fe3f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineEvents.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import io.element.android.libraries.matrix.core.EventId diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt similarity index 87% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt index 9438152e6a..dcc36c1388 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineItemsFactory.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt @@ -14,25 +14,25 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +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.x.features.messages.timeline.diff.CacheInvalidator -import io.element.android.x.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback -import io.element.android.x.features.messages.timeline.model.AggregatedReaction -import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.TimelineItemReactions -import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEmoteContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemNoticeContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent -import io.element.android.x.features.messages.timeline.util.invalidateLast +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 +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.TimelineItemReactions +import io.element.android.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEmoteContent +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.TimelineItemNoticeContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent +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.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/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt similarity index 98% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt index 5844534219..18ce07896e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelinePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt similarity index 88% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt index ec43aa2057..6b8c715f5d 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineState.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.compose.runtime.Immutable -import io.element.android.x.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.model.TimelineItem import io.element.android.libraries.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt similarity index 88% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index 1ba9c5a19e..c7d424db2e 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline +package io.element.android.features.messages.timeline import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -61,25 +61,25 @@ import androidx.compose.ui.zIndex import io.element.android.libraries.core.compose.PairCombinedPreviewParameter import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.messages.timeline.model.AggregatedReaction -import io.element.android.x.features.messages.timeline.model.MessagesItemGroupPosition -import io.element.android.x.features.messages.timeline.model.TimelineItemGroupPositionProvider -import io.element.android.x.features.messages.timeline.model.TimelineItemReactions -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.model.content.TimelineItemContent -import io.element.android.x.features.messages.timeline.model.content.MessagesTimelineItemContentProvider -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent -import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent -import io.element.android.x.features.messages.timeline.components.MessageEventBubble -import io.element.android.x.features.messages.timeline.components.TimelineItemReactionsView -import io.element.android.x.features.messages.timeline.components.TimelineItemEncryptedView -import io.element.android.x.features.messages.timeline.components.TimelineItemImageView -import io.element.android.x.features.messages.timeline.components.TimelineItemRedactedView -import io.element.android.x.features.messages.timeline.components.TimelineItemTextView -import io.element.android.x.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.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.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.matrix.core.EventId import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt index e7c16eefe4..cb52ae9645 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/MessageEventBubble.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -36,7 +36,7 @@ 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.x.features.messages.timeline.model.MessagesItemGroupPosition +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/x/features/messages/timeline/components/TimelineItemEncryptedView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemEncryptedView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt index 0b037c6f1f..9b2be79685 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemEncryptedView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemEncryptedView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Warning import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.features.messages.timeline.model.content.TimelineItemEncryptedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemEncryptedContent @Composable fun TimelineItemEncryptedView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemImageView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemImageView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt index a630959bcb..e6548a71e8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemImageView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemImageView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalFoundationApi::class) -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Box @@ -33,7 +33,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import coil.compose.AsyncImage import coil.request.ImageRequest -import io.element.android.x.features.messages.timeline.model.content.TimelineItemImageContent +import io.element.android.features.messages.timeline.model.content.TimelineItemImageContent @Composable fun TimelineItemImageView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemInformativeView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemInformativeView.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemInformativeView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemInformativeView.kt index 6c876f9103..9806bc05c8 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemInformativeView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemInformativeView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemReactionsView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemReactionsView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt index 8cc75befea..b061f02f3d 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemReactionsView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemReactionsView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Row @@ -32,8 +32,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow -import io.element.android.x.features.messages.timeline.model.AggregatedReaction -import io.element.android.x.features.messages.timeline.model.TimelineItemReactions +import io.element.android.features.messages.timeline.model.AggregatedReaction +import io.element.android.features.messages.timeline.model.TimelineItemReactions @Composable fun TimelineItemReactionsView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemRedactedView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemRedactedView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt index 183b44de74..f752f88c4a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemRedactedView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemRedactedView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent +import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent @Composable fun TimelineItemRedactedView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt similarity index 92% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt index 8da4a0a1f4..b0924ce999 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemTextView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemTextView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import android.text.SpannableString import android.text.style.URLSpan @@ -30,8 +30,8 @@ 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.x.features.messages.timeline.components.html.HtmlDocument -import io.element.android.x.features.messages.timeline.model.content.TimelineItemTextBasedContent +import io.element.android.features.messages.timeline.components.html.HtmlDocument +import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent @Composable fun TimelineItemTextView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemUnknownView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt similarity index 86% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemUnknownView.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt index 88355abd90..396bb19cb6 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/TimelineItemUnknownView.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/TimelineItemUnknownView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components +package io.element.android.features.messages.timeline.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import io.element.android.x.features.messages.timeline.model.content.TimelineItemUnknownContent +import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent @Composable fun TimelineItemUnknownView( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt similarity index 99% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt index efb22538da..21a7cac714 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/components/html/HtmlDocument.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/html/HtmlDocument.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.components.html +package io.element.android.features.messages.timeline.components.html import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/CacheInvalidator.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/CacheInvalidator.kt similarity index 89% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/CacheInvalidator.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/CacheInvalidator.kt index 031d871033..c71fa7bcd1 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/CacheInvalidator.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/CacheInvalidator.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.diff +package io.element.android.features.messages.timeline.diff import androidx.recyclerview.widget.ListUpdateCallback -import io.element.android.x.features.messages.timeline.model.TimelineItem -import io.element.android.x.features.messages.timeline.util.invalidateLast +import io.element.android.features.messages.timeline.model.TimelineItem +import io.element.android.features.messages.timeline.util.invalidateLast import timber.log.Timber internal class CacheInvalidator(private val itemStatesCache: MutableList) : diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt similarity index 96% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt index 1de27134a0..fd5119cc2a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/diff/MatrixTimelineItemsDiffCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.diff +package io.element.android.features.messages.timeline.diff import androidx.recyclerview.widget.DiffUtil import io.element.android.libraries.matrix.timeline.MatrixTimelineItem diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt index fba7009f68..d54e0d602f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItem.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItem.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model +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.x.features.messages.timeline.model.content.TimelineItemContent +import io.element.android.features.messages.timeline.model.content.TimelineItemContent import io.element.android.libraries.matrix.core.EventId @Immutable diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemGroupPosition.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemGroupPosition.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemGroupPosition.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemGroupPosition.kt index 977c498bfc..9a1ebb9362 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemGroupPosition.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemGroupPosition.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model +package io.element.android.features.messages.timeline.model import androidx.compose.runtime.Immutable import androidx.compose.ui.tooling.preview.PreviewParameterProvider diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemReactions.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemReactions.kt similarity index 93% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemReactions.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemReactions.kt index ff0fd549bc..a6470a3784 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/TimelineItemReactions.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/TimelineItemReactions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model +package io.element.android.features.messages.timeline.model import kotlinx.collections.immutable.ImmutableList diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt similarity index 95% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt index 9d7b8c3868..973a4343a3 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import androidx.compose.ui.tooling.preview.PreviewParameterProvider import org.matrix.rustcomponents.sdk.EncryptedMessage diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEmoteContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEmoteContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt index c5c0a8a330..c307b70edb 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEmoteContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEmoteContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt index 62fd231191..937b4d32f6 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemEncryptedContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.matrix.rustcomponents.sdk.EncryptedMessage diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt similarity index 92% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt index e361ff11a8..ef1c8d85d5 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemImageContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemImageContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import io.element.android.libraries.matrix.media.MediaResolver diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemNoticeContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemNoticeContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt index 1bb8df5673..330ef1ff95 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemNoticeContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemNoticeContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemRedactedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemRedactedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt index 8de2088052..6dd395f338 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemRedactedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemRedactedContent.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content object TimelineItemRedactedContent : TimelineItemContent diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt index 15f757bf6e..6146a5493f 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextBasedContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt similarity index 91% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt index a3a887df66..abb3140b71 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemTextContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemTextContent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content import org.jsoup.nodes.Document diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemUnknownContent.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt similarity index 90% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemUnknownContent.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt index 44f6cb9af4..e2e0c5a14a 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/model/content/TimelineItemUnknownContent.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/model/content/TimelineItemUnknownContent.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.model.content +package io.element.android.features.messages.timeline.model.content object TimelineItemUnknownContent : TimelineItemContent diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/util/MutableListExt.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/MutableListExt.kt similarity index 92% rename from features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/util/MutableListExt.kt rename to features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/MutableListExt.kt index d487af0cdc..555cb4cb01 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/util/MutableListExt.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/util/MutableListExt.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages.timeline.util +package io.element.android.features.messages.timeline.util internal inline fun MutableList.invalidateLast() { val indexOfLast = size diff --git a/features/logout/src/test/kotlin/io/element/android/x/features/logout/ExampleUnitTest.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/ExampleUnitTest.kt similarity index 95% rename from features/logout/src/test/kotlin/io/element/android/x/features/logout/ExampleUnitTest.kt rename to features/messages/src/test/kotlin/io/element/android/features/messages/ExampleUnitTest.kt index b2b9726114..83296930a7 100644 --- a/features/logout/src/test/kotlin/io/element/android/x/features/logout/ExampleUnitTest.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.messages import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index e002cfb7d7..24b32d6ba1 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.features.onboarding" + namespace = "io.element.android.features.onboarding" } dependencies { diff --git a/features/logout/src/androidTest/kotlin/io/element/android/x/features/logout/ExampleInstrumentedTest.kt b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt similarity index 96% rename from features/logout/src/androidTest/kotlin/io/element/android/x/features/logout/ExampleInstrumentedTest.kt rename to features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt index ada1dafdcb..3fc011ddf8 100644 --- a/features/logout/src/androidTest/kotlin/io/element/android/x/features/logout/ExampleInstrumentedTest.kt +++ b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.logout +package io.element.android.features.login import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt similarity index 99% rename from features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt rename to features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt index be5b4f646a..f0f524cddf 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.onboarding +package io.element.android.features.onboarding import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselState.kt b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselState.kt similarity index 94% rename from features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselState.kt rename to features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselState.kt index 0d491bb236..f6523da7a6 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselState.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.onboarding +package io.element.android.features.onboarding import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselStateFactory.kt similarity index 98% rename from features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt rename to features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselStateFactory.kt index 681eb09466..fc06ba49b6 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/features/onboarding/SplashCarouselStateFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.onboarding +package io.element.android.features.onboarding import androidx.annotation.DrawableRes import io.element.android.libraries.ui.strings.R as StringR diff --git a/features/rageshake/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt b/features/onboarding/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt similarity index 95% rename from features/rageshake/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt rename to features/onboarding/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt index 39a03196df..ee6363e624 100644 --- a/features/rageshake/src/test/kotlin/io/element/android/x/features/login/ExampleUnitTest.kt +++ b/features/onboarding/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.login +package io.element.android.features.login import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/preferences/build.gradle.kts b/features/preferences/build.gradle.kts index e8f5147642..894087b50e 100644 --- a/features/preferences/build.gradle.kts +++ b/features/preferences/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "io.element.android.x.features.preferences" + namespace = "io.element.android.features.preferences" } anvil { diff --git a/features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt similarity index 96% rename from features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt rename to features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt index 6492607f4a..dc6a244d21 100644 --- a/features/preferences/src/androidTest/kotlin/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt +++ b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences +package io.element.android.features.preferences import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt similarity index 94% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index 98255fd7c4..a3e9e4e283 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences +package io.element.android.features.preferences import android.os.Parcelable import androidx.compose.runtime.Composable @@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import io.element.android.libraries.architecture.createNode -import io.element.android.x.features.preferences.root.PreferencesRootNode +import io.element.android.features.preferences.root.PreferencesRootNode import kotlinx.parcelize.Parcelize class PreferencesFlowNode( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt similarity index 97% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt index 60ff67091b..ae48353d78 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt similarity index 86% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt index 065aef7fd3..e798494aef 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +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.x.features.logout.LogoutPreferencePresenter -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter +import io.element.android.features.logout.LogoutPreferencePresenter +import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter import javax.inject.Inject class PreferencesRootPresenter @Inject constructor( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt similarity index 81% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt index b813d0a99b..4a22320f48 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootState.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import io.element.android.libraries.architecture.Async -import io.element.android.x.features.logout.LogoutPreferenceState -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState +import io.element.android.features.logout.LogoutPreferenceState +import io.element.android.features.rageshake.preferences.RageshakePreferencesState import io.element.android.libraries.matrix.ui.model.MatrixUser data class PreferencesRootState( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt similarity index 81% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt index c467aa15bb..3c403278d3 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.root +package io.element.android.features.preferences.root import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -22,11 +22,11 @@ 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.x.features.logout.LogoutPreferenceState -import io.element.android.x.features.logout.LogoutPreferenceView -import io.element.android.x.features.preferences.user.UserPreferences -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView +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.ui.strings.R as StringR @Composable diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/user/UserPreferences.kt similarity index 96% rename from features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt rename to features/preferences/src/main/kotlin/io/element/android/features/preferences/user/UserPreferences.kt index 24fd0e2292..f068e71f3b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/user/UserPreferences.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.preferences.user +package io.element.android.features.preferences.user import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height diff --git a/features/messages/src/test/kotlin/io/element/android/x/features/messages/ExampleUnitTest.kt b/features/preferences/src/test/kotlin/io/element/android/features/preferences/ExampleUnitTest.kt similarity index 95% rename from features/messages/src/test/kotlin/io/element/android/x/features/messages/ExampleUnitTest.kt rename to features/preferences/src/test/kotlin/io/element/android/features/preferences/ExampleUnitTest.kt index 87aedb9588..3b615c83e9 100644 --- a/features/messages/src/test/kotlin/io/element/android/x/features/messages/ExampleUnitTest.kt +++ b/features/preferences/src/test/kotlin/io/element/android/features/preferences/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.messages +package io.element.android.features.preferences import org.junit.Assert.assertEquals import org.junit.Test diff --git a/features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt b/features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt deleted file mode 100644 index fda74bd660..0000000000 --- a/features/preferences/src/test/kotlin/io/element/android/x/features/preferences/ExampleUnitTest.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.x.features.preferences - -import org.junit.Assert.assertEquals -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/features/rageshake/build.gradle.kts b/features/rageshake/build.gradle.kts index b3f8b14ded..fa2aee4b2c 100644 --- a/features/rageshake/build.gradle.kts +++ b/features/rageshake/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "io.element.android.x.features.rageshake" + namespace = "io.element.android.features.rageshake" } anvil { diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEvents.kt similarity index 94% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEvents.kt index c8bbfe2741..0045f29a2c 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport sealed interface BugReportEvents { object SendBugReport : BugReportEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt index 409e429330..5e620310df 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt index 5dfd3392e7..89289888e8 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -26,11 +26,11 @@ 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.x.features.rageshake.crash.CrashDataStore -import io.element.android.x.features.rageshake.logs.VectorFileLogger -import io.element.android.x.features.rageshake.reporter.BugReporter -import io.element.android.x.features.rageshake.reporter.ReportType -import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder +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 kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportState.kt similarity index 96% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportState.kt index 85736a76e4..1f66bb58eb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import android.os.Parcelable import io.element.android.libraries.architecture.Async diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt similarity index 99% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt index 945661d6b0..ba209f69bb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.bugreport +package io.element.android.features.rageshake.bugreport import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt index 886877e89b..166c39a101 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/CrashDataStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash +package io.element.android.features.rageshake.crash import android.content.Context import androidx.datastore.core.DataStore diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt index 15ef3256f0..84caffc55c 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/VectorUncaughtExceptionHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash +package io.element.android.features.rageshake.crash import android.content.Context import android.os.Build diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionEvents.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionEvents.kt index 93330b4513..0175e1fde2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui sealed interface CrashDetectionEvents { object ResetAllCrashData : CrashDetectionEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt index 918a89ddbb..4172589a74 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionPresenter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +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.x.features.rageshake.crash.CrashDataStore +import io.element.android.features.rageshake.crash.CrashDataStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt index bcde245e0a..b3b41ccd09 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionState.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionState.kt index 52774c4cc9..bff17b246a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.crash.ui +package io.element.android.features.rageshake.crash.ui data class CrashDetectionState( val crashDetected: Boolean = false, diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt similarity index 94% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt index 3d0c4cef80..3030311674 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import io.element.android.libraries.core.screenshot.ImageResult diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt index 92b14bad76..de6f338b27 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -25,10 +25,10 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.screenshot.ImageResult -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter -import io.element.android.x.features.rageshake.rageshake.RageShake -import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder +import io.element.android.features.rageshake.preferences.RageshakePreferencesEvents +import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter +import io.element.android.features.rageshake.rageshake.RageShake +import io.element.android.features.rageshake.screenshot.ScreenshotHolder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionState.kt similarity index 86% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionState.kt index d32b326dd3..4c99ef264b 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import androidx.compose.runtime.Stable -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState +import io.element.android.features.rageshake.preferences.RageshakePreferencesState @Stable data class RageshakeDetectionState( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt index e376d7cbcf..a63c38d12e 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.detection +package io.element.android.features.rageshake.detection import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/LogFormatter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/LogFormatter.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/LogFormatter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/LogFormatter.kt index 007c87f3e1..2f6a50c077 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/LogFormatter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/LogFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.logs +package io.element.android.features.rageshake.logs import java.io.PrintWriter import java.io.StringWriter diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt index 0b4275b3f2..b7443e90bb 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/logs/VectorFileLogger.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.logs +package io.element.android.features.rageshake.logs import android.content.Context import android.util.Log diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesEvents.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesEvents.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesEvents.kt index ae178e9f2f..39b788e003 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences sealed interface RageshakePreferencesEvents { data class SetSensitivity(val sensitivity: Float) : RageshakePreferencesEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt index 9878c26417..167c6a83b8 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState @@ -23,8 +23,8 @@ 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.x.features.rageshake.rageshake.RageShake -import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore +import io.element.android.features.rageshake.rageshake.RageShake +import io.element.android.features.rageshake.rageshake.RageshakeDataStore import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesState.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesState.kt similarity index 93% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesState.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesState.kt index 5a71b2a42f..e6c45ddf83 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesState.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences data class RageshakePreferencesState( val isEnabled: Boolean = false, diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesView.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesView.kt index d1c9c201f2..ce5d9bcab8 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/preferences/RageshakePreferencesView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.preferences +package io.element.android.features.rageshake.preferences import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageShake.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageShake.kt index 14643f8c1c..691da5dbe2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageShake.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.rageshake +package io.element.android.features.rageshake.rageshake import android.content.Context import android.hardware.Sensor diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt similarity index 97% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt index a9e741720b..2f27e9d60f 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/rageshake/RageshakeDataStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.rageshake +package io.element.android.features.rageshake.rageshake import android.content.Context import androidx.datastore.core.DataStore diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt similarity index 98% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt index b12aedc0db..3e495d613f 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.reporter +package io.element.android.features.rageshake.reporter import android.content.Context import android.os.Build @@ -22,10 +22,10 @@ import io.element.android.libraries.core.extensions.toOnOff import io.element.android.libraries.core.file.compressFile import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.di.ApplicationContext -import io.element.android.x.features.rageshake.R -import io.element.android.x.features.rageshake.crash.CrashDataStore -import io.element.android.x.features.rageshake.logs.VectorFileLogger -import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder +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 diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporterMultipartBody.java b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java similarity index 99% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporterMultipartBody.java rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java index 275ea89298..fdd858abfd 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporterMultipartBody.java +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.reporter; +package io.element.android.features.rageshake.reporter; import java.io.IOException; import java.util.ArrayList; diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/ReportType.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/ReportType.kt similarity index 92% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/ReportType.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/ReportType.kt index 6523f99e2b..a29d29e702 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/ReportType.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/ReportType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.reporter +package io.element.android.features.rageshake.reporter enum class ReportType { BUG_REPORT, diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt similarity index 95% rename from features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt index e57513d0fa..d58a60dd4a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.rageshake.screenshot +package io.element.android.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap diff --git a/features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt b/features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt new file mode 100644 index 0000000000..ee6363e624 --- /dev/null +++ b/features/rageshake/src/test/kotlin/io/element/android/features/login/ExampleUnitTest.kt @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2022 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.features.login + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index fe2fd050fe..fa0b3c4661 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "io.element.android.x.features.roomlist" + namespace = "io.element.android.features.roomlist" } anvil { diff --git a/features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt similarity index 96% rename from features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt rename to features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt index 487d999142..b0cd0e20f1 100644 --- a/features/roomlist/src/androidTest/kotlin/io/element/android/x/features/roomlist/ExampleInstrumentedTest.kt +++ b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/LastMessageFormatter.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/LastMessageFormatter.kt similarity index 98% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/LastMessageFormatter.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/LastMessageFormatter.kt index 5e90a52898..037ba5200d 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/LastMessageFormatter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/LastMessageFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import android.text.format.DateFormat import android.text.format.DateUtils diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt similarity index 97% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt index 3c2c3ae19b..b299658643 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt similarity index 95% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt index bf35b48710..3421156e57 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -29,10 +29,10 @@ 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.x.features.roomlist.model.RoomListEvents -import io.element.android.x.features.roomlist.model.RoomListRoomSummary -import io.element.android.x.features.roomlist.model.RoomListRoomSummaryPlaceholders -import io.element.android.x.features.roomlist.model.RoomListState +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.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/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt similarity index 92% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt index 1bca826ad6..5b807f0dd0 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding @@ -38,12 +38,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Velocity import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.x.features.roomlist.components.RoomListTopBar -import io.element.android.x.features.roomlist.components.RoomSummaryRow -import io.element.android.x.features.roomlist.model.RoomListEvents -import io.element.android.x.features.roomlist.model.RoomListRoomSummary -import io.element.android.x.features.roomlist.model.RoomListState -import io.element.android.x.features.roomlist.model.stubbedRoomSummaries +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.matrix.core.RoomId import io.element.android.libraries.matrix.core.UserId import io.element.android.libraries.matrix.ui.model.MatrixUser diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt similarity index 99% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt index 79f14fd3f8..8b5e4c4761 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package io.element.android.x.features.roomlist.components +package io.element.android.features.roomlist.components import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.fillMaxWidth diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt similarity index 97% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt index 2c4d647cfb..53d275ad89 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomSummaryRow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.components +package io.element.android.features.roomlist.components import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -53,7 +53,7 @@ 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.x.features.roomlist.model.RoomListRoomSummary +import io.element.android.features.roomlist.model.RoomListRoomSummary private val minHeight = 72.dp diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListEvents.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListEvents.kt similarity index 93% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListEvents.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListEvents.kt index e4cbf4430b..4349c93341 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListEvents.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model sealed interface RoomListEvents { data class UpdateFilter(val newFilter: String) : RoomListEvents diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummary.kt similarity index 95% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummary.kt index 12a8982989..f88b3da31f 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummary.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import androidx.compose.runtime.Immutable import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt similarity index 96% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt index 6950ab32da..5e6176bcb2 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListRoomSummaryPlaceholders.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import io.element.android.libraries.designsystem.components.avatar.AvatarData diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListState.kt similarity index 94% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListState.kt index 3b54057b44..f2d873654b 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/RoomListState.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/RoomListState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import androidx.compose.runtime.Immutable import io.element.android.libraries.matrix.ui.model.MatrixUser diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/stubbed.kt similarity index 96% rename from features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt rename to features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/stubbed.kt index ef3dac79d6..c122752d4d 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/model/stubbed.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/model/stubbed.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist.model +package io.element.android.features.roomlist.model import io.element.android.libraries.designsystem.components.avatar.AvatarData import kotlinx.collections.immutable.ImmutableList diff --git a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt similarity index 87% rename from features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt rename to features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt index 658d15beb0..ce5b486f77 100644 --- a/features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/RoomListPresenterTests.kt +++ b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.roomlist +package io.element.android.features.roomlist import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow @@ -22,6 +22,8 @@ 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 kotlinx.coroutines.test.runTest import org.junit.Test @@ -33,7 +35,8 @@ class RoomListPresenterTests { val presenter = RoomListPresenter( FakeMatrixClient( SessionId("sessionId") - ), LastMessageFormatter()) + ), LastMessageFormatter() + ) moleculeFlow(RecompositionClock.Immediate) { presenter.present() }.test { diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index 636835c609..f7a265e462 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -24,7 +24,7 @@ plugins { android { // TODO change the namespace (and your classes package) - namespace = "io.element.android.x.features.template" + namespace = "io.element.android.features.template" } anvil { diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateEvents.kt similarity index 94% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateEvents.kt index 588bbd957d..57d0b0cc25 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template // TODO Add your events or remove the file completely if no events sealed interface TemplateEvents { diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt similarity index 97% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt index ca0f5ce7fe..4d907023c8 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplatePresenter.kt similarity index 95% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplatePresenter.kt index f552aea412..254a5fc048 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplatePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import androidx.compose.runtime.Composable import io.element.android.libraries.architecture.Presenter diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateState.kt similarity index 94% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateState.kt index 8f633ae8c2..8bb7f91ae3 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template // TODO add your ui models. Remove the eventSink if you don't have events. data class TemplateState( diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateView.kt similarity index 96% rename from features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt rename to features/template/src/main/kotlin/io/element/android/features/template/TemplateView.kt index 015be504bd..0de5a4df96 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateView.kt +++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import androidx.compose.foundation.layout.Box import androidx.compose.material3.Text diff --git a/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt b/features/template/src/test/kotlin/io/element/android/features/template/TemplatePresenterTests.kt similarity index 96% rename from features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt rename to features/template/src/test/kotlin/io/element/android/features/template/TemplatePresenterTests.kt index e470489bce..39b7e32ea8 100644 --- a/features/template/src/test/kotlin/io/element/android/x/features/template/TemplatePresenterTests.kt +++ b/features/template/src/test/kotlin/io/element/android/features/template/TemplatePresenterTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.features.template +package io.element.android.features.template import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/BaseDeviceConfig.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/BaseDeviceConfig.kt similarity index 94% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/BaseDeviceConfig.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/BaseDeviceConfig.kt index a46dceaa8e..3732ca66cc 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/BaseDeviceConfig.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/BaseDeviceConfig.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import app.cash.paparazzi.DeviceConfig diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ColorTestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ColorTestPreview.kt similarity index 97% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ColorTestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ColorTestPreview.kt index 9dd2c563d8..ae3722612b 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ColorTestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ColorTestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ComponentTestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ComponentTestPreview.kt similarity index 95% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ComponentTestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ComponentTestPreview.kt index 598acfadb0..e74cb4d59b 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ComponentTestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ComponentTestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.runtime.Composable import com.airbnb.android.showkase.models.ShowkaseBrowserComponent diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt similarity index 97% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt index e05cb7c971..1c26565acf 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import android.content.res.Configuration import android.os.LocaleList @@ -37,7 +37,6 @@ import com.airbnb.android.showkase.models.Showkase import com.google.testing.junit.testparameterinjector.TestParameter import com.google.testing.junit.testparameterinjector.TestParameterInjector import io.element.android.libraries.designsystem.ElementXTheme -import io.element.android.libraries.tests.uitests.getMetadata import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TestPreview.kt similarity index 94% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TestPreview.kt index 6398a418bf..6892665e1a 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.runtime.Composable diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TypographyTestPreview.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TypographyTestPreview.kt similarity index 97% rename from tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TypographyTestPreview.kt rename to tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TypographyTestPreview.kt index 0ff497d5d8..80f27c25a0 100644 --- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/TypographyTestPreview.kt +++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/TypographyTestPreview.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.tests.uitests +package io.element.android.tests.uitests import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding From 718b37a4ebcdaccc535e3eb75e457516655b9f6b Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 18:52:59 +0100 Subject: [PATCH 16/61] Finish removing x. from packages (keep it in app module for now) --- .../android/{x => }/anvilannotations/ContributesNode.kt | 2 +- .../{x => }/anvilcodegen/ContributesNodeCodeGenerator.kt | 4 ++-- .../element/android/features/login/ExampleInstrumentedTest.kt | 2 +- .../android/features/login/changeserver/ChangeServerNode.kt | 2 +- .../io/element/android/features/login/root/LoginRootNode.kt | 2 +- .../android/features/logout/ExampleInstrumentedTest.kt | 2 +- .../android/features/messages/ExampleInstrumentedTest.kt | 2 +- .../io/element/android/features/messages/MessagesNode.kt | 2 +- .../element/android/features/login/ExampleInstrumentedTest.kt | 2 +- .../android/features/preferences/ExampleInstrumentedTest.kt | 2 +- .../android/features/preferences/root/PreferencesRootNode.kt | 2 +- .../android/features/rageshake/bugreport/BugReportNode.kt | 2 +- .../android/features/roomlist/ExampleInstrumentedTest.kt | 2 +- .../io/element/android/features/roomlist/RoomListNode.kt | 2 +- .../io/element/android/features/template/TemplateNode.kt | 2 +- libraries/elementresources/build.gradle.kts | 2 +- .../android/libraries/textcomposer/RichTextComposerLayout.kt | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) rename anvilannotations/src/main/kotlin/io/element/android/{x => }/anvilannotations/ContributesNode.kt (95%) rename anvilcodegen/src/main/kotlin/io/element/android/{x => }/anvilcodegen/ContributesNodeCodeGenerator.kt (98%) diff --git a/anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt similarity index 95% rename from anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt rename to anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt index 1367dc0dc7..cf9f2f3684 100644 --- a/anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt +++ b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.anvilannotations +package io.element.android.anvilannotations import kotlin.reflect.KClass diff --git a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt similarity index 98% rename from anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt rename to anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt index 895a6347fd..576a52df89 100644 --- a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt +++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalAnvilApi::class) -package io.element.android.x.anvilcodegen +package io.element.android.anvilcodegen import com.google.auto.service.AutoService import com.squareup.anvil.annotations.ContributesTo @@ -46,7 +46,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.multibindings.IntoMap -import io.element.android.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile diff --git a/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt index 3fc011ddf8..4ad31d222f 100644 --- a/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt +++ b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.login.test", appContext.packageName) + assertEquals("io.element.android.features.login.test", appContext.packageName) } } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt index 01163664b6..4cec3ad0be 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt @@ -25,7 +25,7 @@ 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.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.AppScope diff --git a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index 089f629e6b..87a1c3d248 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.core.compose.OnLifecycleEvent import io.element.android.libraries.di.AppScope diff --git a/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt index 5fea153e9f..1316448d00 100644 --- a/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt +++ b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.login.test", appContext.packageName) + assertEquals("io.element.android.features.login.test", appContext.packageName) } } diff --git a/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt index 30e9a85c26..97ef4f5a3b 100644 --- a/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt +++ b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.messages.test", appContext.packageName) + assertEquals("io.element.android.features.messages.test", appContext.packageName) } } diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt index dbbf1a1d8a..ff8776b6aa 100644 --- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt +++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt @@ -25,7 +25,7 @@ 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.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.RoomScope diff --git a/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt index 3fc011ddf8..4ad31d222f 100644 --- a/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt +++ b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.login.test", appContext.packageName) + assertEquals("io.element.android.features.login.test", appContext.packageName) } } diff --git a/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt index dc6a244d21..3b0a6ee9ae 100644 --- a/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt +++ b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.preferences.test", appContext.packageName) + assertEquals("io.element.android.features.preferences.test", appContext.packageName) } } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt index ae48353d78..b1ef84646b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt @@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.SessionScope diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt index 5e620310df..b7a32c9b05 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt @@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.AppScope diff --git a/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt index b0cd0e20f1..e66201078b 100644 --- a/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt +++ b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt @@ -33,6 +33,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.x.features.roomlist.test", appContext.packageName) + assertEquals("io.element.android.features.roomlist.test", appContext.packageName) } } diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt index b299658643..4e153a2328 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt @@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import io.element.android.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.SessionScope import io.element.android.libraries.matrix.core.RoomId 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 4d907023c8..6e08d6887d 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 @@ -26,7 +26,7 @@ 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.x.anvilannotations.ContributesNode +import io.element.android.anvilannotations.ContributesNode 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/elementresources/build.gradle.kts b/libraries/elementresources/build.gradle.kts index 3202b47a8d..b61593b700 100644 --- a/libraries/elementresources/build.gradle.kts +++ b/libraries/elementresources/build.gradle.kts @@ -19,7 +19,7 @@ plugins { } android { - namespace = "io.element.android.x.element.resources" + namespace = "io.element.android.element.resources" } dependencies { diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index f58e0634eb..86c1084f5d 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -50,7 +50,7 @@ import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuBut import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction -import io.element.android.x.element.resources.R as ElementR +import io.element.android.element.resources.R as ElementR import io.element.android.libraries.ui.strings.R as StringR // Imported from Element Android From 46e58fe64d6837c101ee0f6e52227bc40f1f0753 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 19:13:44 +0100 Subject: [PATCH 17/61] enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") --- anvilcodegen/build.gradle.kts | 2 +- app/build.gradle.kts | 6 +++--- features/login/build.gradle.kts | 20 ++++++++++---------- features/logout/build.gradle.kts | 18 +++++++++--------- features/messages/build.gradle.kts | 18 +++++++++--------- features/onboarding/build.gradle.kts | 12 ++++++------ features/preferences/build.gradle.kts | 22 +++++++++++----------- features/rageshake/build.gradle.kts | 16 ++++++++-------- features/roomlist/build.gradle.kts | 22 +++++++++++----------- features/template/build.gradle.kts | 22 +++++++++++----------- libraries/architecture/build.gradle.kts | 2 +- libraries/designsystem/build.gradle.kts | 4 ++-- libraries/matrix/build.gradle.kts | 6 +++--- libraries/matrixtest/build.gradle.kts | 2 +- libraries/matrixui/build.gradle.kts | 14 +++++++------- libraries/textcomposer/build.gradle.kts | 8 ++++---- settings.gradle.kts | 3 +++ 17 files changed, 100 insertions(+), 97 deletions(-) diff --git a/anvilcodegen/build.gradle.kts b/anvilcodegen/build.gradle.kts index da817a5edb..e8b6ab285c 100644 --- a/anvilcodegen/build.gradle.kts +++ b/anvilcodegen/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - implementation(project(":anvilannotations")) + implementation(projects.anvilannotations) api(libs.anvil.compiler.api) implementation(libs.anvil.compiler.utils) implementation("com.squareup:kotlinpoet:1.12.0") diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a3818bf972..41029596ab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -164,9 +164,9 @@ knit { dependencies { allLibraries() allFeatures() - implementation(project(":tests:uitests")) - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) + implementation(projects.tests.uitests) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) // https://developer.android.com/studio/write/java8-support#library-desugaring-versions coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 1f424d86d5..13d386671c 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -32,17 +32,17 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:testtags")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.testtags) implementation(libs.appyx.core) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) diff --git a/features/logout/build.gradle.kts b/features/logout/build.gradle.kts index e022a4cb87..71f4f78df4 100644 --- a/features/logout/build.gradle.kts +++ b/features/logout/build.gradle.kts @@ -31,15 +31,15 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index 02c0a245d8..f11c076f27 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -31,15 +31,15 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:textcomposer")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.textcomposer) implementation(libs.appyx.core) implementation(libs.coil.compose) implementation(libs.datetime) diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index 24b32d6ba1..00f4503666 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -26,12 +26,12 @@ android { } dependencies { - implementation(project(":libraries:core")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:testtags")) + implementation(projects.libraries.core) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.architecture) + implementation(projects.libraries.testtags) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) implementation(libs.appyx.core) diff --git a/features/preferences/build.gradle.kts b/features/preferences/build.gradle.kts index 894087b50e..10b3f4917d 100644 --- a/features/preferences/build.gradle.kts +++ b/features/preferences/build.gradle.kts @@ -32,17 +32,17 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrixui")) - implementation(project(":features:rageshake")) - implementation(project(":features:logout")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.libraries.matrixui) + implementation(projects.features.rageshake) + implementation(projects.features.logout) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.datetime) implementation(libs.accompanist.placeholder) testImplementation(libs.test.junit) diff --git a/features/rageshake/build.gradle.kts b/features/rageshake/build.gradle.kts index fa2aee4b2c..16f529db26 100644 --- a/features/rageshake/build.gradle.kts +++ b/features/rageshake/build.gradle.kts @@ -32,14 +32,14 @@ anvil { } dependencies { - implementation(project(":libraries:core")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":anvilannotations")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.core) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.anvilannotations) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.squareup.seismic) implementation(libs.androidx.datastore.preferences) implementation(libs.coil) diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index fa0b3c4661..2d23e891cc 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -31,18 +31,18 @@ anvil { } dependencies { - anvil(project(":anvilcodegen")) - implementation(project(":anvilannotations")) + anvil(projects.anvilcodegen) + implementation(projects.anvilannotations) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) implementation(libs.appyx.core) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.datetime) implementation(libs.accompanist.placeholder) @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(project(":libraries:matrixtest")) + testImplementation(projects.libraries.matrixtest) androidTestImplementation(libs.test.junitext) diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index f7a265e462..fea038bf14 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -32,17 +32,17 @@ anvil { } dependencies { - anvil(project(":anvilcodegen")) - implementation(project(":anvilannotations")) + anvil(projects.anvilcodegen) + implementation(projects.anvilannotations) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.appyx.core) @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(project(":libraries:matrixtest")) + testImplementation(projects.libraries.matrixtest) androidTestImplementation(libs.test.junitext) diff --git a/libraries/architecture/build.gradle.kts b/libraries/architecture/build.gradle.kts index 962c6021be..9c4ae9e3ac 100644 --- a/libraries/architecture/build.gradle.kts +++ b/libraries/architecture/build.gradle.kts @@ -25,7 +25,7 @@ android { } dependencies { - api(project(":libraries:di")) + api(projects.libraries.di) api(libs.dagger) api(libs.appyx.core) api(libs.molecule.runtime) diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts index 00f635eb69..45430e5d82 100644 --- a/libraries/designsystem/build.gradle.kts +++ b/libraries/designsystem/build.gradle.kts @@ -28,8 +28,8 @@ android { // Should not be there, but this is a POC implementation(libs.coil.compose) implementation(libs.accompanist.systemui) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) } } diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts index fcf2c78eea..6db92e02f3 100644 --- a/libraries/matrix/build.gradle.kts +++ b/libraries/matrix/build.gradle.kts @@ -31,10 +31,10 @@ anvil { } dependencies { - api(project(":libraries:rustsdk")) - implementation(project(":libraries:di")) + api(projects.libraries.rustsdk) + implementation(projects.libraries.di) implementation(libs.dagger) - implementation(project(":libraries:core")) + implementation(projects.libraries.core) implementation("net.java.dev.jna:jna:5.13.0@aar") implementation(libs.androidx.datastore.preferences) implementation(libs.serialization.json) diff --git a/libraries/matrixtest/build.gradle.kts b/libraries/matrixtest/build.gradle.kts index 5bb1e92df3..39641e7eed 100644 --- a/libraries/matrixtest/build.gradle.kts +++ b/libraries/matrixtest/build.gradle.kts @@ -25,6 +25,6 @@ android { } dependencies { - api(project(":libraries:matrix")) + api(projects.libraries.matrix) api(libs.coroutines.core) } diff --git a/libraries/matrixui/build.gradle.kts b/libraries/matrixui/build.gradle.kts index 2187a36b07..38004098ca 100644 --- a/libraries/matrixui/build.gradle.kts +++ b/libraries/matrixui/build.gradle.kts @@ -30,12 +30,12 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:core")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.core) implementation(libs.coil.compose) } diff --git a/libraries/textcomposer/build.gradle.kts b/libraries/textcomposer/build.gradle.kts index 5e84aca979..040a265f80 100644 --- a/libraries/textcomposer/build.gradle.kts +++ b/libraries/textcomposer/build.gradle.kts @@ -30,10 +30,10 @@ android { } dependencies { - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrix")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) + implementation(projects.libraries.core) + implementation(projects.libraries.matrix) implementation(libs.wysiwyg) implementation(libs.androidx.constraintlayout) implementation("com.google.android.material:material:1.7.0") diff --git a/settings.gradle.kts b/settings.gradle.kts index 22dc8447ad..669bac4635 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,6 +32,9 @@ dependencyResolutionManagement { } } } + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + rootProject.name = "ElementX" include(":app") include(":libraries:core") From 502831cd714ae464f331fdbc5bca165a43f96053 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 22:11:03 +0000 Subject: [PATCH 18/61] Bump mobile-dev-inc/action-maestro-cloud from 1.1.1 to 1.2.2 Bumps [mobile-dev-inc/action-maestro-cloud](https://github.com/mobile-dev-inc/action-maestro-cloud) from 1.1.1 to 1.2.2. - [Release notes](https://github.com/mobile-dev-inc/action-maestro-cloud/releases) - [Commits](https://github.com/mobile-dev-inc/action-maestro-cloud/compare/v1.1.1...v1.2.2) --- updated-dependencies: - dependency-name: mobile-dev-inc/action-maestro-cloud dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/maestro.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maestro.yml b/.github/workflows/maestro.yml index 0b9939b133..7fc7a9d322 100644 --- a/.github/workflows/maestro.yml +++ b/.github/workflows/maestro.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - name: Assemble debug APK run: ./gradlew assembleDebug $CI_GRADLE_ARG_PROPERTIES - - uses: mobile-dev-inc/action-maestro-cloud@v1.1.1 + - uses: mobile-dev-inc/action-maestro-cloud@v1.2.2 with: api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} app-file: app/build/outputs/apk/debug/app-debug.apk From 23f8731585e622d2a6bd5f93eaeb96227bbe0418 Mon Sep 17 00:00:00 2001 From: bmarty Date: Sat, 21 Jan 2023 06:05:45 +0000 Subject: [PATCH 19/61] Import strings from Element Android --- libraries/ui-strings/src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/ui-strings/src/main/res/values/strings.xml b/libraries/ui-strings/src/main/res/values/strings.xml index 38aecaf215..8b51a6f95b 100644 --- a/libraries/ui-strings/src/main/res/values/strings.xml +++ b/libraries/ui-strings/src/main/res/values/strings.xml @@ -3097,6 +3097,8 @@ Cannot play this voice message Cannot record a voice message Cannot reply or edit while voice message is active + Cannot start voice message + You can’t start a voice message as you are currently recording a live broadcast. Please end your live broadcast in order to start recording a voice message Voice Message (%1$s) %1$s, %2$s, %3$s From c7b58be97073892ef3d772f032a6b45185f97294 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 23 Jan 2023 14:27:32 +0100 Subject: [PATCH 20/61] Use dedicated GH project to host rageshakes, so no need to add label of prefix. --- .../features/rageshake/reporter/BugReporter.kt | 11 ++++------- features/rageshake/src/main/res/values/strings.xml | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) 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 3e495d613f..82e777ab43 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 @@ -235,10 +235,10 @@ class BugReporter @Inject constructor( if (!mIsCancelled) { val text = when (reportType) { - ReportType.BUG_REPORT -> "[ElementX] $bugDescription" - ReportType.SUGGESTION -> "[ElementX] [Suggestion] $bugDescription" - ReportType.SPACE_BETA_FEEDBACK -> "[ElementX] [spaces-feedback] $bugDescription" - ReportType.THREADS_BETA_FEEDBACK -> "[ElementX] [threads-feedback] $bugDescription" + ReportType.BUG_REPORT -> bugDescription + ReportType.SUGGESTION -> "[Suggestion] $bugDescription" + ReportType.SPACE_BETA_FEEDBACK -> "[spaces-feedback] $bugDescription" + ReportType.THREADS_BETA_FEEDBACK -> "[threads-feedback] $bugDescription" ReportType.AUTO_UISI_SENDER, ReportType.AUTO_UISI -> bugDescription } @@ -298,9 +298,6 @@ class BugReporter @Inject constructor( // builder.addFormDataPart("label", buildMeta.flavorDescription) // builder.addFormDataPart("label", buildMeta.gitBranchName) - // Special for ElementX - builder.addFormDataPart("label", "[ElementX]") - // Possible values for BuildConfig.BUILD_TYPE: "debug", "nightly", "release". // builder.addFormDataPart("label", BuildConfig.BUILD_TYPE) diff --git a/features/rageshake/src/main/res/values/strings.xml b/features/rageshake/src/main/res/values/strings.xml index 846f0ca048..48eff44d57 100644 --- a/features/rageshake/src/main/res/values/strings.xml +++ b/features/rageshake/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ https://riot.im/bugreports/submit - riot-android + element-x-android element-auto-uisi From dd4e78c72a70b098bf1b5c8ffa4122f9b954b222 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 23 Jan 2023 14:40:31 +0100 Subject: [PATCH 21/61] Log app version at startup --- .../element/android/x/ElementXApplication.kt | 2 + .../kotlin/io/element/android/x/info/Logs.kt | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 app/src/main/kotlin/io/element/android/x/info/Logs.kt diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index a1168f4efb..cece6beb05 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -21,6 +21,7 @@ import androidx.startup.AppInitializer import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.AppComponent import io.element.android.x.di.DaggerAppComponent +import io.element.android.x.info.Logs import io.element.android.x.initializer.CrashInitializer import io.element.android.x.initializer.MatrixInitializer import io.element.android.x.initializer.TimberInitializer @@ -40,5 +41,6 @@ class ElementXApplication : Application(), DaggerComponentOwner { initializeComponent(TimberInitializer::class.java) initializeComponent(MatrixInitializer::class.java) } + Logs().logApplicationInfo() } } 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 new file mode 100644 index 0000000000..285831984a --- /dev/null +++ b/app/src/main/kotlin/io/element/android/x/info/Logs.kt @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.info + +import io.element.android.x.BuildConfig +import timber.log.Timber +import java.text.SimpleDateFormat +import java.util.* + +class Logs { + fun logApplicationInfo() { + val appVersion = buildString { + append(BuildConfig.VERSION_NAME) + append(" (") + append(BuildConfig.VERSION_CODE) + append(") - ") + append(BuildConfig.BUILD_TYPE) + } + // TODO Get SDK version somehow + val sdkVersion = "SDK VERSION (TODO)" + val date = SimpleDateFormat("MM-dd HH:mm:ss.SSSZ", Locale.US).format(Date()) + + Timber.d("----------------------------------------------------------------") + Timber.d("----------------------------------------------------------------") + Timber.d(" Application version: $appVersion") + Timber.d(" SDK version: $sdkVersion") + Timber.d(" Local time: $date") + Timber.d("----------------------------------------------------------------") + Timber.d("----------------------------------------------------------------\n\n\n\n") + } +} From 7dbfa07d51244afda5034f6440c1af4f67761093 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 23 Jan 2023 14:52:00 +0100 Subject: [PATCH 22/61] This java class must be defined in the `java` folder. --- .../features/rageshake/reporter/BugReporterMultipartBody.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename features/rageshake/src/main/{kotlin => java}/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java (100%) diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java b/features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java similarity index 100% rename from features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java rename to features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java From 848fbb4765882d8e2d3fea6af6bbd7697ec0d9e1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Jan 2023 09:43:22 +0100 Subject: [PATCH 23/61] No need to declare a class `Logs`. --- .../element/android/x/ElementXApplication.kt | 4 +- .../kotlin/io/element/android/x/info/Logs.kt | 38 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index cece6beb05..76cf15e660 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -21,7 +21,7 @@ import androidx.startup.AppInitializer import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.x.di.AppComponent import io.element.android.x.di.DaggerAppComponent -import io.element.android.x.info.Logs +import io.element.android.x.info.logApplicationInfo import io.element.android.x.initializer.CrashInitializer import io.element.android.x.initializer.MatrixInitializer import io.element.android.x.initializer.TimberInitializer @@ -41,6 +41,6 @@ class ElementXApplication : Application(), DaggerComponentOwner { initializeComponent(TimberInitializer::class.java) initializeComponent(MatrixInitializer::class.java) } - Logs().logApplicationInfo() + logApplicationInfo() } } 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 285831984a..882746d029 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 @@ -21,25 +21,23 @@ import timber.log.Timber import java.text.SimpleDateFormat import java.util.* -class Logs { - fun logApplicationInfo() { - val appVersion = buildString { - append(BuildConfig.VERSION_NAME) - append(" (") - append(BuildConfig.VERSION_CODE) - append(") - ") - append(BuildConfig.BUILD_TYPE) - } - // TODO Get SDK version somehow - val sdkVersion = "SDK VERSION (TODO)" - val date = SimpleDateFormat("MM-dd HH:mm:ss.SSSZ", Locale.US).format(Date()) - - Timber.d("----------------------------------------------------------------") - Timber.d("----------------------------------------------------------------") - Timber.d(" Application version: $appVersion") - Timber.d(" SDK version: $sdkVersion") - Timber.d(" Local time: $date") - Timber.d("----------------------------------------------------------------") - Timber.d("----------------------------------------------------------------\n\n\n\n") +fun logApplicationInfo() { + val appVersion = buildString { + append(BuildConfig.VERSION_NAME) + append(" (") + append(BuildConfig.VERSION_CODE) + append(") - ") + append(BuildConfig.BUILD_TYPE) } + // TODO Get SDK version somehow + val sdkVersion = "SDK VERSION (TODO)" + val date = SimpleDateFormat("MM-dd HH:mm:ss.SSSZ", Locale.US).format(Date()) + + Timber.d("----------------------------------------------------------------") + Timber.d("----------------------------------------------------------------") + Timber.d(" Application version: $appVersion") + Timber.d(" SDK version: $sdkVersion") + Timber.d(" Local time: $date") + Timber.d("----------------------------------------------------------------") + Timber.d("----------------------------------------------------------------\n\n\n\n") } From 1319be177a2ee287ca5ab6cf62a4349f9497fa63 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Jan 2023 09:45:11 +0100 Subject: [PATCH 24/61] Use the `modifier` parameter. --- .../io/element/android/x/node/LoggedInFlowNode.kt | 11 +++++++---- .../io/element/android/x/node/NotLoggedInFlowNode.kt | 5 ++++- .../kotlin/io/element/android/x/node/RoomFlowNode.kt | 9 ++++++--- .../kotlin/io/element/android/x/node/RootFlowNode.kt | 1 + .../element/android/features/login/LoginFlowNode.kt | 5 ++++- .../features/login/changeserver/ChangeServerNode.kt | 1 + .../android/features/login/root/LoginRootNode.kt | 1 + .../features/preferences/PreferencesFlowNode.kt | 5 ++++- .../features/preferences/root/PreferencesRootNode.kt | 1 + .../element/android/features/roomlist/RoomListNode.kt | 1 + 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 774b42b220..22f2f272db 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -32,16 +32,16 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.node import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push +import io.element.android.features.preferences.PreferencesFlowNode +import io.element.android.features.roomlist.RoomListNode import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner -import io.element.android.x.di.SessionComponent -import io.element.android.features.preferences.PreferencesFlowNode -import io.element.android.features.roomlist.RoomListNode 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.ui.di.MatrixUIBindings +import io.element.android.x.di.SessionComponent import kotlinx.parcelize.Parcelize class LoggedInFlowNode( @@ -124,6 +124,9 @@ class LoggedInFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index 91a85c1e85..a5a20b2a2f 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -71,6 +71,9 @@ class NotLoggedInFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index 0048b143cf..bae60841d6 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -25,12 +25,12 @@ import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack +import io.element.android.features.messages.MessagesNode import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner -import io.element.android.x.di.RoomComponent -import io.element.android.features.messages.MessagesNode import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.x.di.RoomComponent import kotlinx.parcelize.Parcelize import timber.log.Timber @@ -70,6 +70,9 @@ class RoomFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index cf7346f801..3bf65dc7ca 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -107,6 +107,7 @@ class RootFlowNode( val state by presenterConnector.stateFlow.collectAsState() RootView( state = state, + modifier = modifier, onOpenBugReport = this::onOpenBugReport, ) { Children(navModel = backstack) diff --git a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index ae0f6268a0..a849016d79 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -64,6 +64,9 @@ class LoginFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt index 4cec3ad0be..bfd7006d21 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt @@ -47,6 +47,7 @@ class ChangeServerNode @AssistedInject constructor( val state by presenterConnector.stateFlow.collectAsState() ChangeServerView( state = state, + modifier = modifier, onChangeServerSuccess = this::onSuccess, ) } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index 87a1c3d248..f63277c32b 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -60,6 +60,7 @@ class LoginRootNode @AssistedInject constructor( } LoginRootScreen( state = state, + modifier = modifier, onChangeServer = this::onChangeHomeServer, ) } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index a3e9e4e283..aed8a1ca81 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -59,6 +59,9 @@ class PreferencesFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt index b1ef84646b..fcfabb4cd7 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt @@ -52,6 +52,7 @@ class PreferencesRootNode @AssistedInject constructor( val state by presenterConnector.stateFlow.collectAsState() PreferencesRootView( state = state, + modifier = modifier, onBackPressed = this::navigateUp, onOpenRageShake = this::onOpenBugReport ) diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt index 4e153a2328..f492e09871 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt @@ -58,6 +58,7 @@ class RoomListNode @AssistedInject constructor( val state by connector.stateFlow.collectAsState() RoomListView( state = state, + modifier = modifier, onRoomClicked = this::onRoomClicked, onOpenSettings = this::onOpenSettings ) From 908b31af818f599d4fb5f439f27c259cb009347c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Jan 2023 09:48:35 +0100 Subject: [PATCH 25/61] Naming convention and no need for a `val` for `presenter` --- app/src/main/kotlin/io/element/android/x/MainActivity.kt | 2 +- app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt | 4 ++-- .../android/features/login/changeserver/ChangeServerNode.kt | 2 +- .../io/element/android/features/login/root/LoginRootNode.kt | 2 +- .../android/features/preferences/root/PreferencesRootNode.kt | 2 +- 5 files changed, 6 insertions(+), 6 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 364ab6396d..9a3f7951e8 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -48,7 +48,7 @@ class MainActivity : NodeComponentActivity() { buildContext = it, appComponentOwner = applicationContext as DaggerComponentOwner, authenticationService = appBindings.authenticationService(), - rootPresenter = appBindings.rootPresenter() + presenter = appBindings.rootPresenter() ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index 3bf65dc7ca..04cf3c7d9c 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -60,7 +60,7 @@ class RootFlowNode( ), private val appComponentOwner: DaggerComponentOwner, private val authenticationService: MatrixAuthenticationService, - rootPresenter: RootPresenter + presenter: RootPresenter ) : ParentNode( navModel = backstack, @@ -70,7 +70,7 @@ class RootFlowNode( DaggerComponentOwner by appComponentOwner { private val matrixClientsHolder = ConcurrentHashMap() - private val presenterConnector = presenterConnector(rootPresenter) + private val presenterConnector = presenterConnector(presenter) override fun onBuilt() { super.onBuilt() diff --git a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt index bfd7006d21..b0c8b96ed5 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt @@ -33,7 +33,7 @@ import io.element.android.libraries.di.AppScope class ChangeServerNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, - private val presenter: ChangeServerPresenter, + presenter: ChangeServerPresenter, ) : Node(buildContext, plugins = plugins) { private val presenterConnector = presenterConnector(presenter) diff --git a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index f63277c32b..fd8fd55349 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -36,7 +36,7 @@ import io.element.android.libraries.di.AppScope class LoginRootNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, - private val presenter: LoginRootPresenter, + presenter: LoginRootPresenter, ) : Node(buildContext, plugins = plugins) { private val presenterConnector = presenterConnector(presenter) diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt index fcfabb4cd7..92688e5b32 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt @@ -34,7 +34,7 @@ import io.element.android.libraries.di.SessionScope class PreferencesRootNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, - private val presenter: PreferencesRootPresenter, + presenter: PreferencesRootPresenter, ) : Node(buildContext, plugins = plugins) { interface Callback : Plugin { From 7e2fd638e46e3970940cceb197d1130db44e8e11 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Jan 2023 16:50:00 +0100 Subject: [PATCH 26/61] Animation between screens --- .../android/x/node/LoggedInFlowNode.kt | 3 ++ .../android/x/node/NotLoggedInFlowNode.kt | 3 ++ .../io/element/android/x/node/RootFlowNode.kt | 9 ++++-- .../android/features/login/LoginFlowNode.kt | 5 ++- .../preferences/PreferencesFlowNode.kt | 4 ++- .../animation/ScreenTransition.kt | 31 +++++++++++++++++++ 6 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 22f2f272db..cb7bed5d84 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -34,6 +34,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.preferences.PreferencesFlowNode import io.element.android.features.roomlist.RoomListNode +import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner @@ -127,6 +128,8 @@ class LoggedInFlowNode( Children( navModel = backstack, modifier = modifier, + // Animate navigation to settings and to a room + transitionHandler = getDefaultTransitionHandler(), ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index a5a20b2a2f..b9ca33483e 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -29,6 +29,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.replace import io.element.android.features.login.LoginFlowNode import io.element.android.features.onboarding.OnBoardingScreen +import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler import kotlinx.parcelize.Parcelize import timber.log.Timber @@ -74,6 +75,8 @@ class NotLoggedInFlowNode( Children( navModel = backstack, modifier = modifier, + // Animate navigation to login screen + transitionHandler = getDefaultTransitionHandler(), ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index 04cf3c7d9c..ccb63965f1 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -36,10 +36,11 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.newRoot import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push +import io.element.android.features.rageshake.bugreport.BugReportNode +import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner -import io.element.android.features.rageshake.bugreport.BugReportNode import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.core.SessionId @@ -110,7 +111,11 @@ class RootFlowNode( modifier = modifier, onOpenBugReport = this::onOpenBugReport, ) { - Children(navModel = backstack) + Children( + navModel = backstack, + // Animate opening the bug report screen + transitionHandler = getDefaultTransitionHandler(), + ) } } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index a849016d79..8d5bab90d3 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -25,9 +25,10 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push -import io.element.android.libraries.architecture.createNode import io.element.android.features.login.changeserver.ChangeServerNode import io.element.android.features.login.root.LoginRootNode +import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.createNode import kotlinx.parcelize.Parcelize class LoginFlowNode( @@ -67,6 +68,8 @@ class LoginFlowNode( Children( navModel = backstack, modifier = modifier, + // Animate transition to change server screen + transitionHandler = getDefaultTransitionHandler(), ) } } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index aed8a1ca81..c87bb0e0d0 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -24,8 +24,9 @@ import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack -import io.element.android.libraries.architecture.createNode import io.element.android.features.preferences.root.PreferencesRootNode +import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.createNode import kotlinx.parcelize.Parcelize class PreferencesFlowNode( @@ -62,6 +63,7 @@ class PreferencesFlowNode( Children( navModel = backstack, modifier = modifier, + transitionHandler = getDefaultTransitionHandler() ) } } diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt new file mode 100644 index 0000000000..c777ebed02 --- /dev/null +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.architecture.animation + +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring +import androidx.compose.runtime.Composable +import com.bumble.appyx.core.navigation.transition.ModifierTransitionHandler +import com.bumble.appyx.navmodel.backstack.BackStack +import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackSlider + +@Composable +fun getDefaultTransitionHandler(): ModifierTransitionHandler { + return rememberBackstackSlider( + transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) }, + ) +} From 9cac97784edff8fd3cf3b8c9c8a7e5bc294223f5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Jan 2023 17:26:24 +0100 Subject: [PATCH 27/61] Better to go back to onboarding. --- .../kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index b9ca33483e..774a075db2 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -26,7 +26,7 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.node import com.bumble.appyx.navmodel.backstack.BackStack -import com.bumble.appyx.navmodel.backstack.operation.replace +import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.login.LoginFlowNode import io.element.android.features.onboarding.OnBoardingScreen import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler @@ -63,7 +63,7 @@ class NotLoggedInFlowNode( return when (navTarget) { NavTarget.OnBoarding -> node(buildContext) { OnBoardingScreen( - onSignIn = { backstack.replace(NavTarget.LoginFlow) } + onSignIn = { backstack.push(NavTarget.LoginFlow) } ) } NavTarget.LoginFlow -> LoginFlowNode(buildContext) From 27bf42c5f25b6d43844a91a6ed20fde2d7ea85c9 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 24 Jan 2023 17:38:57 +0100 Subject: [PATCH 28/61] Change/move some gradle modules to be better separated. Let core module be a kotlin lib. --- .idea/compiler.xml | 4 +- .idea/misc.xml | 2 +- features/login/build.gradle.kts | 2 - .../login/changeserver/ChangeServerView.kt | 2 +- .../features/login/root/LoginRootNode.kt | 2 +- .../features/login/root/LoginRootScreen.kt | 2 +- features/logout/build.gradle.kts | 1 - features/messages/build.gradle.kts | 2 - .../android/features/messages/MessagesView.kt | 2 +- .../messages/timeline/TimelineView.kt | 2 +- features/onboarding/build.gradle.kts | 1 - features/preferences/build.gradle.kts | 1 - features/rageshake/build.gradle.kts | 6 +- .../rageshake/bugreport/BugReportView.kt | 8 +- .../crash/ui/CrashDetectionScreen.kt | 7 +- .../detection/RageshakeDetectionEvents.kt | 2 +- .../detection/RageshakeDetectionPresenter.kt | 4 +- .../detection/RageshakeDetectionView.kt | 15 ++- .../rageshake/logs/VectorFileLogger.kt | 18 +-- .../rageshake/reporter/BugReporter.kt | 2 +- .../rageshake}/screenshot/Screenshot.kt | 4 +- .../rageshake/screenshot/ScreenshotHolder.kt | 2 +- features/roomlist/build.gradle.kts | 2 - .../android/features/roomlist/RoomListView.kt | 7 +- .../roomlist/components/RoomListTopBar.kt | 9 +- features/template/build.gradle.kts | 3 - gradle/libs.versions.toml | 1 + libraries/androidutils/.gitignore | 1 + libraries/androidutils/build.gradle.kts | 61 ++++++++++ libraries/androidutils/consumer-rules.pro | 0 libraries/androidutils/proguard-rules.pro | 21 ++++ .../androidutils/ExampleInstrumentedTest.kt | 40 +++++++ .../src/main/AndroidManifest.xml | 4 +- .../libraries/androidutils}/bitmap/Bitmap.kt | 2 +- .../androidutils/extensions/isEmail.kt | 24 ++++ .../androidutils}/file/compressFile.kt | 6 +- .../androidutils}/hardware/vibrator.kt | 2 +- .../androidutils}/ui/DimensionConverter.kt | 2 +- .../libraries/androidutils}/ui/View.kt | 2 +- .../src/main/res/values-ldrtl/integers.xml | 0 .../src/main/res/values/integers.xml | 0 .../libraries/androidutils/ExampleUnitTest.kt | 33 ++++++ libraries/core/build.gradle.kts | 15 ++- .../core/coroutine/CoroutineDispatchers.kt | 2 +- .../core/coroutine/TimingOperators.kt | 104 ------------------ .../android/libraries/core/coroutine/pmap.kt | 2 +- .../android/libraries/core/data/Try.kt | 8 +- .../core/extensions/BasicExtensions.kt | 8 -- libraries/coroutines/.gitignore | 1 + libraries/coroutines/build.gradle.kts | 30 +++++ .../components/form}/TextFieldLocalState.kt | 4 +- .../components/keyboard}/Keyboard.kt | 4 +- .../designsystem/utils}/LogCompositions.kt | 4 +- .../designsystem/utils}/OnLifecycleEvent.kt | 4 +- .../utils}/PairCombinedPreviewParameter.kt | 4 +- .../libraries/matrix/RustMatrixClient.kt | 1 - libraries/textcomposer/build.gradle.kts | 1 + .../textcomposer/RichTextComposerLayout.kt | 12 +- settings.gradle.kts | 1 + 59 files changed, 314 insertions(+), 202 deletions(-) rename {libraries/core/src/main/kotlin/io/element/android/libraries/core => features/rageshake/src/main/kotlin/io/element/android/features/rageshake}/screenshot/Screenshot.kt (96%) create mode 100644 libraries/androidutils/.gitignore create mode 100644 libraries/androidutils/build.gradle.kts create mode 100644 libraries/androidutils/consumer-rules.pro create mode 100644 libraries/androidutils/proguard-rules.pro create mode 100644 libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt rename libraries/{core => androidutils}/src/main/AndroidManifest.xml (95%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core => androidutils/src/main/kotlin/io/element/android/libraries/androidutils}/bitmap/Bitmap.kt (93%) create mode 100644 libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/extensions/isEmail.kt rename libraries/{core/src/main/kotlin/io/element/android/libraries/core => androidutils/src/main/kotlin/io/element/android/libraries/androidutils}/file/compressFile.kt (93%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core => androidutils/src/main/kotlin/io/element/android/libraries/androidutils}/hardware/vibrator.kt (95%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core => androidutils/src/main/kotlin/io/element/android/libraries/androidutils}/ui/DimensionConverter.kt (96%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core => androidutils/src/main/kotlin/io/element/android/libraries/androidutils}/ui/View.kt (95%) rename libraries/{core => androidutils}/src/main/res/values-ldrtl/integers.xml (100%) rename libraries/{core => androidutils}/src/main/res/values/integers.xml (100%) create mode 100644 libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt delete mode 100644 libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt create mode 100644 libraries/coroutines/.gitignore create mode 100644 libraries/coroutines/build.gradle.kts rename libraries/{core/src/main/kotlin/io/element/android/libraries/core/compose => designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form}/TextFieldLocalState.kt (89%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core/compose => designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard}/Keyboard.kt (93%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core/compose => designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils}/LogCompositions.kt (91%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core/compose => designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils}/OnLifecycleEvent.kt (94%) rename libraries/{core/src/main/kotlin/io/element/android/libraries/core/compose => designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils}/PairCombinedPreviewParameter.kt (91%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8a46..7d1c62f24e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,8 @@ - + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 54d5acd7d7..55ded342f7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 13d386671c..c181d3b75e 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -34,14 +34,12 @@ anvil { dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) - implementation(projects.libraries.di) implementation(projects.libraries.core) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix) implementation(projects.libraries.designsystem) implementation(projects.libraries.elementresources) implementation(projects.libraries.testtags) - implementation(libs.appyx.core) implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) 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 b0ddd10efd..ce9700c8af 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 @@ -53,7 +53,7 @@ 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.core.compose.textFieldState +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 diff --git a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index 87a1c3d248..6067171c46 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -29,7 +29,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.libraries.core.compose.OnLifecycleEvent +import io.element.android.libraries.designsystem.utils.OnLifecycleEvent import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) 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 04d8a474e2..c10a4ee454 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,7 +58,7 @@ 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.core.compose.textFieldState +import io.element.android.libraries.designsystem.components.form.textFieldState import io.element.android.features.login.error.loginError import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag diff --git a/features/logout/build.gradle.kts b/features/logout/build.gradle.kts index 71f4f78df4..e2df3becf4 100644 --- a/features/logout/build.gradle.kts +++ b/features/logout/build.gradle.kts @@ -33,7 +33,6 @@ anvil { dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) - implementation(projects.libraries.di) implementation(projects.libraries.architecture) implementation(projects.libraries.core) implementation(projects.libraries.matrix) diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index f11c076f27..975c7b5c0e 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -33,14 +33,12 @@ anvil { dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) - implementation(projects.libraries.di) implementation(projects.libraries.core) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix) implementation(projects.libraries.matrixui) implementation(projects.libraries.designsystem) implementation(projects.libraries.textcomposer) - implementation(libs.appyx.core) implementation(libs.coil.compose) implementation(libs.datetime) implementation(libs.accompanist.flowlayout) 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 dbcf0011a4..b934c3ce67 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,7 +56,6 @@ 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.core.compose.LogCompositions 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 @@ -65,6 +64,7 @@ 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.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/timeline/TimelineView.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt index c7d424db2e..378f4c83ee 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,7 +58,7 @@ 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.core.compose.PairCombinedPreviewParameter +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.model.AggregatedReaction diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index 00f4503666..42282ffa8c 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -34,7 +34,6 @@ dependencies { implementation(projects.libraries.testtags) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) - implementation(libs.appyx.core) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) ksp(libs.showkase.processor) diff --git a/features/preferences/build.gradle.kts b/features/preferences/build.gradle.kts index 10b3f4917d..92dcb5b13d 100644 --- a/features/preferences/build.gradle.kts +++ b/features/preferences/build.gradle.kts @@ -34,7 +34,6 @@ anvil { dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) - implementation(projects.libraries.di) implementation(projects.libraries.architecture) implementation(projects.libraries.core) implementation(projects.libraries.matrixui) diff --git a/features/rageshake/build.gradle.kts b/features/rageshake/build.gradle.kts index 16f529db26..ecb333289b 100644 --- a/features/rageshake/build.gradle.kts +++ b/features/rageshake/build.gradle.kts @@ -32,11 +32,11 @@ anvil { } dependencies { - implementation(projects.libraries.core) anvil(projects.anvilcodegen) - implementation(projects.libraries.di) - implementation(projects.libraries.architecture) implementation(projects.anvilannotations) + implementation(projects.libraries.androidutils) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) implementation(projects.libraries.designsystem) implementation(projects.libraries.elementresources) implementation(projects.libraries.uiStrings) 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 ba209f69bb..c9ee533344 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,10 +51,10 @@ 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.core.compose.LogCompositions -import io.element.android.libraries.core.compose.textFieldState +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.utils.LogCompositions import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @@ -111,7 +111,9 @@ fun BugReportView( .padding(horizontal = 16.dp, vertical = 16.dp), fontSize = 16.sp, ) - var descriptionFieldState by textFieldState(stateValue = state.formState.description) + var descriptionFieldState by textFieldState( + stateValue = state.formState.description + ) Column( // modifier = Modifier.weight(1f), ) { diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt index b3b41ccd09..e3c58ab515 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -19,8 +19,8 @@ package io.element.android.features.rageshake.crash.ui import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog +import io.element.android.libraries.designsystem.utils.LogCompositions import io.element.android.libraries.ui.strings.R as StringR @Composable @@ -28,7 +28,10 @@ fun CrashDetectionView( state: CrashDetectionState, onOpenBugReport: () -> Unit = { }, ) { - LogCompositions(tag = "Crash", msg = "CrashDetectionScreen") + LogCompositions( + tag = "Crash", + msg = "CrashDetectionScreen" + ) fun onPopupDismissed() { state.eventSink(CrashDetectionEvents.ResetAllCrashData) diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt index 3030311674..9bc787d4ac 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt @@ -16,7 +16,7 @@ package io.element.android.features.rageshake.detection -import io.element.android.libraries.core.screenshot.ImageResult +import io.element.android.features.rageshake.screenshot.ImageResult sealed interface RageshakeDetectionEvents { object Dismiss : RageshakeDetectionEvents diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt index de6f338b27..c91d584021 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt @@ -23,12 +23,12 @@ 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.core.screenshot.ImageResult import io.element.android.features.rageshake.preferences.RageshakePreferencesEvents import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.features.rageshake.rageshake.RageShake +import io.element.android.features.rageshake.screenshot.ImageResult import io.element.android.features.rageshake.screenshot.ScreenshotHolder +import io.element.android.libraries.architecture.Presenter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber 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 a63c38d12e..6d7c5ee036 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 @@ -23,12 +23,12 @@ import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.lifecycle.Lifecycle -import io.element.android.libraries.core.compose.LogCompositions -import io.element.android.libraries.core.compose.OnLifecycleEvent -import io.element.android.libraries.core.hardware.vibrate -import io.element.android.libraries.core.screenshot.ImageResult -import io.element.android.libraries.core.screenshot.screenshot +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.ui.strings.R as StringR @Composable @@ -36,7 +36,10 @@ fun RageshakeDetectionView( state: RageshakeDetectionState, onOpenBugReport: () -> Unit = { }, ) { - LogCompositions(tag = "Rageshake", msg = "RageshakeDetectionScreen") + LogCompositions( + tag = "Rageshake", + msg = "RageshakeDetectionScreen" + ) val eventSink = state.eventSink val context = LocalContext.current OnLifecycleEvent { _, event -> diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt index b7443e90bb..9ed2bc9354 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt @@ -19,17 +19,17 @@ package io.element.android.features.rageshake.logs import android.content.Context import android.util.Log import io.element.android.libraries.core.data.tryOrNull +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import timber.log.Timber import java.io.File import java.io.PrintWriter import java.io.StringWriter import java.util.logging.FileHandler import java.util.logging.Level import java.util.logging.Logger -import kotlinx.coroutines.DelicateCoroutinesApi -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch -import timber.log.Timber /** * Will be planted in Timber. @@ -85,7 +85,9 @@ class VectorFileLogger( tryOrNull { file.delete() } } - fileHandler = tryOrNull("Failed to initialize FileLogger") { + fileHandler = tryOrNull( + onError = { Timber.e(it, "Failed to initialize FileLogger") } + ) { FileHandler( cacheDirectory.absolutePath + "/" + fileNamePrefix + ".%g.txt", maxLogSizeByte, @@ -134,7 +136,9 @@ class VectorFileLogger( * @return The list of files with logs. */ fun getLogFiles(): List { - return tryOrNull("## getLogFiles() failed") { + return tryOrNull( + onError = { Timber.e(it, "## getLogFiles() failed") } + ) { fileHandler ?.flush() ?.let { 0 until logRotationCount } 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 3e495d613f..8aedf7b9be 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 @@ -19,7 +19,7 @@ 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.core.file.compressFile +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 diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/Screenshot.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/Screenshot.kt index c1e1a3be80..803c51f2da 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/Screenshot.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.screenshot +package io.element.android.features.rageshake.screenshot import android.app.Activity import android.graphics.Bitmap diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt index d58a60dd4a..410c63b93a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt @@ -18,7 +18,7 @@ package io.element.android.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap -import io.element.android.libraries.core.bitmap.writeBitmap +import io.element.android.libraries.androidutils.bitmap.writeBitmap import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.SingleIn diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index 2d23e891cc..fc0402eafc 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -34,13 +34,11 @@ dependencies { anvil(projects.anvilcodegen) implementation(projects.anvilannotations) - implementation(projects.libraries.di) implementation(projects.libraries.core) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix) implementation(projects.libraries.matrixui) implementation(projects.libraries.designsystem) - implementation(libs.appyx.core) implementation(projects.libraries.elementresources) implementation(projects.libraries.uiStrings) implementation(libs.datetime) 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 5b807f0dd0..0e7d8f410b 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,7 +36,6 @@ 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.core.compose.LogCompositions 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 @@ -44,6 +43,7 @@ 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.utils.LogCompositions import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.UserId import io.element.android.libraries.matrix.ui.model.MatrixUser @@ -103,7 +103,10 @@ fun RoomListView( } } val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(appBarState) - LogCompositions(tag = "RoomListScreen", msg = "Content") + LogCompositions( + tag = "RoomListScreen", + msg = "Content" + ) val nestedScrollConnection = remember { object : NestedScrollConnection { diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt index 8b5e4c4761..c7f077374f 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt @@ -52,9 +52,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import io.element.android.libraries.core.compose.LogCompositions -import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.avatar.Avatar +import io.element.android.libraries.designsystem.components.form.textFieldState +import io.element.android.libraries.designsystem.utils.LogCompositions import io.element.android.libraries.matrix.ui.model.MatrixUser import io.element.android.libraries.ui.strings.R as StringR @@ -66,7 +66,10 @@ fun RoomListTopBar( onOpenSettings: () -> Unit, scrollBehavior: TopAppBarScrollBehavior ) { - LogCompositions(tag = "RoomListScreen", msg = "TopBar") + LogCompositions( + tag = "RoomListScreen", + msg = "TopBar" + ) var searchWidgetStateIsOpened by rememberSaveable { mutableStateOf(false) } fun closeFilter() { diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index fea038bf14..47cf8f490c 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -35,7 +35,6 @@ dependencies { anvil(projects.anvilcodegen) implementation(projects.anvilannotations) - implementation(projects.libraries.di) implementation(projects.libraries.core) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix) @@ -44,8 +43,6 @@ dependencies { implementation(projects.libraries.elementresources) implementation(projects.libraries.uiStrings) - implementation(libs.appyx.core) - testImplementation(libs.test.junit) testImplementation(libs.coroutines.test) testImplementation(libs.molecule.runtime) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a6d27811e..92d50ac689 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -114,6 +114,7 @@ showkase_processor = { module = "com.airbnb.android:showkase-processor", version jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" } +timber = "com.jakewharton.timber:timber:5.0.1" # Di inject = "javax.inject:javax.inject:1" diff --git a/libraries/androidutils/.gitignore b/libraries/androidutils/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/libraries/androidutils/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts new file mode 100644 index 0000000000..68881c2b57 --- /dev/null +++ b/libraries/androidutils/build.gradle.kts @@ -0,0 +1,61 @@ + +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") +} + +android { + namespace = "io.element.android.libraries.androidutils" + compileSdk = 32 + + defaultConfig { + minSdk = 21 + targetSdk = 32 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation(libs.timber) + implementation("androidx.core:core-ktx:1.7.0") + implementation("androidx.appcompat:appcompat:1.6.0") + implementation("com.google.android.material:material:1.7.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") +} diff --git a/libraries/androidutils/consumer-rules.pro b/libraries/androidutils/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libraries/androidutils/proguard-rules.pro b/libraries/androidutils/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/libraries/androidutils/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt b/libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..ce92608bfb --- /dev/null +++ b/libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.androidutils + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("io.element.android.libraries.androidutils.test", appContext.packageName) + } +} diff --git a/libraries/core/src/main/AndroidManifest.xml b/libraries/androidutils/src/main/AndroidManifest.xml similarity index 95% rename from libraries/core/src/main/AndroidManifest.xml rename to libraries/androidutils/src/main/AndroidManifest.xml index c7c3fad8ff..5a19e495ae 100644 --- a/libraries/core/src/main/AndroidManifest.xml +++ b/libraries/androidutils/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt similarity index 93% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt index 3bb978f67d..f71fb1535e 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/bitmap/Bitmap.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.bitmap +package io.element.android.libraries.androidutils.bitmap import android.graphics.Bitmap import java.io.File diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/extensions/isEmail.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/extensions/isEmail.kt new file mode 100644 index 0000000000..b47033286d --- /dev/null +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/extensions/isEmail.kt @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.androidutils.extensions + +import android.util.Patterns + +/** + * Check if a CharSequence is an email. + */ +fun CharSequence.isEmail() = Patterns.EMAIL_ADDRESS.matcher(this).matches() diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/compressFile.kt similarity index 93% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/compressFile.kt index ff6fc22178..587c1aed75 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/file/compressFile.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/compressFile.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.libraries.core.file +package io.element.android.libraries.androidutils.file +import timber.log.Timber import java.io.File import java.util.zip.GZIPOutputStream -import timber.log.Timber /** * GZip a file. diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/vibrator.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/vibrator.kt index e7f95a20d9..3e717ef6bf 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/hardware/vibrator.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/vibrator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.hardware +package io.element.android.libraries.androidutils.hardware import android.content.Context import android.os.Build diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt similarity index 96% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt index cde1a49cda..71fb1c7070 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/DimensionConverter.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.element.android.libraries.core.ui +package io.element.android.libraries.androidutils.ui import android.content.res.Resources import android.util.TypedValue diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt similarity index 95% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt index 5d10fdd50a..0639f29d1f 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/ui/View.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.ui +package io.element.android.libraries.androidutils.ui import android.view.View import android.view.inputmethod.InputMethodManager diff --git a/libraries/core/src/main/res/values-ldrtl/integers.xml b/libraries/androidutils/src/main/res/values-ldrtl/integers.xml similarity index 100% rename from libraries/core/src/main/res/values-ldrtl/integers.xml rename to libraries/androidutils/src/main/res/values-ldrtl/integers.xml diff --git a/libraries/core/src/main/res/values/integers.xml b/libraries/androidutils/src/main/res/values/integers.xml similarity index 100% rename from libraries/core/src/main/res/values/integers.xml rename to libraries/androidutils/src/main/res/values/integers.xml diff --git a/libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt b/libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt new file mode 100644 index 0000000000..489e18e717 --- /dev/null +++ b/libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.androidutils + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/libraries/core/build.gradle.kts b/libraries/core/build.gradle.kts index 290ec420ba..ef4a882cb3 100644 --- a/libraries/core/build.gradle.kts +++ b/libraries/core/build.gradle.kts @@ -1,3 +1,4 @@ + /* * Copyright (c) 2022 New Vector Ltd * @@ -14,10 +15,18 @@ * limitations under the License. */ +// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed +@Suppress("DSL_SCOPE_VIOLATION") plugins { - id("io.element.android-compose-library") + id("java-library") + alias(libs.plugins.kotlin.jvm) } -android { - namespace = "io.element.android.libraries.core" +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +dependencies { + implementation(libs.coroutines.core) } diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt index 39e5e0dd51..a3f1586070 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt deleted file mode 100644 index 68e92e0289..0000000000 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2022 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.libraries.core.coroutine - -import android.os.SystemClock -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.channels.Channel -import kotlinx.coroutines.channels.ClosedReceiveChannelException -import kotlinx.coroutines.channels.ReceiveChannel -import kotlinx.coroutines.channels.produce -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.consumeAsFlow -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.isActive -import kotlinx.coroutines.selects.select - -@ExperimentalCoroutinesApi -fun Flow.chunk(durationInMillis: Long): Flow> { - require(durationInMillis > 0) { "Duration should be greater than 0" } - return flow { - coroutineScope { - val events = ArrayList() - val ticker = fixedPeriodTicker(durationInMillis) - try { - val upstreamValues = produce(capacity = Channel.CONFLATED) { - collect { value -> send(value) } - } - while (isActive) { - var hasTimedOut = false - select { - upstreamValues.onReceive { - events.add(it) - } - ticker.onReceive { - hasTimedOut = true - } - } - if (hasTimedOut && events.isNotEmpty()) { - emit(events.toList()) - events.clear() - } - } - } catch (e: ClosedReceiveChannelException) { - // drain remaining events - if (events.isNotEmpty()) emit(events.toList()) - } finally { - ticker.cancel() - } - } - } -} - -@ExperimentalCoroutinesApi -fun Flow.throttleFirst(windowDuration: Long): Flow = flow { - var windowStartTime = SystemClock.elapsedRealtime() - var emitted = false - collect { value -> - val currentTime = SystemClock.elapsedRealtime() - val delta = currentTime - windowStartTime - if (delta >= windowDuration) { - windowStartTime += delta / windowDuration * windowDuration - emitted = false - } - if (!emitted) { - emit(value) - emitted = true - } - } -} - -@ExperimentalCoroutinesApi -fun tickerFlow(scope: CoroutineScope, delayMillis: Long, initialDelayMillis: Long = delayMillis): Flow { - return scope.fixedPeriodTicker(delayMillis, initialDelayMillis).consumeAsFlow() -} - -@ExperimentalCoroutinesApi -private fun CoroutineScope.fixedPeriodTicker(delayMillis: Long, initialDelayMillis: Long = delayMillis): ReceiveChannel { - require(delayMillis >= 0) { "Expected non-negative delay, but has $delayMillis ms" } - require(initialDelayMillis >= 0) { "Expected non-negative initial delay, but has $initialDelayMillis ms" } - return produce(capacity = 0) { - delay(initialDelayMillis) - while (true) { - channel.send(Unit) - delay(delayMillis) - } - } -} diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt index f823116898..178a5eef3a 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt index 21e4bb7738..b91d249547 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt @@ -16,15 +16,11 @@ package io.element.android.libraries.core.data -import timber.log.Timber - -inline fun tryOrNull(message: String? = null, operation: () -> A): A? { +inline fun tryOrNull(noinline onError: ((Throwable) -> Unit)? = null, operation: () -> A): A? { return try { operation() } catch (any: Throwable) { - if (message != null) { - Timber.e("TAG", message, any) - } + onError?.invoke(any) null } } diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt index 9ae50826c6..e5b9d3d06f 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt @@ -16,19 +16,11 @@ package io.element.android.libraries.core.extensions -import android.util.Patterns fun Boolean.toOnOff() = if (this) "ON" else "OFF" inline fun T.ooi(block: (T) -> Unit): T = also(block) -/** - * Check if a CharSequence is an email. - */ -fun CharSequence.isEmail() = Patterns.EMAIL_ADDRESS.matcher(this).matches() - -// fun CharSequence.isMatrixId() = MatrixPatterns.isUserId(this.toString()) - /** * Return empty CharSequence if the CharSequence is null. */ diff --git a/libraries/coroutines/.gitignore b/libraries/coroutines/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/libraries/coroutines/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/libraries/coroutines/build.gradle.kts b/libraries/coroutines/build.gradle.kts new file mode 100644 index 0000000000..f9f12e0b09 --- /dev/null +++ b/libraries/coroutines/build.gradle.kts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + id("java-library") + alias(libs.plugins.kotlin.jvm) +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +dependencies { + implementation(libs.coroutines.core) +} diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt similarity index 89% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt index c1a311492b..c7366dcfb7 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/TextFieldLocalState.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.compose +package io.element.android.libraries.designsystem.components.form import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt similarity index 93% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt index 4e66199845..1ebb67f75a 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/Keyboard.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.compose +package io.element.android.libraries.designsystem.components.keyboard import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.WindowInsets diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LogCompositions.kt similarity index 91% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LogCompositions.kt index eff24198db..f6edd1a8fb 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/LogCompositions.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LogCompositions.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.element.android.libraries.core.compose +package io.element.android.libraries.designsystem.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.runtime.remember -import io.element.android.libraries.core.BuildConfig +import io.element.android.libraries.designsystem.BuildConfig import timber.log.Timber // Note the inline function below which ensures that this function is essentially diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt similarity index 94% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt index 51a117bacf..630434e060 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/OnLifecycleEvent.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.compose +package io.element.android.libraries.designsystem.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/PairCombinedPreviewParameter.kt similarity index 91% rename from libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/PairCombinedPreviewParameter.kt index 253ee8fb5c..bf0a282f72 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/compose/PairCombinedPreviewParameter.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/PairCombinedPreviewParameter.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.core.compose +package io.element.android.libraries.designsystem.utils import androidx.compose.ui.tooling.preview.PreviewParameterProvider diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt index 64b1cb4e34..b9631cd6ca 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt @@ -26,7 +26,6 @@ import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.room.RoomSummaryDataSource import io.element.android.libraries.matrix.room.RustMatrixRoom import io.element.android.libraries.matrix.room.RustRoomSummaryDataSource -import io.element.android.libraries.matrix.session.PreferencesSessionStore import io.element.android.libraries.matrix.session.SessionStore import io.element.android.libraries.matrix.session.sessionId import io.element.android.libraries.matrix.sync.SlidingSyncObserverProxy diff --git a/libraries/textcomposer/build.gradle.kts b/libraries/textcomposer/build.gradle.kts index 040a265f80..4b5f82f747 100644 --- a/libraries/textcomposer/build.gradle.kts +++ b/libraries/textcomposer/build.gradle.kts @@ -32,6 +32,7 @@ android { dependencies { implementation(projects.libraries.elementresources) implementation(projects.libraries.uiStrings) + implementation(projects.libraries.androidutils) implementation(projects.libraries.core) implementation(projects.libraries.matrix) implementation(libs.wysiwyg) diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index 86c1084f5d..2948685b74 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -40,14 +40,13 @@ import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import com.google.android.material.shape.MaterialShapeDrawable -import io.element.android.wysiwyg.EditorEditText -import io.element.android.wysiwyg.inputhandlers.models.InlineFormat -import io.element.android.libraries.core.ui.DimensionConverter -import io.element.android.libraries.core.ui.hideKeyboard -import io.element.android.libraries.core.ui.showKeyboard +import io.element.android.libraries.androidutils.ui.hideKeyboard +import io.element.android.libraries.androidutils.ui.showKeyboard import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLayoutBinding import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuButtonBinding import io.element.android.libraries.textcomposer.tools.setTextIfDifferent +import io.element.android.wysiwyg.EditorEditText +import io.element.android.wysiwyg.inputhandlers.models.InlineFormat import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction import io.element.android.element.resources.R as ElementR @@ -118,7 +117,8 @@ class RichTextComposerLayout @JvmOverloads constructor( } } - private val dimensionConverter = DimensionConverter(resources) + private val dimensionConverter = + io.element.android.libraries.androidutils.ui.DimensionConverter(resources) fun setFullScreen(isFullScreen: Boolean, animated: Boolean, manageKeyboard: Boolean) { if (!animated && views.composerLayout.layoutParams != null) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 669bac4635..b85f5e6717 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -60,3 +60,4 @@ include(":anvilcodegen") include(":libraries:architecture") include(":libraries:matrixtest") include(":features:template") +include(":libraries:androidutils") From c2ca91210e9c7ddbabfcbf7dcb66522cee5e11da Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 24 Jan 2023 17:39:15 +0100 Subject: [PATCH 29/61] Gradle config: add some config to make it faster. --- gradle.properties | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0585362237..6902acf2bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,10 +23,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true + # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app"s APK # https://developer.android.com/topic/libraries/support-library/androidx-rn @@ -37,6 +34,11 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true + +org.gradle.caching=true +org.gradle.configureondemand=true +org.gradle.parallel=true + # Dummy values for signing secrets / nightly signing.element.nightly.storePassword=Secret signing.element.nightly.keyId=Secret From c5830eb9c01919819a22b6dc60e55b5bfcf23844 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 24 Jan 2023 17:41:56 +0100 Subject: [PATCH 30/61] Clean --- .../androidutils/ExampleInstrumentedTest.kt | 40 ------------------- .../androidutils/ui/DimensionConverter.kt | 2 +- .../libraries/androidutils/ExampleUnitTest.kt | 33 --------------- .../core/extensions/BasicExtensions.kt | 1 - 4 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt delete mode 100644 libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt diff --git a/libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt b/libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt deleted file mode 100644 index ce92608bfb..0000000000 --- a/libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2023 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.libraries.androidutils - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.element.android.libraries.androidutils.test", appContext.packageName) - } -} diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt index 71fb1c7070..beead850b3 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt @@ -19,7 +19,7 @@ import android.content.res.Resources import android.util.TypedValue import androidx.annotation.Px -class DimensionConverter(val resources: Resources) { +class DimensionConverter(private val resources: Resources) { @Px fun dpToPx(dp: Int): Int { diff --git a/libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt b/libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt deleted file mode 100644 index 489e18e717..0000000000 --- a/libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2023 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.libraries.androidutils - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt index e5b9d3d06f..b845a5efeb 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt @@ -16,7 +16,6 @@ package io.element.android.libraries.core.extensions - fun Boolean.toOnOff() = if (this) "ON" else "OFF" inline fun T.ooi(block: (T) -> Unit): T = also(block) From 1b77c56c48518de47134c185863f897481fbb218 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 24 Jan 2023 18:06:22 +0100 Subject: [PATCH 31/61] More cleanup --- libraries/androidutils/build.gradle.kts | 36 ++----------------- libraries/elementresources/build.gradle.kts | 2 +- .../textcomposer/RichTextComposerLayout.kt | 6 ++-- 3 files changed, 6 insertions(+), 38 deletions(-) diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts index 68881c2b57..6aa8911587 100644 --- a/libraries/androidutils/build.gradle.kts +++ b/libraries/androidutils/build.gradle.kts @@ -16,46 +16,14 @@ */ plugins { - id("com.android.library") - id("org.jetbrains.kotlin.android") + id("io.element.android-library") } android { namespace = "io.element.android.libraries.androidutils" - compileSdk = 32 - - defaultConfig { - minSdk = 21 - targetSdk = 32 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" - } } dependencies { implementation(libs.timber) - implementation("androidx.core:core-ktx:1.7.0") - implementation("androidx.appcompat:appcompat:1.6.0") - implementation("com.google.android.material:material:1.7.0") - testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + implementation(libs.androidx.corektx) } diff --git a/libraries/elementresources/build.gradle.kts b/libraries/elementresources/build.gradle.kts index b61593b700..3451be5c38 100644 --- a/libraries/elementresources/build.gradle.kts +++ b/libraries/elementresources/build.gradle.kts @@ -19,7 +19,7 @@ plugins { } android { - namespace = "io.element.android.element.resources" + namespace = "io.element.android.libraries.resources" } dependencies { diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index 2948685b74..f81e8c2c19 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -40,6 +40,7 @@ import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import com.google.android.material.shape.MaterialShapeDrawable +import io.element.android.libraries.androidutils.ui.DimensionConverter import io.element.android.libraries.androidutils.ui.hideKeyboard import io.element.android.libraries.androidutils.ui.showKeyboard import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLayoutBinding @@ -49,7 +50,7 @@ import io.element.android.wysiwyg.EditorEditText import io.element.android.wysiwyg.inputhandlers.models.InlineFormat import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction -import io.element.android.element.resources.R as ElementR +import io.element.android.libraries.resources.R as ElementR import io.element.android.libraries.ui.strings.R as StringR // Imported from Element Android @@ -117,8 +118,7 @@ class RichTextComposerLayout @JvmOverloads constructor( } } - private val dimensionConverter = - io.element.android.libraries.androidutils.ui.DimensionConverter(resources) + private val dimensionConverter = DimensionConverter(resources) fun setFullScreen(isFullScreen: Boolean, animated: Boolean, manageKeyboard: Boolean) { if (!animated && views.composerLayout.layoutParams != null) { From a4a6cbef6089cae850f63771327c0ba053cb219f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 22:11:13 +0000 Subject: [PATCH 32/61] Bump mobile-dev-inc/action-maestro-cloud from 1.2.2 to 1.2.3 Bumps [mobile-dev-inc/action-maestro-cloud](https://github.com/mobile-dev-inc/action-maestro-cloud) from 1.2.2 to 1.2.3. - [Release notes](https://github.com/mobile-dev-inc/action-maestro-cloud/releases) - [Commits](https://github.com/mobile-dev-inc/action-maestro-cloud/compare/v1.2.2...v1.2.3) --- updated-dependencies: - dependency-name: mobile-dev-inc/action-maestro-cloud dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maestro.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maestro.yml b/.github/workflows/maestro.yml index 7fc7a9d322..486094760e 100644 --- a/.github/workflows/maestro.yml +++ b/.github/workflows/maestro.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - name: Assemble debug APK run: ./gradlew assembleDebug $CI_GRADLE_ARG_PROPERTIES - - uses: mobile-dev-inc/action-maestro-cloud@v1.2.2 + - uses: mobile-dev-inc/action-maestro-cloud@v1.2.3 with: api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} app-file: app/build/outputs/apk/debug/app-debug.apk From ca8f6895f7960cae8caa7a877e104f544359ec29 Mon Sep 17 00:00:00 2001 From: bmarty Date: Wed, 25 Jan 2023 06:06:04 +0000 Subject: [PATCH 33/61] Import strings from Element Android --- libraries/ui-strings/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/ui-strings/src/main/res/values/strings.xml b/libraries/ui-strings/src/main/res/values/strings.xml index 8b51a6f95b..852478a173 100644 --- a/libraries/ui-strings/src/main/res/values/strings.xml +++ b/libraries/ui-strings/src/main/res/values/strings.xml @@ -3125,6 +3125,7 @@ Someone else is already recording a voice broadcast. Wait for their voice broadcast to end to start a new one. You are already recording a voice broadcast. Please end your current voice broadcast to start a new one. Unable to play this voice broadcast. + Connection error - Recording paused %1$s left Stop live broadcasting? From 15700062c7c591eba59ae4fabb9454a4917c98e2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 25 Jan 2023 11:14:50 +0100 Subject: [PATCH 34/61] Rename function (code review) --- .../main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt | 4 ++-- .../kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt | 4 ++-- app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt | 4 ++-- .../kotlin/io/element/android/features/login/LoginFlowNode.kt | 4 ++-- .../android/features/preferences/PreferencesFlowNode.kt | 4 ++-- .../libraries/architecture/animation/ScreenTransition.kt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index cb7bed5d84..b2e2aca077 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -34,7 +34,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.preferences.PreferencesFlowNode import io.element.android.features.roomlist.RoomListNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.DaggerComponentOwner @@ -129,7 +129,7 @@ class LoggedInFlowNode( navModel = backstack, modifier = modifier, // Animate navigation to settings and to a room - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index 774a075db2..b9e38d1063 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -29,7 +29,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.login.LoginFlowNode import io.element.android.features.onboarding.OnBoardingScreen -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import kotlinx.parcelize.Parcelize import timber.log.Timber @@ -76,7 +76,7 @@ class NotLoggedInFlowNode( navModel = backstack, modifier = modifier, // Animate navigation to login screen - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index ccb63965f1..d82ac55e7f 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -37,7 +37,7 @@ import com.bumble.appyx.navmodel.backstack.operation.newRoot import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.rageshake.bugreport.BugReportNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner @@ -114,7 +114,7 @@ class RootFlowNode( Children( navModel = backstack, // Animate opening the bug report screen - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index 8d5bab90d3..641435642d 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.features.login.changeserver.ChangeServerNode import io.element.android.features.login.root.LoginRootNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import kotlinx.parcelize.Parcelize @@ -69,7 +69,7 @@ class LoginFlowNode( navModel = backstack, modifier = modifier, // Animate transition to change server screen - transitionHandler = getDefaultTransitionHandler(), + transitionHandler = rememberDefaultTransitionHandler(), ) } } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index c87bb0e0d0..5407072398 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import io.element.android.features.preferences.root.PreferencesRootNode -import io.element.android.libraries.architecture.animation.getDefaultTransitionHandler +import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.createNode import kotlinx.parcelize.Parcelize @@ -63,7 +63,7 @@ class PreferencesFlowNode( Children( navModel = backstack, modifier = modifier, - transitionHandler = getDefaultTransitionHandler() + transitionHandler = rememberDefaultTransitionHandler() ) } } diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt index c777ebed02..faac896b85 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt @@ -24,7 +24,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackSlider @Composable -fun getDefaultTransitionHandler(): ModifierTransitionHandler { +fun rememberDefaultTransitionHandler(): ModifierTransitionHandler { return rememberBackstackSlider( transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) }, ) From 8486f79b21944725e85a9752911455434f2a1686 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:11:51 +0000 Subject: [PATCH 35/61] Bump danger/danger-js from 11.2.2 to 11.2.3 Bumps [danger/danger-js](https://github.com/danger/danger-js) from 11.2.2 to 11.2.3. - [Release notes](https://github.com/danger/danger-js/releases) - [Changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/danger/danger-js/compare/11.2.2...11.2.3) --- updated-dependencies: - dependency-name: danger/danger-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/danger.yml | 2 +- .github/workflows/quality.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 91352bb27b..a88a5faa9d 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -11,7 +11,7 @@ jobs: - run: | npm install --save-dev @babel/plugin-transform-flow-strip-types - name: Danger - uses: danger/danger-js@11.2.2 + uses: danger/danger-js@11.2.3 with: args: "--dangerfile ./tools/danger/dangerfile.js" env: diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 47400648a5..78c407cde1 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -37,7 +37,7 @@ jobs: yarn add danger-plugin-lint-report --dev - name: Danger lint if: always() - uses: danger/danger-js@11.2.2 + uses: danger/danger-js@11.2.3 with: args: "--dangerfile ./tools/danger/dangerfile-lint.js" env: From 90f04646914c7928a278d3df092e36d319c3c413 Mon Sep 17 00:00:00 2001 From: bmarty Date: Thu, 26 Jan 2023 06:06:01 +0000 Subject: [PATCH 36/61] Import strings from Element Android --- .../src/main/res/values-ar/strings.xml | 58 +++++--- .../src/main/res/values-bg/strings.xml | 2 - .../src/main/res/values-ca/strings.xml | 10 +- .../src/main/res/values-cs/strings.xml | 39 +++-- .../src/main/res/values-de/strings.xml | 37 +++-- .../src/main/res/values-eo/strings.xml | 4 +- .../src/main/res/values-es/strings.xml | 5 +- .../src/main/res/values-et/strings.xml | 35 +++-- .../src/main/res/values-eu/strings.xml | 2 - .../src/main/res/values-fa/strings.xml | 35 +++-- .../src/main/res/values-fi/strings.xml | 4 +- .../src/main/res/values-fr-rCA/strings.xml | 2 - .../src/main/res/values-fr/strings.xml | 35 +++-- .../src/main/res/values-hu/strings.xml | 35 +++-- .../src/main/res/values-hy/strings.xml | 106 ++++++++++++++ .../src/main/res/values-in/strings.xml | 29 ++-- .../src/main/res/values-is/strings.xml | 133 +++++++++++++++++- .../src/main/res/values-it/strings.xml | 35 +++-- .../src/main/res/values-iw/strings.xml | 5 +- .../src/main/res/values-ja/strings.xml | 36 +++-- .../src/main/res/values-kab/strings.xml | 2 - .../src/main/res/values-lo/strings.xml | 3 - .../src/main/res/values-lt/strings.xml | 3 +- .../src/main/res/values-lv/strings.xml | 2 - .../src/main/res/values-nb-rNO/strings.xml | 4 +- .../src/main/res/values-nl/strings.xml | 10 +- .../src/main/res/values-pl/strings.xml | 7 +- .../src/main/res/values-pt-rBR/strings.xml | 10 +- .../src/main/res/values-ru/strings.xml | 10 +- .../src/main/res/values-sk/strings.xml | 39 +++-- .../src/main/res/values-sq/strings.xml | 25 ++-- .../src/main/res/values-sv/strings.xml | 32 +++-- .../src/main/res/values-sw/strings.xml | 14 ++ .../src/main/res/values-uk/strings.xml | 43 ++++-- .../src/main/res/values-vi/strings.xml | 3 - .../src/main/res/values-zh-rCN/strings.xml | 18 ++- .../src/main/res/values-zh-rTW/strings.xml | 29 ++-- .../src/main/res/values/strings.xml | 12 +- 38 files changed, 676 insertions(+), 237 deletions(-) create mode 100644 libraries/ui-strings/src/main/res/values-hy/strings.xml create mode 100644 libraries/ui-strings/src/main/res/values-sw/strings.xml diff --git a/libraries/ui-strings/src/main/res/values-ar/strings.xml b/libraries/ui-strings/src/main/res/values-ar/strings.xml index a49ecc3d08..395b4c70a8 100644 --- a/libraries/ui-strings/src/main/res/values-ar/strings.xml +++ b/libraries/ui-strings/src/main/res/values-ar/strings.xml @@ -16,7 +16,7 @@ غيّر %1$s اسم الغُرفة إلى: %2$s أجابَ %s على المُكالمة. أنهى %s المُكالمة. - جعلَ %1$s التأريخ المُستقبلي للغُرفة مرئيًا لـ %2$s + جعلَ %1$s عند انشاء الغرف لاحقاً تكون مرئية ل%2$s جميع أعضاء الغُرفة، مِنَ اللَّحظة التي تمَّت دعوتهم. جميع أعضاء الغُرفة، مِن لحظة إنضمامهم. جميع أعضاء الغُرفة. @@ -63,7 +63,7 @@ أرسلتَ بيانات لإعداد مُكالمة. أجبتَ على المُكالمة. أنهيتَ المُكالمة. - جعلتَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %1$s + لقدت جعلت الغرفة التي سيتم انشائها مرئيًا لـ %1$s رقّى %s هذه الغرفة. رقَّيتَ هذه الغرفة. أزلتَ اسم الغُرفة @@ -93,9 +93,9 @@ لا تغيير. • خوادِم مُطابقة IP الحرفية محظورة الآن. • الخوادِم المُطابقة لـ %s أُزيلت مِن قائمة السماح. - • الخوادِم المُطابقة لـ %s مسموحة الآن. + • الخوادِم المُطابقة لـ %s اصبحت مسموحة الآن. • الخوادِم المُطابقة لـ %s أُزيلت مِن قائمة الحظر. - • الخوادِم المُطابقة لـ %s محظورة الآن. + • الخوادِم مُتطابقة لـ %s واصبحت محظورة الآن. • خوادِم مُطابقة IP الحرفية مسموحة الآن. لقد غَيَّرت قائمة الوصول لهذه الغُرفة. غَيَّرَ %s قائمة التحكم بالوصول (ACL) لهذه الغُرفة. @@ -234,7 +234,7 @@ انتهت المكالمة مكالمة صورية واردة مكالمة صوتية واردة - المكالمة جارية + المكالمة جارية… معلومات نعم لا @@ -291,9 +291,7 @@ كلمة السر الجديدة فشل تحديث كلمة السر حُدّثت كلمة السر - أأعرض كل رسائل ⁨%s⁩؟ - -سيُعيد هذا الإجراء تشغيل التطبيق وقد يأخذ بعض الوقت. + أأعرض كل الرسائل من ⁨%s⁩؟ سيُعيد هذا الإجراء تشغيل التطبيق وقد يأخذ بعض الوقت. اختر دولة ٣ أيام أسبوع واحد @@ -471,7 +469,7 @@ رقم الهاتف مستخدم بالفعل معطّل مزعج - لا ترسل من هذا الجهاز الرسائل المعمّاة إلى الأجهزة غير المؤكّدة + لا ترسل من هذا الجهاز الرسائل المشفرة إلى الأجهزة غير الموثقة. عمِّ إلى الأجهزة المؤكّدة فقط <b>غير<b/> مؤكّدة مؤكّدة @@ -482,7 +480,7 @@ إن قال مدير الخادوم بأن هذا متوقع، فتأكد من أن البصمة أدناه تطابق البصمة التي وفّرها. تغيّرت الشهادة من شهادة كنت تثق بها إلى شهادة لا تثق بها. لربما جدّد الخادوم شهادته. راسل إدارة الخادوم واسألهم عن البصمة المتوقعة. أضِف اختصارا إلى الشاشة الرئيسية - شاشة معلومات التطبيق في النظام + أظهر معلومات التطبيق في إعدادات النظام. دعوات المكالمات ابدأ عن الإقلاع صدّر مفاتيح تعمية الطرفين لغرفة @@ -566,11 +564,7 @@ وصل هذا الخادم الحدّ الأقصى للمستخدمين النشطين شهريًا بذلك لن يستطيع بعض المستخدمين الولوج لحساباتهم. وصل خادوم المنزل هذا حدّ المستخدمين النشطين شهريًا. يجري وصل الاتصال… - سيجعل هذا حسابك محال الاستخدام للأبد. لن تقدر على الولوج ولن يقدر أحد على إعادة التسجيل بنفس معرّف المستخدم. سيتسبب هذا بأن يترك حسابك كل الغرف التي تشارك فيها، وستُزال تفاصيل الحساب من خادوم التعريف. هذا إجراء لا عودة فيه. - -حذفك لحسابك لا يتسبب بأن ننسى رسائلك التي أرسلتها (مبدئيًا). إن أردت ذلك فرجاءً أشّر على المربّع أدناه. - -ظهور الرسائل في «ماترِكس» شبيه كثيرًا بالبريد الإلكتروني. نسياننا لرسائلك يعني أن الرسائل التي أرسلتها لن تُشارك مع أي مستخدم جديد أو غير مسجّل، إلا أن المستخدمين المسجّلين الذي يقدرون على الوصول إليها سيمتلكون نسخة عنها. + سيجعل هذا حسابك محال الاستخدام للأبد. لن تقدر على تسجيل دخولك ولن يقدر أحد على إعادة التسجيل بنفس معرّف المستخدم. سيتسبب هذا بأن يترك حسابك كل الغرف التي تشارك فيها، وستُزال تفاصيل الحساب من خادم التعريف. هذا إجراء لا مجال الرجوع فيه. حذفك لحسابك لا يتسبب بأن ننسى رسائلك التي أرسلتها (مبدئيًا). إن أردت ذلك فرجاءً ضع علامة على المربّع أدناه. ظهور الرسائل في «ماترِكس» يشبه كثيرًا بالبريد الإلكتروني. نسياننا لرسائلك يعني أن الرسائل التي أرسلتها لن تُشارك مع أي مستخدم جديد أو غير مسجّل، إلا أن المستخدمين المسجّلين الذي يقدرون على الوصول إليها سيمتلكون نسخة عنها. الرسائل الآمنة تخطي تم @@ -580,7 +574,7 @@ الإعدادات المتقدمة للإشعارات عند تسجيل الخروج الآن ستخسر مفاتيحك النسخ الاحتياطي المفاتيح ما زال جاريا. في حال خروجك الآن لن تتمكن لاحقا من قراءة الرسائل المعماة. - تأكد من تفعيل النسخ الاحتياطي للمفاتيح على كل أجهزتك كي لا تخسر رسائلك المعماة + تأكد من تفعيل النسخ الاحتياطي للمفاتيح على كل أجهزتك كي لا تخسر رسائلك المشفرة. ينسخ احتياطيا المفاتيح… ليس لديك تصريح لبدء إجتماع ليس لديك تصريح لبدء إجتماع في هذه الغرفة @@ -913,7 +907,7 @@ تحكم في محادثاتك. تخط هذه الخطوة احفظ وتابع - حُفظت تفضيلاتك. + اذهب الى الاعدادات في اي وقت لتغير او تعديل ملفك الشخصي للتطبيق. كل شيئ جاهز! لننطلق يمكنك تغييرها في أي وقت. @@ -997,7 +991,7 @@ أنت تستعرض هذا النقاش سلفًا! أنت تستعرض هذه الغرفة سلفًا! منفصل عن الشبكة. تحقق من اتصالك. - حدث عالجه مدير الغرفة. + حدث تم تغيره من مدير الغرفة. ستعرض غرفك هنا. لانضمام لغرفة أو لإنشاء واحدة اضغط زر +. ستعرض رسائلك المباشرة هنا. لبدأ محادثات جديدة اضغط زر +. المحادثات @@ -1175,4 +1169,30 @@ كثيرة اخرى - \ No newline at end of file + + صفر + واحد + اثنان + القليل + العديد + أخرى + + ${app_name} يحتاج إلى حذف ذاكرة التخزين المؤقت حتى تكون مستحدثة، من أجل هذه الأسباب: +\n%s +\n +\nملاحظة: هذا الإجراء سيؤدي إلى إعادة تشغيل التطبيق ومن الممكن أن يستغرق بعضاً من الوقت. + استكشف غُرف + تغيير التجمع + انشئ غرفة + ابدأ محادثة + كل المحادثات + أنت الذي انهيت البث الصوتي. + + صفر + واحد + اثنان + القليل + العديد + أخرى + + diff --git a/libraries/ui-strings/src/main/res/values-bg/strings.xml b/libraries/ui-strings/src/main/res/values-bg/strings.xml index d3e9e599bc..5c147f59ef 100644 --- a/libraries/ui-strings/src/main/res/values-bg/strings.xml +++ b/libraries/ui-strings/src/main/res/values-bg/strings.xml @@ -1483,8 +1483,6 @@ Потвърди сесията Ръчно потвърждаване чрез текстово съобщение Потвърдете новия вход достъпващ профила ви: %1$s - Потвърдете всички сесии за да подсигурите, че профилът и съобщенията ви са в безопасност - Прегледайте от къде сте влезли Шифровано от непотвърдено устройство Нешифровано diff --git a/libraries/ui-strings/src/main/res/values-ca/strings.xml b/libraries/ui-strings/src/main/res/values-ca/strings.xml index b86a834a27..1f2cf1983c 100644 --- a/libraries/ui-strings/src/main/res/values-ca/strings.xml +++ b/libraries/ui-strings/src/main/res/values-ca/strings.xml @@ -1811,8 +1811,6 @@ No s\'ha pogut desar el fitxer multimèdia Confirma la teva identitat verificant aquest inici de sessió i, així, poder-li donar accés als missatges xifrats. Verifica l\'inici de sessió - Verifica totes les teves sessions per assegurar-te que el teu compte i missatges estan segurs - Comprova on has iniciat sessió Xifrat amb un dispositiu no verificat No xifrat @@ -2293,7 +2291,6 @@ Acaba l\'enquesta Això impedirà que la gent pugui votar i es mostraran els resultats finals de l\'enquesta. Vols acabar l\'enquesta\? - opció guanyadora Es necessita almenys %1$s opció Es necessiten almenys %1$s opcions @@ -2717,9 +2714,6 @@ Els usuaris dels xats directes i sales al les quals t\'hagis unit poden veure la llista completa de les teves sessions. \n \nAixò els pot proporcionar més confiança de que realment parlen amb tu però, poden veure el nom de sessió que introdueixis. - Les sessions verificades son sessions en què has iniciat sessió amb les teves credencials i s\'han verificat utilitzant una frase de seguretat o mitjançant la verificació creuada. -\n -\nAixò vol dir que contenen claus de xifrat dels teus missatges anteriors i confirmen als altres usuaris amb qui parles, que aquestes sessions son realment teves. Les sessions no verificades son sessions en què has iniciat sessió amb les teves credencials però s\'hi ha fet una verificació creuada. \n \nAssegura\'t que reconeixes aquestes sessions especialment, ja que podrien representar un ús no autoritzat del teu compte. @@ -2814,7 +2808,7 @@ Activa l\'editor de text enriquit Rep notificacions en aquesta sessió. Notificacions - Carregant + Carregant Pausa l\'emissió de veu Reprodueix o reprèn l\'emissió de veu Atura l\'enregistrament d\'emissió de veu @@ -2839,4 +2833,4 @@ Format de text Enrere 30 segons Avança 30 segons - \ No newline at end of file + 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 2d2b91d645..c9d697f560 100644 --- a/libraries/ui-strings/src/main/res/values-cs/strings.xml +++ b/libraries/ui-strings/src/main/res/values-cs/strings.xml @@ -1469,8 +1469,6 @@ Přístup k zabezpečenému úložišti selhal Nezašifrováno Zašifrováno neověřeným zařízením - Přezkoumejte, kde jste se přihlásili - Ověřte všechny své relace za účelem bezpečí Vašeho účtu a zpráv Ověřte nové přihlášení s přístupem na Váš účet: %1$s Manuálně ověřit textem Ověřit přihlášení @@ -2313,7 +2311,6 @@ Ukončit hlasování Toto zastaví možnost hlasování a zobrazí se konečné výsledky. Ukončit toto hlasování\? - vítězná volba Ukončit hlasování Konečný výsledek na základě %1$d hlasu @@ -2767,9 +2764,6 @@ \n \nTo jim poskytuje jistotu, že s vámi skutečně mluví, ale také to znamená, že mohou vidět název relace, který zde zadáte. Přejmenování relací - Ověřené relace se přihlásily pomocí vašich přihlašovacích údajů a poté byly ověřeny buď pomocí vaší zabezpečené přístupové fráze, nebo křížovým ověřením. -\n -\nTo znamená, že uchovávají šifrovací klíče pro vaše předchozí zprávy a potvrzují ostatním uživatelům, se kterými komunikujete, že tyto relace jste skutečně vy. Ověřené relace Neověřené relace jsou relace, které se přihlásily pomocí vašich přihlašovacích údajů, ale nebyly křížově ověřeny. \n @@ -2868,7 +2862,7 @@ Druhé zařízení je již přihlášeno. Při nastavování zabezpečeného zasílání zpráv se vyskytl problém se zabezpečením. Může být napadena jedna z následujících věcí: váš domovský server; vaše internetové připojení; vaše zařízení; Žádost se nezdařila. - Ukládání do vyrovnávací paměti… + Ukládání do vyrovnávací paměti… Pozastavit hlasové vysílání Přehrát nebo obnovit hlasové vysílání Ukončit záznam hlasového vysílání @@ -2955,4 +2949,33 @@ V této místnosti nejsou žádné aktivní hlasování Aktivní hlasování Historie hlasování - \ No newline at end of file + Ukončené hlasování + Hlasování + ukončil(a) hlasování. + Hlasování bylo ukončeno. + Váš domovský server zatím nepodporuje zobrazení seznamu vláken. + Nelze přehrát toto hlasové vysílání. + Hlasové vysílání bylo zahájeno + Kvůli chybám při dešifrování nemusí být některé hlasy započítány + Chyba při načítání hlasování. + Načíst další hlasování + Zobrazení hlasování + + Za uplynulý den nejsou k dispozici žádná hlasování. +\nPro zobrazení hlasování z předchozích dnů načtěte další hlasování. + Za poslední %1$d dny nejsou k dispozici žádná hlasování. +\nPro zobrazení hlasování z předchozích dnů načtěte další hlasování. + Za posledních %1$d dní nejsou k dispozici žádná hlasování. +\nPro zobrazení hlasování z předchozích dnů načtěte další hlasování. + + + Za uplynulý den nejsou žádná aktivní hlasování. +\nPro zobrazení hlasování z předchozích dnů načtěte další ankety. + Za poslední %1$d dny nejsou žádná aktivní hlasování. +\nPro zobrazení hlasování z předchozích dnů načtěte další ankety. + Za posledních %1$d dní nejsou žádná aktivní hlasování. +\nPro zobrazení hlasování z předchozích dnů načtěte další ankety. + + 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 + 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 52b8f0c716..f0e5a7bb8d 100644 --- a/libraries/ui-strings/src/main/res/values-de/strings.xml +++ b/libraries/ui-strings/src/main/res/values-de/strings.xml @@ -1427,8 +1427,6 @@ Konnte nicht auf gesicherten Speicher zugreifen Unverschlüsselt Verschlüsselt von einem nicht verifiziertem Gerät - Überprüfe, wo du angemeldet bist - Verifiziere alle deine Sitzungen, um sicherzustellen, dass dein Konto und deine Nachrichten sicher sind Bestätige neue Anmeldung zu deinem Konto: %1$s Verifiziere manuell mit einem Text Anmeldung verifizieren @@ -2319,7 +2317,6 @@ Umfrage beenden Dies verhindert, dass andere Personen abstimmen können, und zeigt die Endergebnisse der Umfrage an. Diese Umfrage beenden\? - Gewinneroption Umfrage beenden Endgültiges Ergebnis basiert auf %1$d Stimme @@ -2711,9 +2708,6 @@ Andere Nutzer in Direktnachrichten und Räumen, in denen du dich befindest, können eine vollständige Liste deiner Sitzungen einsehen. \n \nDies gibt ihnen die Sicherheit, dass sie auch wirklich mit dir kommunizieren. Allerdings bedeutet es auch, dass sie die Sitzungsnamen sehen können, die du hier angibst. - Verifizierte Sitzungen wurden mit deinen Daten angemeldet und anschließend mit deiner Sicherheitspassphrase oder durch Quersignierung verifiziert. -\n -\nDies bedeutet, dass sie die Verschlüsselungs-Schlüssel für deine bisherigen Nachrichten besitzen und anderen Nutzern bestätigen können, dass diese Sitzungen tatsächlich von dir stammen. Sitzungen umbenennen Verifizierte Sitzungen Nicht verifizierte Sitzungen sind jene, die angemeldet, aber nicht quer signiert sind. @@ -2815,7 +2809,7 @@ Die Anfrage ist fehlgeschlagen. Abspielen oder fortsetzen der Sprachübertragung Fortsetzen der Sprachübertragung - Puffere … + Puffere … Pausiere Sprachübertragung Stoppe Aufzeichnung der Sprachübertragung Pausiere Aufzeichnung der Sprachübertragung @@ -2893,9 +2887,34 @@ Zugriffstoken Unsortierte Liste umschalten Nummerierte Liste umschalten - In diesem Raum gibt es noch keine abgeschlossenen Umfragen + In diesem Raum gibt es keine abgeschlossenen Umfragen Vergangene Umfragen In diesem Raum gibt es keine aktiven Umfragen Aktive Umfragen Umfrageverlauf - \ No newline at end of file + Beendete Umfrage + Umfrage + beendete eine Umfrage. + Umfrage beendet. + Dein Heim-Server unterstützt noch nicht das Auflisten von Threads. + Eine Sprachübertragung wurde begonnen + Wiedergabe der Sprachübertragung nicht möglich. + Evtl. werden infolge von Entschlüsselungsfehlern einige Stimmen nicht gezählt + Fehler beim Laden der Umfragen. + Weitere Umfragen laden + Zeige Umfragen an + + Für den vergangenen Tag sind keine aktiven Umfragen verfügbar. +\nLade weitere Umfragen, um die der vorherigen Tage zu sehen. + Für die vergangenen %1$d Tage sind keine aktiven Umfragen verfügbar. +\nLade weitere Umfragen, um die der vorherigen Tage zu sehen. + + + Für den vergangenen Tag sind keine beendeten Umfragen verfügbar. +\nLade weitere Umfragen, um die der vorherigen Tage zu sehen. + Für die vergangenen %1$d Tage sind keine beendeten Umfragen verfügbar. +\nLade weitere Umfragen, um die der vorherigen Tage zu sehen. + + 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 + diff --git a/libraries/ui-strings/src/main/res/values-eo/strings.xml b/libraries/ui-strings/src/main/res/values-eo/strings.xml index e417d183bf..0aa395dcce 100644 --- a/libraries/ui-strings/src/main/res/values-eo/strings.xml +++ b/libraries/ui-strings/src/main/res/values-eo/strings.xml @@ -1483,8 +1483,6 @@ Aldoni ĉambranojn Konfirmu vian identecon per kontrolo de ĉi tiu saluto, donante al ĝi aliron al ĉifritaj mesaĝoj. Kontrolu la novan saluton, kiu aliras vian konton: %1$s - Rekontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj estas sekuraj - Rekontrolu, kie vi salutis Montri la aparaton per kiu vi povas kontroli nun Montri %d aparatojn per kiuj vi povas kontroli nun @@ -2200,4 +2198,4 @@ Aroj - Iom uzantoj reatentita \@room - \ No newline at end of file + diff --git a/libraries/ui-strings/src/main/res/values-es/strings.xml b/libraries/ui-strings/src/main/res/values-es/strings.xml index c06442b5d0..f14464d957 100644 --- a/libraries/ui-strings/src/main/res/values-es/strings.xml +++ b/libraries/ui-strings/src/main/res/values-es/strings.xml @@ -1592,8 +1592,6 @@ No se pudo acceder al almacenamiento seguro Sin cifrar Cifrado por un dispositivo no verificado - Revise dónde inició sesión - Verifique todas sus sesiones para asegurarse de que su cuenta y sus mensajes estén seguros Verifique el nuevo inicio de sesión accediendo a su cuenta: %1$s Verificar manualmente por texto Verificación interactiva por emoji @@ -2386,7 +2384,6 @@ Finalizar encuesta Esto evitará que las personas puedan votar y mostrará los resultados finales de la encuesta. ¿Finalizar encuesta\? - opción ganadora Finalizar encuesta Resultado final basado en %1$d voto @@ -2688,4 +2685,4 @@ Mostrar chats recientes en el menú de compartir sistema No enviar nunca mensajes cifrados a sesiones sin verificar en esta sala. Restan %1$s - \ 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 1e8e2b989e..1d7b96d2f9 100644 --- a/libraries/ui-strings/src/main/res/values-et/strings.xml +++ b/libraries/ui-strings/src/main/res/values-et/strings.xml @@ -1304,8 +1304,6 @@ Turvahoidla kasutamine ei õnnestu Krüptimata Krüptitud verifitseerimata seadme poolt - Vaata üle, kust sa oled Matrix\'i võrku loginud - Selleks et sinu konto ja sõnumid oleks turvatud, verifitseeri kõik oma sessioonid Verifitseeri uus kasutajasessioon, mis pruugib sinu kontot: %1$s Verifitseeri käsitsi etteantud teksti abil Verifitseeri sisselogimissessioon @@ -2318,7 +2316,6 @@ Laadi fail üles Saada pilte ja videosid Ava kaamera - populaarsem valik Kui sõnumite dekrüptimisel tekib viga, siis rakendus saadab selle kohta automaatse teate arendajatele Automaatselt teata dekrüptimise vigadest. Asenda kuvatava nime värvid @@ -2706,9 +2703,6 @@ \n \nSee tähendab, et nad võivad uskuda, et tegemist on tõesti sinuga. Samal ajal näevad ka siin sisestatud sessiooninime. Sessioonide nimede muutmine - Verifitseeritud sessioonid on sellised, kuhu sa oled oma kasutajanime ja salasõnaga sisse loginud ning mille puhul oled risttunnustamise läbi teinud või paroolifraasi abil ta turvaliseks märkinud. -\n -\nSee tähendab, et nendes sessioonides on olemas sinu varasemate sõnumite krüptovõtmed ja teistele osapooltele on nad tuvastatavad nii, et tegemist on tõesti sinuga. Verifitseeritud sessioonid Verifitseerimata sessioonid on sellised, kuhu sa oled oma kasutajanime ja salasõnaga sisse loginud, kuid mille puhul on risttunnustamine tegemata. \n @@ -2805,7 +2799,7 @@ Teine seade on juba võrku loginud. Turvalise sõnumivahetuse ülesseadmisel tekkis turvaviga. Üks kolmest võib olla sattunud vale osapoole kontrolli alla: sinu koduserver, sinu internetiühendus või sinu seade; Päring ei õnnestunud. - Andmed on puhverdamisel… + Andmed on puhverdamisel… Alusta või jätka ringhäälingukõne esitamist Lõpeta ringhäälingukõne salvestamine Peata ringhäälingukõne salvestamine @@ -2890,4 +2884,29 @@ Lülita täpploend sisse/välja Pääsuluba Sinu pääsuluba annab täismahulise ligipääsu sinu kasutajakontole. Palun ära jaga seda teistega. - \ No newline at end of file + Lõppenud küsitlus + Küsitlus on lõppenud. + lõpetas küsitluse. + Küsitlus + Sinu koduserver veel ei toeta jutulõngade loendit. + Alustasime ringhäälingukõnega + Selle ringhäälingukõne esitamine ei õnnestu. + Krüptimisvigade tõttu jääb osa hääli lugemata + + Möödunud päevas polnud ühtegi toimumas olnud küsitlust. +\nVarasemate päevade vaatamiseks laadi veel küsitlusi. + Möödunud %1$d päeva jooksul polnud ühtegi toimumas olnud küsitlust. +\nVarasemate päevade vaatamiseks laadi veel küsitlusi. + + + Möödunud päevas polnud ühtegi küsitlust. +\nVarasemate päevade vaatamiseks laadi veel küsitlusi. + Möödunud %1$d päeva jooksul polnud ühtegi küsitlust. +\nVarasemate päevade vaatamiseks laadi veel küsitlusi. + + Küsitluste kuvamise ootel + Laadi veel küsitlusi + 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 + diff --git a/libraries/ui-strings/src/main/res/values-eu/strings.xml b/libraries/ui-strings/src/main/res/values-eu/strings.xml index f1f834ee04..b045cc8c70 100644 --- a/libraries/ui-strings/src/main/res/values-eu/strings.xml +++ b/libraries/ui-strings/src/main/res/values-eu/strings.xml @@ -1785,8 +1785,6 @@ Errore hau ${app_name}-en kontroletik kanpo dago. Ez dago Google konturik gailua Zifratu gabe Egiaztatu gabeko gailu batek zifratua - Berrikusi non hasi duzun saioa - Egiaztatu zure saio guztiak kontua eta mezuak seguru daudela bermatzeko Egiaztatu zure kontuan hasitako saio berria: %1$s Egiaztatu eskuz testu bidez 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 4db3812237..1b726a2428 100644 --- a/libraries/ui-strings/src/main/res/values-fa/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fa/strings.xml @@ -1106,8 +1106,6 @@ یا دیگر کاره‌های ماتریکس دادای قابلیت ورود چندگانه تأیید دستی با متن تأیید ورود جدیدی که به حسابتان دسترسی دارد: %1$s - تأیید همهٔ نشست‌هایتان برای اطمینان از این که حساب و پیام‌هایتان امنند - بازبینی جاهایی که وارد شده‌اید تأیید برهم‌کنشی با اموجی تأیید ورود رمزنشده @@ -2275,7 +2273,6 @@ پایان نظرسنجی این کار اجازهٔ رأی دادن افراد را پایان داده و نتیجهٔ نهایی نظرسنجی را نمایش خواهد داد. پایان این نظرسنجی؟ - گزینهٔ غالب پایان نظرسنجی نتیجهٔ نهایی بر مبنای %1$d رأی @@ -2783,7 +2780,7 @@ نظرسنجی‌ها پیوست‌ها برچسب‌ها - میانگیری… + میانگیری… زنده تأیید ۳ @@ -2859,9 +2856,6 @@ نشست‌های تأیید شده آن‌هاییند که پس از ورود عبارت عبورتان یا تأیید هویتتان با نشست تأیید شده‌ای دیگر، واردشان شده‌اید. \n \nیعنی تمامی کلیدهای لارم برای رمزگشایی پیام‌های رمزنگاشته‌تان را داشته و این تأیید را به دیگران می‌دهند که به این نشست اطمینان دارید. - نشست‌های تأیید شده به حسابتان وارد و با عبارت عبور امنتان یا تأیید متقابل تأیید شده‌اند. -\n -\nیعنی کلیدهای رمزنگاری پیام‌های پیشینتان را داشته و به دیگر کاربران این تأیید را می‌دهند که این نشست، خودتان هستید. نشست‌های تأیید نشده نشست‌هاییند که به آن‌ها وارد شده‌اید، ولی تأیید متقبالشان نکرده‌اید. \n \nباید به طور خاص مطمئن شوید که این نشست‌ها را می‌شناسید؛ چرا که می‌توانند نشان‌دهندهٔ استفادهٔ تأییدنشده از حسابتان باشند. @@ -2899,4 +2893,29 @@ هیچ نظرسنجی فعّالی در این اتاق وجود ندارد نظرسنجی‌های فعّال تاریخچهٔ نظرسنجی‌ها - \ No newline at end of file + نظرسنجی پایان یافته + نظرسنجی + به نظرسنجی‌ای پایان داد. + به نظرسنجی پایان داد. + کارساز خانگیتان هنوز از سیاهه کردن رشته‌ها پشتیبانی نمی‌کند. + ناتوان در پخش این صدا. + پخش صوتی را آغاز کرد + به خاطر خطاهای رمزگشایی، ممکن است برخی رأی‌ها شمرده نشوند + خطا در واکشی نظرسنجی‌ها. + بار کردن نظرسنجی‌های بیش‌تر + نشان دادن نظرسنجی‌ها + + نظرسنجی گذشته‌ای برای روز گذشته وجود ندارد. +\nبرای دیدن نظرسنجی‌های روزهای پیش، نظرسنجی‌های بیش‌تری بار کنید. + نظرسنجی گذشته‌ای برای %1$d روز گذشته وجود ندارد. +\nبرای دیدن نظرسنجی‌های روزهای پیش، نظرسنجی‌های بیش‌تری بار کنید. + + + نظرسنجی فعّالی برای روز گذشته وجود ندارد. +\nبرای دیدن نظرسنجی‌های روزهای پیش، نظرسنجی‌های بیش‌تری بار کنید. + نظرسنجی فعّالی برای %1$d روز گذشته وجود ندارد. +\nبرای دیدن نظرسنجی‌های روزهای پیش، نظرسنجی‌های بیش‌تری بار کنید. + + از آن‌جا که در حال ضبط پخشی زنده‌اید، نمی‌توانید پیامی صوتی را آغاز کنید. لطفاً برای آغاز ضبط یک پیام صوتی، پخش زنده‌تان را پایان دهید + نمی‌توان پخش صوتی را آغاز کرد + diff --git a/libraries/ui-strings/src/main/res/values-fi/strings.xml b/libraries/ui-strings/src/main/res/values-fi/strings.xml index 4976f49a92..c1cc5da2c8 100644 --- a/libraries/ui-strings/src/main/res/values-fi/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fi/strings.xml @@ -1717,8 +1717,6 @@ Valitse käyttäjänimi. Vahvista vuorovaikutteisesti emojilla Vahvista kirjautuminen - Vahvista kaikki istuntosi varmistaaksesi, että tilisi ja viestisi ovat turvassa - Katselmoi missä olet sisäänkirjautuneena Salattu vahvistamattomalla laitteella Salaamaton Käytä palautusavainta @@ -2309,4 +2307,4 @@ %1$d valittu %1$d valittu - \ No newline at end of file + diff --git a/libraries/ui-strings/src/main/res/values-fr-rCA/strings.xml b/libraries/ui-strings/src/main/res/values-fr-rCA/strings.xml index 94db2935a7..cd39fa3381 100644 --- a/libraries/ui-strings/src/main/res/values-fr-rCA/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fr-rCA/strings.xml @@ -640,8 +640,6 @@ Vérifier la connexion Vérifier manuellement avec un texte Vérifiez la nouvelle connexion accédant à votre compte : %1$s - Vérifiez toutes les sessions pour vous assurer que votre compte et vos messages sont en sécurité - Vérifiez où vous vous êtes connecté Chiffré par un appareil non vérifié Non chiffré envoie de la neige ❄️ 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 cb1684f834..e45211b61a 100644 --- a/libraries/ui-strings/src/main/res/values-fr/strings.xml +++ b/libraries/ui-strings/src/main/res/values-fr/strings.xml @@ -1413,8 +1413,6 @@ Nous n’avons pas pu créer votre conversation privée. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez. Non chiffré Chiffré par un appareil non vérifié - Vérifiez où vous vous êtes connecté - Vérifiez toutes les sessions pour vous assurer que votre compte et vos messages sont en sécurité Vérifiez la nouvelle connexion accédant à votre compte : %1$s %1$s : %2$s %1$s : %2$s %3$s @@ -2272,7 +2270,6 @@ Terminer le sondage Cela empêchera les gens de voter et affichera le résultat final du sondage. Terminer ce sondage \? - option gagnante Terminer le sondage Résultat final sur la base de %1$d vote @@ -2713,9 +2710,6 @@ \n \nCela leur fournit une preuve de confiance que c’est bien avec vous qu\'ils communiquent, mais cela veut également dire qu’ils peuvent voir le nom de la session que vous saisissez ici. Renommer les sessions - Les sessions vérifiées sont celles qui sont identifiées avec votre mot de passe puis vérifiée, soit à l’aide de votre phrase de sécurité, ou bien par la vérification croisée. -\n -\nCela signifie qu’elles possèdent les clés de chiffrement de vos messages passés, et certifient aux autres utilisateurs avec qui vous communiquez que ces sessions viennent vraiment de vous. Sessions vérifiées Les sessions non vérifiées sont celles qui sont identifiées avec votre mot de passe sans avoir fait de vérification croisée. \n @@ -2814,7 +2808,7 @@ Vous pouvez utiliser cet appareil pour connecter un appareil mobile ou un client web avec un QR code. Il y a deux façons de le faire : Se connecter avec un QR code Scanner le QR code - Mise en mémoire tampon… + Mise en mémoire tampon… Mettre en pause la diffusion audio Lire ou continuer la diffusion audio Arrêter l’enregistrement de la diffusion audio @@ -2899,4 +2893,29 @@ Il n’y a aucun sondage en cours dans ce salon Sondages actifs Historique des sondages - \ No newline at end of file + Sondage terminé + Sondage + a terminé un sondage. + A terminé le sondage. + Votre serveur d’accueil ne prend pas encore en charge l’affichage de la liste des fils de discussion. + Impossible de lire cette diffusion audio. + A démarré une diffusion audio + À cause d’erreurs de déchiffrement, certains votes pourraient ne pas avoir été pris en compte + Erreur lors de la récupération des sondages. + Charger plus de sondages + Affichage des sondages + + Il n’y a aucun sondage terminé depuis hier. +\nChargez plus de sondages pour voir les sondages des jours précédents. + Il n’y a aucun sondage terminé depuis %1$d jours. +\nChargez plus de sondages pour voir les sondages des jours précédents. + + + Il n’y a aucun sondage actif depuis hier. +\nChargez plus de sondages pour voir les sondages des jours précédents. + Il n’y a aucun sondage actif depuis %1$d jours. +\nChargez plus de sondages pour voir les sondages des jours précédents. + + 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 + 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 9fdad2dbf0..0aa70cea55 100644 --- a/libraries/ui-strings/src/main/res/values-hu/strings.xml +++ b/libraries/ui-strings/src/main/res/values-hu/strings.xml @@ -1361,8 +1361,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze A biztonsági tárolóhoz nem sikerült hozzáférni Titkosítatlan Ellenőrizetlen eszközzel titkosította - Tekintsd át hol vagy bejelentkezve - Ellenőrizd minden munkamenetedet, hogy a fiókod és az üzeneteid biztonságban legyenek Ellenőrizd ezt az új bejelentkezést ami hozzáfér a fiókodhoz: %1$s Manuális szöveges ellenőrzés Belépés ellenőrzése @@ -2308,7 +2306,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze \n \nElolvashatod a feltételeinket %s. Segíts az ${app_name}-et jobbá tenni - nyerő válasz Jogi dolgok A változások életbelépéséhez indítsd újra az alkalmazást. LaTeX matematikai szintaxis engedélyezése @@ -2712,9 +2709,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze Más felhasználók akikkel közvetlenül vagy szobában beszélgetsz látják a teljes listát a munkameneteidről. \n \nEzzel ők biztosak lehetnek abban, hogy ténylegesen veled beszélgetnek. Ez azt is jelenti, hogy látják a munkamenet nevét amit itt megadsz. - Ellenőrzött munkamenetbe a neveddel és jelszavaddal léptek be és ellenőrizve lett vagy a biztonsági jelmondattal vagy másik munkamenetből. -\n -\nEz azt jelenti, hogy tartalmazzák a titkosítási kulcsokat az régi üzenetekhez, és biztosítja a többieket a kommunikációban, hogy ezt a munkamenetet tényleg te használod. Aláhúzott Áthúzott Dőlt @@ -2814,7 +2808,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze A kérés sikertelen. Hang közvetítés felvételéhez és a szoba idővonalára küldéséhez. Hang közvetítés engedélyezése - Pufferelés… + Pufferelés… Hang közvetítés szüneteltetése Hang közvetítés lejátszása vagy lejátszás folytatása Hang közvetítés felvétel leállítása @@ -2899,4 +2893,29 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze Nincsenek aktív szavazások ebben a szobában Aktív szavazások Szavazás alakulása - \ No newline at end of file + Lezárt szavazások + Szavazás + befejezte a szavazást. + Szavazás vége. + A matrix szerver nem támogatja az üzenetszálak listázását. + A hang közvetítés nem játszható le. + Hang közvetítés indítva + Visszafejtési hibák miatt néhány szavazat nem kerül beszámításra + Szavazás betöltési hiba. + Még több szavazás betöltése + Szavazások megjelenítése + + Egy napja nincs aktív szavazás. +\nTovábbi szavazások betöltése a régi szavazások megjelenítéséhez. + %1$d napja nincs aktív szavazás. +\nTovábbi szavazások betöltése a régi szavazások megjelenítéséhez. + + + Egy napja nincs aktív szavazás. +\nTovábbi szavazások betöltése a régi szavazások megjelenítéséhez. + %1$d napja nincs aktív szavazás. +\nTovábbi szavazások betöltése a régi szavazások megjelenítéséhez. + + 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 + diff --git a/libraries/ui-strings/src/main/res/values-hy/strings.xml b/libraries/ui-strings/src/main/res/values-hy/strings.xml new file mode 100644 index 0000000000..a444d625fb --- /dev/null +++ b/libraries/ui-strings/src/main/res/values-hy/strings.xml @@ -0,0 +1,106 @@ + + + Դուք մերժել եք հրավերը։ Պատճառ` %1$s + %1$sը մերժել է հրավերը։ Պատճառը` %2$s + Դուք լքել եք։ Պատճառը` %1$s + %1$sը լքել է սենյակը։ Պատճառը` %2$s + %1$sը միացել է։ Պատճառը` %2$s + %1$sը լքել է։ Պատճառը` %2$s + Դուք լքել եք սենյակը։ Պատճառը` %1$s + Դուք միացել եք։ Պատճառը` %1$s + Դուք միացել եք սենյակին։ Պատճառը` %1$s + %1$sը միացել է սենյակին։ Պատճառը` %2$s + %1$sը հրավիրել է Ձեզ։ Պատճառը` %2$s + Հաղորդագրությունը ուղարկվում է… + Ուղարկողի սարքավորումը մեզ չի ուղարկել այս հաղորդագրության բանալիները։ + %sը ավարտել է զանգը։ + Դուք պատասխանել եք զանգին։ + %sը պատասխանել է զանգին։ + Դուք հրավիրել եք %1$sին։ Պատճառը` %2$s + %1$sը հրավիրել է %2$sին։ Պատճառը` %3$s + Հաղորդագրությունը ուղարկվել է + Դատարկ սենյակ + + %1$sը, %2$sը, %3$sը և %4$d ուրիշը + %1$sը, %2$sը, %3$sը և %4$d ուրիշները + + %1$sը, %2$sը, %3$sը և %4$sը + %1$sը, %2$sը և %3$sը + %1$sը և %2$sը + Սենյակի Հրավեր + Էլ-փոստի հասցե + Հեռախոսահամար + Դուք այս սենյակին միանալու թույլտվություն չունեք + Ուսումնասիրել Սենյակներ + Ստեղծել Տարածություն + Բոլոր Զրույցները + Սկսել Զրույց + Ստեղծել Սենյակ + Matrix-ի սխալ + Հնարավոր չէ ուղարկել հաղորդագրությունը + ** Հնարավոր չէ վերծանել %sը ** + Լռելյայն + Մոդերատոր + Ադմին + Դուք հրավիրել եք %1$sին + %1$s հրավիրել է %2$sին + Դուք սենյակին միանալու հրավեր եք ուղարկել %1$sին + %1$sը սենյակին միանալու հրավեր է ուղարկել%2$sին + Դուք հեռացրել եք սենյակի անունը + %1$sը հեռացրել է սենյակի անունը + Փոփոխություն չկա։ + ցանկացածը։ + սենյակի բոլոր անդամները։ + սենյակի բոլոր անդամները, իրենց միանալու պահից սկսած։ + սենյակի բոլոր անդամները, իրենց հրավիրման պահից սկսած։ + Դուք ապագա հաղորդագրությունները տեսանելի եք դարձրել %1$sին + %1$sը ապագա հաղորդագրությունները տեսանելի է դարձրել %2$sին + Դուք սենյակի ապագա պատմությունը տեսանելի եք դարձրել %1$sին + %1$sը սենյակի ապագա պատմությունը տեսանելի է դարձրել %2$sին + Դուք ավարտել եք զանգը։ + Դուք սենյակի անունը փոխել եք %1$s + %1$sը սենյակի անունը փոխել է %2$s + %1$s ստեղծել է այս քննարկումը + Դուք ստեղծել եք այս սենյակը + %1$s ստեղծել է այս սենյակը + + %1$d ընտրված է + %1$d ընտրված են + + Ձեր հրավերը + %sի հրավերը + Դուք հեռացրել եք %1$sին + %1$sը հեռացրել է %2$sին + Դուք մերժել եք հրավերը + %1$s մերժել է հրավերը + Դուք լքել եք սենյակը + %1$s լքել է սենյակը + Դուք լքել եք սենյակը + %1$s լքել է սենյակը + Դուք միացել եք + %1$sը միացել է + Դուք միացել եք սենյակին + %1$sը միացել է սենյակին + %1$sը հրավիրել է Ձեզ + Դուք հրավիրել եք %1$sին + %1$sը հրավիրել է %2$sին + Դուք ստեղծել եք այս քննարկումը + Դուք հեռացրել եք սենյակի գլխավոր հասցեն։ + %1$sը հեռացրել է սենյակի գլխավոր հասցեն։ + Դուք սենյակի գլխավոր հասցեն դրել եք %1$sը։ + %1$sը սենյակի գլխավոր հասցեն դրել է %2$sը։ + + Դուք ավելացրել եք %1$sին որպես սենյակի հասցե + Դուք ավելացրել եք %1$sին որպես սենյակի հասցեներ + + + %1$sը ավելացրել է %2$sին որպես սենյակի հասցե + %1$sը ավելացրել է %2$sին որպես սենյակի հասցեներ + + Դուք ետ եք կանչել %1$sի հրավերը։ Պատճառը` %2$s + %1$sը ետ է կանչել %2$sի հրավերը։ Պատճառը` %3$s + %1$sը ընդունել է %2$sի համար հրավերը։ Պատճառը` %3$s + Դուք ընդունել եք %1$sի համար հրավերը։ Պատճառը` %2$s + Դուք հեռացրել եք %1$sին։ Պատճառը` %2$s + %1$sը հեռացրել է %2$sին։ Պատճառը` %3$s + \ 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 8896037037..4c524df727 100644 --- a/libraries/ui-strings/src/main/res/values-in/strings.xml +++ b/libraries/ui-strings/src/main/res/values-in/strings.xml @@ -1957,8 +1957,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan. Verifikasi secara Manual oleh Teks Verifikasi login Verifikasi login baru yang mengakses akun Anda: %1$s - Verifikasi semua sesi Anda untuk memastikan akun & pesan Anda aman - Lihat mana Anda masuk Dienkripsi oleh perangkat yang tidak diverifikasi Tidak Dienkripsi mengirim salju ❄️ @@ -2233,7 +2231,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan. Akhiri poll Ini akan menghentikan orang-orang untuk dapat memberikan suara dan akan menampilkan hasil akhir poll. Akhiri poll ini\? - opsi pemenang Akhiri poll Hasil akhir berdasarkan oleh %1$d suara @@ -2661,9 +2658,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan. \n \nIni memberikan mereka kepastian bahwa mereka berbicara dengan Anda, tetapi ini juga berarti bahwa mereka dapat melihat nama sesi yang Anda masukkan di sini. Mengubah nama sesi - Sesi yang terverifikasi telah masuk dengan kredensial Anda dan juga telah diverifikasi, menggunakan frasa sandi atau memverifikasi secara silang. -\n -\nIni berarti mereka memegang kunci enkripsi ke pesan Anda sebelumnya, dan mengonfirmasi pengguna lain yang Anda berkomunikasi bahwa sesi ini memang Anda. Sesi tidak aktif Sesi belum diverifikasi Sesi terverifikasi @@ -2762,7 +2756,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan. Permintaan gagal. Memungkinkan untuk merekam dan mengirim siaran suara dalam lini masa ruangan. Aktifkan siaran suara - Memuat… + Memuat… Jeda siaran suara Mainkan atau lanjutkan siaran suara Hentikan rekaman siaran suara @@ -2845,4 +2839,23 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan. Tidak ada pemungutan suara yang aktif di ruangan ini Pemungutan suara aktif Riwayat pemungutan suara - \ No newline at end of file + Pemungutan suara diakhiri + Pemungutan suara + mengakhiri pemungutan suara. + Mengakhiri pemungutan suara. + Homeserver Anda belum mendukung pendaftaran utasan. + Tidak dapat memutar siaran suara ini. + Memulai sebuah siaran suara + Karena kesalahan enkripsi, beberapa suara mungkin tidak terhitung + Terjadi kesalahan mendapatkan pemungutan suara. + Muat lebih banyak pemungutan suara + Menampilkan pemungutan suara + + Tidak ada pemungutan suara yang lalu %1$d hari terakhir. +\nMuat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk hari sebelumnya. + + + Tidak ada pemungutan suara aktif %1$d hari terakhir. +\nMuat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk hari sebelumnya. + + diff --git a/libraries/ui-strings/src/main/res/values-is/strings.xml b/libraries/ui-strings/src/main/res/values-is/strings.xml index ceb4d614de..ba505bc0a3 100644 --- a/libraries/ui-strings/src/main/res/values-is/strings.xml +++ b/libraries/ui-strings/src/main/res/values-is/strings.xml @@ -851,7 +851,6 @@ %1$d atkvæði greidd. Greiddu atkvæði til að sjá útkomuna Næ ekki að tengjast heimaþjóni á þessari slóð, athugaðu slóðina - réttur valkostur Spurning eða viðfangsefni Endurræstu forritið til að breytingin taki gildi. Virkja LaTeX-stærðfræði @@ -1672,10 +1671,10 @@ Settu inn tillögu Fáðu aðstoð við að nota ${app_name} Lagaleg atriði - session_name: - app_display_name: - push_key: - app_id: + Birtingarnafn setu: + Birtingarnafn forrits: + Push-lykill: + Auðkenni forrits: Þú ert nú þegar að skoða þennan spjallþráð! Þú ert nú þegar að skoða þessa spjallrás! Útgáfa Matrix SDK @@ -1775,7 +1774,6 @@ Þú ert núna ekki að nota neinn auðkennisþjón. Til að uppgötva og vera finnanleg/ur fyrir félaga þína í teyminu, skaltu bæta við auðkennisþjóni hér fyrir neðan. ${app_name} krefst þess að þú setjir inn auðkennin þín til að framkvæma þessa aðgerð. Endurauðkenning er nauðsynleg - Yfirfarðu hvar þú sért skráð/ur inn Nota endurheimtulykil Athuga öryggisafritunarlykil Þetta er ekki gildur endurheimtulykill @@ -2263,4 +2261,125 @@ Endilega lestu í gegnum stefnur og skilmála fyrir %s Stefnur netþjónsins Element Matrix Services (EMS) er afkastamikil og áreiðanleg hýsingarþjónusta fyrir hraðvirk og örugg samskipti í rauntíma. Skoðaðu hvernig við förum að því á element.io/ems - \ No newline at end of file + + %1$d valið + %1$d valið + + Aðgangsteiknið þitt gefur fullan aðgang að notandaaðgangnum þínum. Ekki deila því með neinum. + Aðgangsteikn + Lauk könnun + Könnun + lauk könnun. + bjó til könnun. + sendi límmerki. + sendi myndskeið. + sendi mynd. + sendi talskilaboð. + sendi hljóðskrá. + sendi skrá. + Sem svar til + Breyta tengli + Búa til tengil + Tengill + Texti + Staðfesta + Reyna aftur + Engin samsvörun\? + Skrái þig inn + Tengist við tæki + Skanna QR-kóða + Ertu að skrá inn farsíma/snjalltæki\? + Veldu \'Skanna QR-kóða\' + Veldu \'Skrá inn með QR-kóða\' + Veldu \'Birta QR-kóða\' + Þessi QR-kóði er ógildur. + Beiðnin mistókst. + Skrá inn með QR-kóða + Skanna QR-kóða + 3 + 2 + 1 + Aðgangur að svæðum + Sannreyndar setur + Óstaðfestar setur + Óvirkar setur + Skrá inn með QR-kóða + Nafn á setu + Endurnefna setu + Stýrikerfi + Gerð + Vafri + Slóð (URL) + Útgáfa + Heiti + Forrit + Taka á móti ýti-tilkynningum á þessu tæki. + Ýti-tilkynningar + Upplýsingar um forrit, tæki og aðgerðir. + Skrá út úr þessari setu + Fela IP-vistfang + Birta IP-vistfang + Skrá út úr öllum öðrum setum + Skrá út + Óvirkar setur + Ráðleggingar varðandi öryggi + Deiling staðsetningar í rauntíma + Sníðing texta + Tengiliður + Myndavél + Staðsetning + Kannanir + Útvörpun tals + Viðhengi + Límmerki + Myndasafn + Byrjaðu talútsendingu + Staðsetning í rauntíma + Þú hefur ekki heimildir til að deila rauntímastaðsetningum + Uppfært fyrir %1$s síðan + Virkja deilingu rauntímastaðsetninga + Í beinni til %1$s + Staðsetningu í rauntíma lauk + Tókst ekki að hlaða inn landakorti +\nÞessi heimaþjónn er mögulega ekki stilltur til að birta landakort. + Villa við að sækja kannanir. + Hlaða inn fleiri könnunum + Birting kannana + Fyrri kannanir + Virkar kannanir + Lauk könnuninni. + %1$s eftir + Fara áfram um 30 sekúndur + Fara afturábak um 30 sekúndur + Hleð í biðminni… + Bein útsending + Beint + Birta upplýsingar um síðasta notanda + Yfirfarðu þetta til að tryggja að aðgangurinn þinn sé öruggur + Þú ert með óstaðfestar setur + Breytingaskrá könnunar + Skilaboð hér eru enda-í-enda dulrituð. +\n +\nÖryggi skilaboðanna þinna er tryggt og einungis þú og viðtakendurnir hafa dulritunarlyklana til að opna skilaboðin. + Skilaboð á þessari spjallrás eru enda-í-enda dulrituð. +\n +\nÖryggi skilaboðanna þinna er tryggt og einungis þú og viðtakendurnir hafa dulritunarlyklana til að opna skilaboðin. + Hóf talútsendingu + Sumir stafir eru óleyfilegir + Setur (╯°□°）╯︵ ┻━┻ framan við hrein textaskilaboð + Skanna QR-kóða + Ekki er enn búið að útbúa notandaaðganginn þinn. Á að hætta skráningarferlinu\? + Útvörpun tals + Virkt: + Auðkenni setu: + Tilvitnanir + Svara til %s + Breytingar + Það lítur út fyrir að þú sért að reyna að tengjast öðrum heimaþjóni. Viltu skrá þig út\? + Já, stöðva + Afvelja allt + Velja allt + Náði því + Þú endaðir talútsendingu. + %1$s endaði talútsendingu. + diff --git a/libraries/ui-strings/src/main/res/values-it/strings.xml b/libraries/ui-strings/src/main/res/values-it/strings.xml index 729b826982..d8c81974b2 100644 --- a/libraries/ui-strings/src/main/res/values-it/strings.xml +++ b/libraries/ui-strings/src/main/res/values-it/strings.xml @@ -1418,8 +1418,6 @@ Accesso all\'archivio sicuro fallito Non criptato Criptato da un dispositivo non verificato - Controlla dove hai fatto l\'accesso - Verifica tutte le tue sessioni per assicurarti che il tuo account e i messaggi siano protetti Verifica il nuovo accesso entrando nel tuo account: %1$s Verifica manualmente con testo Verifica accesso @@ -2263,7 +2261,6 @@ Termina sondaggio Ciò impedirà alle persone di poter votare e mostrerà i risultati finali del sondaggio. Terminare questo sondaggio\? - opzione vincente Termina sondaggio Risultato finale basato su %1$d voto @@ -2704,9 +2701,6 @@ \n \nIn questo modo hanno la certezza che stanno parlando davvero con te, ma significa anche che possono vedere il nome della sessione che inserisci qui. Rinominare le sessioni - Le sessioni verificate hanno effettuato l\'accesso con le tue credenziali e sono state verificate, usando la frase di sicurezza o la verifica incrociata. -\n -\nCiò significa che hanno le tue chiavi di crittografia per i messaggi passati, e confermano agli altri utenti con cui comunichi che queste sessioni sono usate da te. Sessioni verificate Le sessioni non verificate sono quelle in cui è stato fatto l\'accesso con le tue credenziali, ma che non sono state verificate. \n @@ -2805,7 +2799,7 @@ L\'altro dispositivo ha già fatto l\'accesso. Si è verificato un problema di sicurezza configurando i messaggi sicuri. Una delle seguenti cose potrebbe essere compromessa: il tuo homeserver; la/e connessione/i internet; il/i dispositivo/i; La richiesta è fallita. - Buffer… + Buffer… Sospendi trasmissione vocale Avvia o riprendi trasmissione vocale Ferma registrazione trasmissione vocale @@ -2890,4 +2884,29 @@ In questa stanza non ci sono sondaggi attivi Sondaggi attivi Cronologia sondaggi - \ No newline at end of file + Sondaggio terminato + Sondaggio + terminato un sondaggio. + Sondaggio terminato. + Il tuo homeserver non supporta ancora l\'elenco di conversazioni. + A causa di errori di decifrazione, alcuni voti potrebbero non venire contati + Impossibile avviare questa trasmissione vocale. + Iniziata una trasmissione vocale + Errore di recupero dei sondaggi. + Carica più sondaggi + Visualizzazione sondaggi + + Non ci sono sondaggi passati nell\'ultimo giorno. +\nCarica più sondaggi per vedere quelli dei giorni precedenti. + Non ci sono sondaggi passati negli ultimi %1$d giorni. +\nCarica più sondaggi per vedere quelli dei giorni precedenti. + + + Non ci sono sondaggi attivi nell\'ultimo giorno. +\nCarica più sondaggi per vedere quelli dei giorni precedenti. + Non ci sono sondaggi attivi negli ultimi %1$d giorni. +\nCarica più sondaggi per vedere quelli dei giorni precedenti. + + Non puoi iniziare un messaggio vocale perché stai registrando una trasmissione in diretta. Termina la trasmissione per potere iniziare un messaggio vocale + Impossibile iniziare il messaggio vocale + diff --git a/libraries/ui-strings/src/main/res/values-iw/strings.xml b/libraries/ui-strings/src/main/res/values-iw/strings.xml index b9f81ae446..aabdc7371e 100644 --- a/libraries/ui-strings/src/main/res/values-iw/strings.xml +++ b/libraries/ui-strings/src/main/res/values-iw/strings.xml @@ -1672,8 +1672,6 @@ אמת ידנית באמצעות טקסט אמת את הכניסה החדשה שניגשת לחשבונך: %1$s - אמת את כל ההפעלות שלך כדי להבטיח שהחשבון וההודעות שלך בטוחים - בדוק היכן נכנסת מוצפן על ידי מכשיר לא מאומת לא מוצפן שולח שלג ❄️ @@ -2136,7 +2134,6 @@ סוף המשאל פעולה זו תעצור את האפשרות להצביע ותציג את תוצאות המשאל. סוף המשאל\? - אפשרות הזוכה סוף המשאל שאלה לא יכולה להיות ריקה צור משאל @@ -2506,4 +2503,4 @@ \nזה יהיה מעבר חד פעמי שכן שרשורים הם כעת חלק ממפרט Matrix. שיתוף מסך של ${app_name} המסך משותף כרגע - \ 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 11ab6ee857..d893156f6e 100644 --- a/libraries/ui-strings/src/main/res/values-ja/strings.xml +++ b/libraries/ui-strings/src/main/res/values-ja/strings.xml @@ -139,8 +139,8 @@ メールアドレスを追加 電話番号を追加 通知音 - このアカウントでは通知を有効にする - このセッションでは通知を有効にする + このアカウントで通知を有効にする + このセッションで通知を有効にする 1対1のチャットでのメッセージ グループチャットでのメッセージ ルームへ招待されたとき @@ -526,7 +526,7 @@ 暗号化を有効にする いったん有効にすると、暗号化を無効にすることはできません。 セキュリティー - 詳しく知る + 詳細を表示 その他の設定 管理者としての操作 ルームの設定 @@ -1252,7 +1252,7 @@ Element Matrix Servicesに接続 Matrix IDでサインイン Matrix IDでサインイン - 詳しく知る + 詳細を表示 その他 カスタムと高度な設定 組織向けのプレミアムホスティング @@ -1845,8 +1845,8 @@ %1$d個の投票があります。結果を見るには投票してください 未認証の端末で暗号化 - メッセージを紙吹雪と共に送る - メッセージを降雪と共に送る + メッセージを紙吹雪と共に送信 + メッセージを降雪と共に送信 紙吹雪🎉を送る 降雪❄️を送る あなたのチームのメッセージングに。 @@ -1930,7 +1930,6 @@ 非公開で招待が必要なルームは表示されていません。 \nルームを追加する権限はありません。 非公開で招待が必要なルームは表示されていません。 - 勝者 知人に見つけてもらえるように電話番号を設定できます。任意です。 メッセージキー 復旧用のパスフレーズ @@ -2223,8 +2222,6 @@ 指紋や顔画像など、端末に固有の生体認証を有効にする。 絵文字で認証 テキストで認証 - すべてのセッションを認証し、アカウントとメッセージが安全であることを確認してください - ログインしている場所を確認 復旧用の手段を全て無くしてしまいましたか？全てリセットする クロス署名に対応した他のMatrixのクライアントでも使用できます。 どのような議論を%sで行いたいですか？ @@ -2443,7 +2440,7 @@ レイアウトの設定 了解 次へ - 詳しく知る + 詳細を表示 秒 分 時 @@ -2473,4 +2470,21 @@ QRコードをスキャン QRコードをスキャン QRコードが不正です。 - \ No newline at end of file + スペースは、ルームと連絡先をまとめる新しい方法です。はじめに、スペースを作成しましょう。 + 最近の履歴を表示 + この暗号化されたメッセージの信頼性はこの端末では保証できません。 + アカウントが安全かどうか確認してください + 未認証のセッションがあります + 連絡先 + お気に入り + 未読あり + 全て + はい、停止 + 全ての選択を解除 + 全て選択 + 音声配信を終了しました。 + %1$sが音声配信を終了しました。 + + %1$dを選択しました + + diff --git a/libraries/ui-strings/src/main/res/values-kab/strings.xml b/libraries/ui-strings/src/main/res/values-kab/strings.xml index 353fb99f53..c16b5624a8 100644 --- a/libraries/ui-strings/src/main/res/values-kab/strings.xml +++ b/libraries/ui-strings/src/main/res/values-kab/strings.xml @@ -463,8 +463,6 @@ Senqed iman-ik•im d wiyaḍ akken ad qqimen yidiwenniyen-ik•im d iɣellsanen Seqdec tasarut n uɛeddi Ur yettwawgelhen ara - Senqed ansi i d-tkecmeḍ - Senqed akk tiqimiyin-ik·im i wakken ad tḍemneḍ amiḍan-ik·m & yiznan d iɣelsanen Senqed s ufus s ttawil n uḍris Azen Sbadu diff --git a/libraries/ui-strings/src/main/res/values-lo/strings.xml b/libraries/ui-strings/src/main/res/values-lo/strings.xml index a92adb0225..715f2894ef 100644 --- a/libraries/ui-strings/src/main/res/values-lo/strings.xml +++ b/libraries/ui-strings/src/main/res/values-lo/strings.xml @@ -1634,8 +1634,6 @@ ຢືນຢັນການເຂົ້າສູ່ລະບົບ ຢືນຢັນຂໍ້ຄວາມດ້ວຍຕົນເອງ ຢືນຢັນການເຂົ້າສູ່ລະບົບໃໝ່ທີ່ເຂົ້າເຖິງບັນຊີຂອງທ່ານ: %1$s - ຢັ້ງຢືນທຸກລະບົບຂອງທ່ານເພື່ອໃຫ້ແນ່ໃຈວ່າບັນຊີ ແລະ ຂໍ້ຄວາມຂອງທ່ານປອດໄພ - ກວດເບິ່ງບ່ອນທີ່ທ່ານເຂົ້າສູ່ລະບົບ ເຂົ້າລະຫັດໂດຍອຸປະກອນທີ່ບໍ່ໄດ້ຮັບການຢືນຢັນ ບໍ່ໄດ້ເຂົ້າລະຫັດ ສົ່ງຫິມະຕົກ ❄️ @@ -2371,7 +2369,6 @@ ສິ້ນສຸດແບບສຳຫຼວດ ອັນນີ້ຈະຢຸດບໍ່ໃຫ້ຜູ້ຄົນສາມາດລົງຄະແນນສຽງໄດ້ ແລະຈະສະແດງຜົນສຸດທ້າຍຂອງການສຳຫຼວດຄວາມຄິດເຫັນ. ສິ້ນສຸດແບບສຳຫຼວດນີ້ບໍ\? - ເລືອກຜູ້ຊະນະ ສິ້ນສຸດແບບສຳຫຼວດ ຜົນສຸດທ້າຍໂດຍອີງໃສ່ %1$d ຄະແນນສຽງ diff --git a/libraries/ui-strings/src/main/res/values-lt/strings.xml b/libraries/ui-strings/src/main/res/values-lt/strings.xml index aeba3d53e6..7ad901a9d2 100644 --- a/libraries/ui-strings/src/main/res/values-lt/strings.xml +++ b/libraries/ui-strings/src/main/res/values-lt/strings.xml @@ -1324,7 +1324,6 @@ Apklausa baigėsi Prabalsuota Baigti apklausą - laimėtojo parinktis Rezultatai bus matomi pasibaigus apklausai Nėra balsų Iš naujo paleiskite programą, kad pakeitimas įsigaliotų. @@ -2183,4 +2182,4 @@ Įjungti atidėtas AŽ Supaprastintas Element su nebūtinais skirtukais Įjungti naują išdėstymą - \ No newline at end of file + diff --git a/libraries/ui-strings/src/main/res/values-lv/strings.xml b/libraries/ui-strings/src/main/res/values-lv/strings.xml index 1787653fae..9201bf146a 100644 --- a/libraries/ui-strings/src/main/res/values-lv/strings.xml +++ b/libraries/ui-strings/src/main/res/values-lv/strings.xml @@ -559,8 +559,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka. Uzaicināt lietotājus Apstipriniet savu identitāti, verificējot šo pierakstīšanos no kādas citas savas sesijas, tādējādi ļaujot piekļūt šifrētajām ziņām. Manuāli verificēt ar tekstu - Verificējiet visas savas sesijas, lai nodrošinātos, ka jūsu konts un ziņas ir drošībā - Pārskatiet savas pierakstīšanās Nešifrēts vai kādu citu Matrix lietotni ar cross-signing atbalstu Šis konts ir deaktivizēts. diff --git a/libraries/ui-strings/src/main/res/values-nb-rNO/strings.xml b/libraries/ui-strings/src/main/res/values-nb-rNO/strings.xml index 067dbbbc28..13a4400c31 100644 --- a/libraries/ui-strings/src/main/res/values-nb-rNO/strings.xml +++ b/libraries/ui-strings/src/main/res/values-nb-rNO/strings.xml @@ -1001,8 +1001,6 @@ Hvis du tilbakestiller alt Du starter på nytt uten historikk, ingen meldinger, pålitelige enheter eller pålitelige brukere Kryptert av en ubekreftet enhet - Gjennomgå hvor du er logget inn - Bekreft alle øktene dine for å sikre at kontoen og meldingene dine er trygge Bekreft den nye påloggingen som får tilgang til kontoen din: %1$s Bekreft pålogging Bekreft identiteten din ved å bekrefte denne påloggingen fra en av de andre øktene dine, og gi den tilgang til krypterte meldinger. @@ -1253,4 +1251,4 @@ %1$s endret visningsnavnet sitt til %2$s %1$s utestengte %2$s %ss invitasjon - \ No newline at end of file + diff --git a/libraries/ui-strings/src/main/res/values-nl/strings.xml b/libraries/ui-strings/src/main/res/values-nl/strings.xml index 5bc5305df4..c6154ddb45 100644 --- a/libraries/ui-strings/src/main/res/values-nl/strings.xml +++ b/libraries/ui-strings/src/main/res/values-nl/strings.xml @@ -1858,8 +1858,6 @@ Interactief verifiëren door Emoji Handmatig verifiëren via tekst Verifieer de nieuwe login voor toegang tot je account: %1$s - Verifieer al je sessies om ervoor te zorgen dat je account en berichten veilig zijn - Bekijk waar je bent ingelogd Versleuteld door een niet-geverifieerd apparaat stuurt sneeuwval ❄️ stuurt confetti 🎉 @@ -2186,7 +2184,6 @@ Einde poll Hierdoor kunnen mensen niet meer stemmen en worden de definitieve resultaten van de poll weergegeven. Deze poll beëindigen\? - winnaar optie Einde poll Eindresultaat gebaseerd op %1$d stem @@ -2746,7 +2743,7 @@ Deze sessie is klaar voor veilige communicatie. Je huidige sessie is klaar voor veilige communicatie. Onbekende verificatiestatus - Bufferen + Bufferen Live De authenticiteit van dit versleutelde bericht kan niet worden gegarandeerd op dit apparaat. Incognito toetsenbord @@ -2787,9 +2784,6 @@ \n \nDit geeft ze het vertrouwen dat ze echt met jou praten, maar het betekent ook dat ze de sessienaam kunnen zien die je hier invoert. Sessies hernoemen - Geverifieerde sessies zijn ingelogd met jouw inloggegevens en vervolgens geverifieerd, hetzij met je veilige wachtwoordzin of door kruisverificatie. -\n -\nDit betekent dat ze coderingssleutels bevatten voor je eerdere berichten en bevestigen aan andere gebruikers waarmee je communiceert dat deze sessies echt van jou zijn. Niet-geverifieerde sessies zijn sessies die zijn aangemeld met jouw inloggegevens, maar niet zijn geverifieerd. \n \nJe moet er vooral zeker van zijn dat je deze sessies herkent, omdat ze een ongeoorloofd gebruik van je account kunnen vertegenwoordigen. @@ -2842,4 +2836,4 @@ Bewerking Recente gesprekken in het deelmenu van het systeem tonen Direct delen inschakelen - \ 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 4b26562b06..0aad400340 100644 --- a/libraries/ui-strings/src/main/res/values-pl/strings.xml +++ b/libraries/ui-strings/src/main/res/values-pl/strings.xml @@ -665,7 +665,7 @@ Wycisz Ustawienia Nie ignorujesz żadnych użytkowników - Widziany przez + Wyświetlono przez Zaawansowane ustawienia Tryb programisty Ustawienia @@ -1553,8 +1553,6 @@ Interaktywna weryfikacja z wykorzystaniem emotikon Zweryfikuj logowanie Zweryfikuj nowe logowanie do swojego konta: %1$s - Sprawdź wszystkie swoje sesje żeby upewnić się, że Twoje konto oraz wiadomości są bezpieczne - Sprawdź gdzie jesteś zalogowany(-na) Zaszyfrowane przez niezweryfikowane urządzenie Niezaszyfrowane @@ -2514,7 +2512,6 @@ Otwarta ankieta Rodzaj ankiety Modyfikacja ankiety - opcja zwyciężająca Brak głosów Zaproszenie do tej przestrzeni zostało wysłane do %s, które nie jest powiązane z Twoim kontem Zaproszenie do tego pokoju zostało wysłane do %s, które nie jest powiązane z Twoim kontem @@ -2798,4 +2795,4 @@ Rozumiem Zwiń %s pokojów Rozwiń %s pokojów - \ No newline at end of file + diff --git a/libraries/ui-strings/src/main/res/values-pt-rBR/strings.xml b/libraries/ui-strings/src/main/res/values-pt-rBR/strings.xml index a5aa778156..f6a2c94553 100644 --- a/libraries/ui-strings/src/main/res/values-pt-rBR/strings.xml +++ b/libraries/ui-strings/src/main/res/values-pt-rBR/strings.xml @@ -1526,8 +1526,6 @@ Falha para acessar armazenamento seguro Não-encripada Encriptada por um dispositivo não-verificado - Revisar onde você está com login feito - Verifique todas as suas sessões para assegurar que sua conta & mensagens estão seguras Verifique o novo login acessando sua conta: %1$s Verificar Manualmente por Texto Verificar login @@ -2272,7 +2270,6 @@ Terminar sondagem Isto vai parar pessoas de serem capazes de votar e vai exibir os resultados finais da sondagem. Terminar esta sondagem\? - opção vencedora Terminar sondagem Resultado final baseado em %1$d voto @@ -2713,9 +2710,6 @@ \n \nIsto as/os provê com confiança que elas(es) são estão realmente falando com você, mas também significa que elas(es) veem o nome da sessão que você entrar aqui. Renomeando sessões - Sessões verificadas têm feito login com suas credenciais e então têm sido verificadas, ou usando sua frasepasse segura ou por verificação cruzada. -\n -\nIsto significa que elas mantêm chaves de encriptação para suas mensagens anteriores, e confirmam a outras(os) usuárias(os) com quem você está comunicando que estas sessões são realmente você. Sessões verificadas Sessões não-verificadas são sessões que você tem feito login com suas credenciais mas não têm sido verificadas cruzado. \n @@ -2814,7 +2808,7 @@ A requisição falhou. Seja capaz de gravar e enviar broadcast de voz em timeline de sala. Broadcast de voz - Buffering… + Buffering… Pausar broadcast de voz Tocar ou retomar broadcast de voz Parar gravação de broadcast de voz @@ -2890,4 +2884,4 @@ Tem certeza que você quer parar seu broadcast ao vivo\? Isto vai terminar o broadcast e a gravação completa vai estar disponível na sala. Parar de fazer broadcasting ao vivo\? Sim, Parar - \ 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 0d8f1103fe..1255776c1f 100644 --- a/libraries/ui-strings/src/main/res/values-ru/strings.xml +++ b/libraries/ui-strings/src/main/res/values-ru/strings.xml @@ -1577,8 +1577,6 @@ Не удалось получить доступ к защищенному хранилищу данных Не зашифровано Зашифровано неподтверждённой сессией - Посмотрите, где вы вошли - Подтвердите все свои сессии, чтобы убедиться в безопасности вашей учетной записи и сообщений Ручная проверка с помощью текста Перепроверьте эту ссылку Ссылка %1$s перенаправит вас на другой сайт: %2$s. @@ -2332,7 +2330,6 @@ Завершить опрос Это лишит людей возможности голосовать и отобразит окончательные результаты опроса. Завершить этот опрос\? - вариант-победитель Завершить опрос Окончательный результат на основании %1$d голоса @@ -2882,9 +2879,6 @@ Заверенные сеансы есть везде, где вы используете эту учётную запись после ввода своей мнемонической фразы или подтверждения своей личности с помощью другого заверенного сеанса. \n \nЭто означает, что у вас есть все ключи, необходимые для разблокировки ваших зашифрованных сообщений и подтверждения другим пользователям, что вы доверяете этому сеансу. - Заверенные сеансы — сеансы, которые вошли в систему с вашими учётными данными, а затем были заверены либо мнемонической фразой (бумажным ключом), либо путём перекрёстной сверки. -\n -\nЭто означает, что они хранят ключи шифрования от ваших предыдущих сообщений и подтверждают другим пользователям, с которыми вы общаетесь, что эти сеансы — действительно ваши. Незаверенные сеансы — это сеансы, которые вошли в систему с вашими учётными данными, но не были перекрёстно заверены. \n \nВы должны быть особенно уверены, что признаёте эти сеансы, поскольку они могут представлять собой несанкционированное использование вашей учётной записи. @@ -2921,7 +2915,7 @@ Не получилось начать новую голосовую трансляцию Перемотать вперёд на 30 секунд Перемотать назад на 30 секунд - Буферизация… + Буферизация… Приостановить голосовую трансляцию Проиграть или продолжить голосовую трансляцию Остановить запись голосовой трансляции @@ -2976,4 +2970,4 @@ Этот сеанс не поддерживает шифрование и поэтому не может быть заверен. %1$s завершил(а) голосовую трансляцию. Вы завершили голосовую трансляцию. - \ 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 34155ba6a5..ed3f47f9d3 100644 --- a/libraries/ui-strings/src/main/res/values-sk/strings.xml +++ b/libraries/ui-strings/src/main/res/values-sk/strings.xml @@ -2001,8 +2001,6 @@ Interaktívne overte pomocou emotikonov Manuálne overte pomocou textu Overte nové prihlásenie s prístupom k vášmu účtu: %1$s - Overte všetky vaše relácie, aby ste si boli istý, že sú vaše správy a účet bezpečné - Skontrolujte, kde ste prihlásení Šifrované neovereným zariadením pošle sneženie ❄️ pošle konfety 🎉 @@ -2421,7 +2419,6 @@ Pokračovať pomocou jednotného prihlásenia SSO jednotné prihlásenie SSO Zatvoriť výzvu na zálohovanie kľúčov - Výťazná odpoveď Nezaškrtnuté Zaškrtnuté Rozpísaná správa @@ -2767,9 +2764,6 @@ \n \nTo im poskytuje istotu, že sa komunikujú naozaj s vami, ale zároveň to znamená, že vidia názov relácie, ktorý sem zadáte. Premenovanie relácií - Overené relácie, do ktorých ste sa prihlásili pomocou svojich prihlasovacích údajov a ktoré boli následne overené buď pomocou vašej bezpečnostnej prístupovej frázy, alebo krížovým overením. -\n -\nTo znamená, že majú šifrovacie kľúče pre vaše predchádzajúce správy a potvrdzujú ostatným používateľom, s ktorými komunikujete, že tieto relácie ste skutočne vy. Overené relácie Neoverené relácie sú relácie, do ktorých ste sa prihlásili pomocou svojich prístupových údajov, ale ktoré neboli krížovo overené. \n @@ -2868,7 +2862,7 @@ Žiadosť zlyhala. Možnosť nahrávania a odosielania hlasového vysielania v časovej osi miestnosti. Zapnúť hlasové vysielanie - Načítavanie do vyrovnávacej pamäte… + Načítavanie do vyrovnávacej pamäte… Pozastaviť hlasové vysielanie Prehrať alebo pokračovať v nahrávaní hlasového vysielania Zastaviť nahrávanie hlasového vysielania @@ -2955,4 +2949,33 @@ V tejto miestnosti nie sú žiadne aktívne ankety Aktívne ankety História ankety - \ No newline at end of file + Ukončená anketa + Anketa + ukončil/a anketu. + Ukončil/a anketu. + Váš domovský server zatiaľ nepodporuje zobrazovanie vlákien. + Toto hlasové vysielanie nie je možné prehrať. + Spustil/a hlasové vysielanie + Z dôvodu chýb v dešifrovaní sa niektoré hlasy nemusia započítať + Chyba pri načítavaní ankiet. + Načítať ďalšie ankety + Zobrazenie ankiet + + Za uplynulý deň nie sú k dispozícii žiadne ankety. +\nNačítaním ďalších ankiet zobrazíte ankety za predchádzajúce dni. + Za posledné %1$d dni nie sú aktívne žiadne ankety. +\nNačítaním ďalších ankiet zobrazíte ankety za predchádzajúce dni. + Za posledných %1$d dní nie sú aktívne žiadne ankety. +\nNačítaním ďalších ankiet zobrazíte ankety za predchádzajúce dni. + + + Za posledný deň nie sú aktívne žiadne ankety. +\nNačítaním ďalších ankiet zobrazíte ankety za predchádzajúce dni. + Za posledných %1$d dni nie sú aktívne žiadne ankety. +\nNačítaním ďalších ankiet zobrazíte ankety za predchádzajúce dni. + Za posledných %1$d dní nie sú aktívne žiadne ankety. +\nNačítaním ďalších ankiet zobrazíte ankety za predchádzajúce dni. + + 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 + diff --git a/libraries/ui-strings/src/main/res/values-sq/strings.xml b/libraries/ui-strings/src/main/res/values-sq/strings.xml index c3f9d53c99..374080cb23 100644 --- a/libraries/ui-strings/src/main/res/values-sq/strings.xml +++ b/libraries/ui-strings/src/main/res/values-sq/strings.xml @@ -1413,8 +1413,6 @@ S’u arrit të hyhet në depozitë të sigurt Të pafshehtëzuara Fshehtëzuar nga një pajisje e paverifikuar - Shqyrtojini kur të jeni i futur - Verifikoni krejt sesionet tuaj që të siguroheni se llogaria & mesazhet tuaja janë të sigurt Verifikoni kredencialet e reja për hyrje te llogaria juaj: %1$s Verifikojeni Dorazi përmes Teksti Verifikoni kredenciale hyrjeje @@ -2512,9 +2510,6 @@ \n \nKjo u jep atyre besim se po flasin vërtet me ju, por do të thotë gjithashtu që mund shohin emrin e sesionit që jepni këtu. Riemërtim sesionesh - Sesionet e verifikuar përfaqësojnë sesione ku është bërë hyrja dhe janë verifikuar, ose duke përdorur togfjalëshin tuaj të sigurt, ose me verifikim. -\n -\nKjo do të thotë se zotërojnë kyçe fshehtëzimi për mesazhe tuajt të mëparshëm dhe u ripohojnë përdoruesve të tjerë, me të cilët po komunikoni, se këto sesione ju takojnë juve. Sesione të verifikuar Sesionet e paverifikuar janë sesione në të cilët është bërë hyrja me kredencialet tuaja, por pa u bërë verifikim. \n @@ -2659,7 +2654,7 @@ \nKy shërbyes Home mund të mos jetë formësuar të shfaqë harta. Përfundimet do të jenë të dukshme pasi të ketë përfunduar pyetësori Kur bëhet ftesë në një dhomë të fshehtëzuar që ka historik ndarjesh me të tjerët, historiku i fshehtëzuar do të jetë i dukshëm. - + Ndal transmetim zanor Luani ose vazhdoni luajtje transmetimi zanor Ndal incizim transmetimi zanor @@ -2876,10 +2871,20 @@ Tekst Tokeni juaj i hyrjeve jep hyrje të plotë në llogarinë tuaj. Mos ia jepni kujt. Token Hyrjesh - S’ka pyetësorë të kaluar në këtë dhomë - Pyetësorë të kaluar + Në këtë dhomë s’ka pyetësorë të dikurshëm + Pyetësorë të dikurshëm S’ka pyetësorë aktivë në këtë dhomë Pyetësorë aktivë - mundësia fituese Historik pyetësorësh - \ No newline at end of file + Përfundoi pyetësorin + Përfundoi pyetësorin. + Pyetësor + përfundoi një pyetësor. + Shfaq/fshi listë me toptha + Shfaq/fshi listë të numërtuar + Ujdisni lidhje + Për shkak gabimesh shfshehtëzimi, mund të mos jenë numëruar disa vota + S’arrihet të luhet ky transmetim zanor. + Nisni një transmetim zanor + Shërbyesi juaj Home s’mbulon ende paraqitje rrjedhash. + diff --git a/libraries/ui-strings/src/main/res/values-sv/strings.xml b/libraries/ui-strings/src/main/res/values-sv/strings.xml index 373165802a..877a95f2de 100644 --- a/libraries/ui-strings/src/main/res/values-sv/strings.xml +++ b/libraries/ui-strings/src/main/res/values-sv/strings.xml @@ -662,8 +662,6 @@ Kryptering inte aktiverat Aviseringskonfiguration Meddelanden som innehåller @room - Granska var du är inloggad - Verifiera alla dina sessioner för att se till att ditt konto och dina meddelanden är säkra Vi kunde inte skapa ditt DM. Vänligen kolla användarna du vill bjuda in och försök igen. BJUD IN Bjud in användare @@ -2281,7 +2279,6 @@ Avsluta omröstningen Det här kommer att stoppa personer från att rösta och visa det slutgiltiga resultatet av omröstningen. Avsluta den här omröstningen\? - vinnande alternativ Avsluta omröstning Slutgiltigt resultat baserat på %1$d röst @@ -2737,9 +2734,6 @@ \n \nDet försäkrar dem om att de verkligen pratar med dig, men det betyder också att de kan se sessionsnamnet du anger här. Döper om sessioner - Verifierade sessioner har loggat in med dina uppgifter och har sedan verifierats, antingen med din säkra lösenfras eller genom att kors-verifiera. -\n -\nDet betyder att det har krypteringsnycklar för dina tidigare meddelanden, bekräftar för andra användare du kommunicerar med att dessa sessioner verkligen är du. Verifierade sessioner Overifierade sessioner är sessioner som har loggat in med dina uppgifter men som inte har kors-verifierats. \n @@ -2804,7 +2798,7 @@ Använd din inloggade enhet för att skanna QR-koden nedan: Logga in med QR-kod Använd den här enhetens kamera för att skanna QR-koden på din andra enhet: - Buffrar… + Buffrar… Pausa röstsändning Spela eller återuppta röstsändning Avsluta inspelning av röstsändning @@ -2882,4 +2876,26 @@ Direktsändning Du avslutade en röstsändning. %1$s avslutade en röstsändning. - \ No newline at end of file + Din åtkomsttoken ger full åtkomst till ditt konto. Dela den inte med någon. + Åtkomsttoken + Avslutade omröstning + Omröstning + avslutade en omröstning. + Redigera länk + Skapa en länk + Länk + Text + Växla punktlista + Växla numrerad lista + Sätt länk + Det finns inga tidigare omröstningar i det här rummet + Tidigare omröstningar + Det finns inga aktiva omröstningar i det här rummet + Aktiva omröstningar + Avslutade omröstningen. + Är du säker på att du vill avsluta din direktsändning\? Detta kommer att avsluta sändningen och den fulla inspelningen kommer att bli tillgänglig i rummet. + Avsluta röstsändning\? + Omröstningshistorik + Din hemserver har inte stöd för att lista trådar än. + Ja, sluta + diff --git a/libraries/ui-strings/src/main/res/values-sw/strings.xml b/libraries/ui-strings/src/main/res/values-sw/strings.xml new file mode 100644 index 0000000000..d1938c5896 --- /dev/null +++ b/libraries/ui-strings/src/main/res/values-sw/strings.xml @@ -0,0 +1,14 @@ + + + umeondoa %1$s + %1$s kuondolewa %2$s + Ulikataa mwaliko + %1$s alikataa mwaliko + Ulijiunga + %1$s alijiunga + %1$s Amekualika + + %1$d Iliyochaguliwa + %1$d Ziliyochaguliwa + + 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 2ee9685c76..6294526be2 100644 --- a/libraries/ui-strings/src/main/res/values-uk/strings.xml +++ b/libraries/ui-strings/src/main/res/values-uk/strings.xml @@ -1156,7 +1156,6 @@ Довірений Не довірений вхід Підтвердьте особу, звіривши цей вхід своїм іншим сеансом і надавши йому доступ до зашифрованих повідомлень. - Звірте усі свої сеанси, щоб переконатись у безпечності вашого облікового запису та повідомлень Сеанси Не вдалось отримати сеанси Ви не маєте доступу до цього повідомлення, бо відправник не довіряє вашому сеансу @@ -2012,7 +2011,6 @@ Додати людей Додати учасників Перевірте це посилання - Перевірте, де ви ввійшли Інтерактивна перевірка за допомогою емоджі Виберіть пароль. Виберіть ім\'я користувача. @@ -2360,7 +2358,6 @@ Завершити опитування Люди більше не зможуть голосувати, і будуть показані остаточні результати опитування. Завершити це опитування\? - варіант-переможець Завершити опитування Остаточний результат на підставі %1$d голосу @@ -2821,9 +2818,6 @@ \n \nЦе дає їм впевненість у тому, що вони дійсно розмовляють з вами, а також означає, що вони можуть бачити назву сеансу, яку ви ввели тут. Перейменування сеансів - Звірені сеанси — ті, до яких ви ввійшли за допомогою своїх облікових даних, а потім пройшли перевірку, використовуючи вашу захищену парольну фразу або шляхом перехресної перевірки. -\n -\nЦе означає, що вони мають ключі шифрування для ваших попередніх повідомлень і підтверджують іншим користувачам, з якими ви спілкуєтеся, що ці сеанси — це дійсно ви. Звірені сеанси Не звірені сеанси — це сеанси, до яких ви ввійшли в за допомогою своїх облікових даних, але не пройшли перехресну перевірку. \n @@ -2922,7 +2916,7 @@ Запит не виконаний. Можливість записувати та надсилати голосові трансляції до стрічки кімнати. Увімкнути голосові трансляції - Буферизація… + Буферизація… Призупинити голосову трансляцію Відтворити або поновити відтворення голосової трансляції Припинити запис голосової трансляції @@ -3011,4 +3005,37 @@ У цій кімнаті немає активних опитувань Активні опитування Історія опитувань - \ No newline at end of file + Завершене опитування + Опитування + завершує опитування. + Опитування завершено. + Ваш домашній сервер поки що не підтримує створення списків гілок. + Неможливо відтворити цю голосову трансляцію. + Розпочато голосову трансляцію + Через помилки розшифрування деякі голоси можуть бути не враховані + + За %1$d минулий день немає минулих опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + За минулі %1$d дні немає минулих опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + За минулі %1$d днів немає минулих опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + За минулі %1$d днів немає минулих опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + + + За %1$d останній день немає активних опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + За останні %1$d дні немає активних опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + За останні %1$d днів немає активних опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + За останні %1$d днів немає активних опитувань. +\nЗавантажте більше опитувань, щоб переглянути опитування за попередні дні. + + Помилка отримання опитувань. + Завантажити більше опитувань + Показ опитувань + Ви не можете розпочати запис голосового повідомлення, оскільки ви записуєте трансляцію наживо. Будь ласка, заверште її, щоб розпочати запис голосового повідомлення + Не вдалося розпочати запис голосового повідомлення + diff --git a/libraries/ui-strings/src/main/res/values-vi/strings.xml b/libraries/ui-strings/src/main/res/values-vi/strings.xml index c6dc97f782..70755f1394 100644 --- a/libraries/ui-strings/src/main/res/values-vi/strings.xml +++ b/libraries/ui-strings/src/main/res/values-vi/strings.xml @@ -1193,7 +1193,6 @@ Kết thúc cuộc thăm dò ý kiến Điều này sẽ ngăn mọi người có thể bỏ phiếu và sẽ hiển thị kết quả cuối cùng của cuộc thăm dò. Kết thúc cuộc thăm dò này\? - tùy chọn người chiến thắng Kết thúc cuộc thăm dò ý kiến Câu hỏi không thể trống TẠO CUỘC THĂM DÒ Ý KIẾN @@ -1472,8 +1471,6 @@ Xác minh đăng nhập Xác minh thủ công bằng Văn bản Xác minh thông tin đăng nhập mới truy cập vào tài khoản của bạn: %1$s - Xác minh tất cả các phiên của bạn để đảm bảo tài khoản và tin nhắn của bạn được an toàn - Xem lại nơi bạn đăng nhập Được mã hóa bởi một thiết bị chưa được xác minh Không được mã hóa gửi tuyết rơi ❄️ 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 9f975e61e4..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 @@ -1459,8 +1459,6 @@ 访问安全存储失败 未加密 由未验证设备加密 - 查看你的登录位置 - 验证你的全部会话确保你的账户和消息安全 验证访问你的账户的新登录：%1$s 使用文本手动验证 验证登录 @@ -1692,8 +1690,8 @@ 一些字符不被允许 请提供一个房间地址 此地址已被使用 - 你可以启用此选项如果此房间将仅用于你的主服务器上的内部团队协作。此选项之后无法更改。 - 屏蔽不是 %s 一部分的任何人加入此房间 + 若房间仅用于与你的主服务器上的内部团队协作，则你可以启用此选项。此选项之后无法更改。 + 阻止任何不属于%s的人加入此房间 隐藏高级 显示高级 清除历史记录 @@ -2231,7 +2229,6 @@ 结束投票 这将使人们无法再投票，并将显示投票的最终结果。 结束此投票？ - 赢家选项 结束投票 基于 %1$d 票的最终结果 @@ -2648,9 +2645,6 @@ \n \n这让他们确信他们真的在与你交谈，但这也意味着他们可以看到你在此处输入的会话名称。 重命名会话 - 已验证会话已使用你的凭据登录，然后使用你的安全密码或通过交叉验证进行验证。 -\n -\n这意味着他们持有你之前消息的加密密钥，并向你正在与之通信的其他用户确认这些会话确实是你。 闲置会话是你一段时间未使用的会话，但它们会继续接收加密密钥。 \n \n删除闲置会话可以提高安全性和性能，并使你更容易识别新会话是否可疑。 @@ -2694,7 +2688,7 @@ 验证你当前的会话以显示此会话的验证状态。 未知的验证状态 开始语音广播 - 正在缓冲…… + 正在缓冲…… 暂停语音广播 实时 知道了 @@ -2821,4 +2815,8 @@ Nightly构建 你结束了一个语音广播。 %1$s结束了一个语音广播。 - \ No newline at end of file + 停止实时广播？ + 无法播放此语音广播。 + 你无法启动语音消息因为你正在录制实时广播。请终止实时广播以开始录制语音消息 + 无法启动语音消息 + diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/strings.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/strings.xml index 14729c5b44..c650a1e6b2 100644 --- a/libraries/ui-strings/src/main/res/values-zh-rTW/strings.xml +++ b/libraries/ui-strings/src/main/res/values-zh-rTW/strings.xml @@ -1412,8 +1412,6 @@ 我們無法建立您的直接訊息。請檢查您想要邀請的使用者，然後再試一次。 未加密 由未驗證的裝置加密 - 審閱您從何處登入 - 驗證您所有的工作階段以確保您的帳號與訊息都安全 驗證正在存取您帳號的新登入：%1$s %1$s：%2$s %1$s：%2$s %3$s @@ -2231,7 +2229,6 @@ 結束投票 這將阻止人們投票並顯示投票的最終結果。 結束此投票？ - 獲勝選項 結束投票 以 %1$d 票為基礎的最終結果 @@ -2659,9 +2656,6 @@ \n \n這讓他們確信他們真的在與您交談，但這也意味著他們可以看到您在此處輸入的工作階段名稱。 正在重新命名工作階段 - 已驗證的工作階段代表使用您的憑證登入，然後使用您的安全通關密語或透過交叉驗證進行驗證。 -\n -\n這代表了它們持有您先前訊息的加密金鑰，並向您正在與之通訊的其他使用者確認這些工作階段確實是您。 已驗證的工作階段 未驗證的工作階段是使用您的憑證登入但未交叉驗證的工作階段。 \n @@ -2760,7 +2754,7 @@ 請求失敗。 可以在聊天室時間軸中錄製並傳送語音廣播。 啟用語音廣播 - 正在緩衝…… + 正在緩衝…… 暫停語音廣播 播放或繼續語音廣播 停止語音廣播錄製 @@ -2843,4 +2837,23 @@ 此聊天室沒有正在進行的投票 進行中的投票 投票歷史紀錄 - \ No newline at end of file + 已結束投票 + 投票 + 已結束投票。 + 已結束投票。 + 您的家伺服器還不支援列出討論串。 + 無法播放此語音廣播。 + 已開始語音廣播 + 因為解密錯誤，部份投票可能並未計算 + 擷取投票時發生錯誤。 + 載入更多投票 + 顯示投票 + + 過去 %1$d 天沒有投票。 +\n載入更多投票以檢視過去幾天的投票。 + + + 過去 %1$d 天沒有活躍的投票。 +\n載入更多投票以檢視過去幾天的投票。 + + diff --git a/libraries/ui-strings/src/main/res/values/strings.xml b/libraries/ui-strings/src/main/res/values/strings.xml index 852478a173..46c175437a 100644 --- a/libraries/ui-strings/src/main/res/values/strings.xml +++ b/libraries/ui-strings/src/main/res/values/strings.xml @@ -1689,7 +1689,6 @@ Create New Room Create New Space No network. Please check your Internet connection. - Something went wrong. Please check your network connection and try again. "Change network" "Please wait…" @@ -2659,10 +2658,6 @@ Unencrypted Encrypted by an unverified device The authenticity of this encrypted message can\'t be guaranteed on this device. - - Review where you’re logged in - - Verify all your sessions to ensure your account & messages are safe You have unverified sessions Review to ensure your account is safe @@ -3111,8 +3106,7 @@ Live Live broadcast - - Buffering… + Buffering… Resume voice broadcast record Pause voice broadcast record Stop voice broadcast record @@ -3183,8 +3177,6 @@ Final result based on %1$d votes End poll - - winner option End this poll? This will stop people from being able to vote and will display the final results of the poll. End poll @@ -3430,8 +3422,6 @@ Unverified sessions Unverified sessions are sessions that have logged in with your credentials but not been cross-verified.\n\nYou should make especially certain that you recognise these sessions as they could represent an unauthorised use of your account. Verified sessions - - Verified sessions have logged in with your credentials and then been verified, either using your secure passphrase or by cross-verifying.\n\nThis means they hold encryption keys for your previous messages, and confirm to other users you are communicating with that these sessions are really you. Verified sessions are anywhere you are using this account after entering your passphrase or confirming your identity with another verified session.\n\nThis means that you have all the keys needed to unlock your encrypted messages and confirm to other users that you trust this session. This session doesn\'t support encryption, so it can\'t be verified.\n\nYou won\'t be able to participate in rooms where encryption is enabled when using this session.\n\nFor best security and privacy, it is recommended to use Matrix clients that support encryption. Renaming sessions From b4fbe775816b0e4012400899ec7b2f0e4e84ed4c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 30 Jan 2023 16:36:51 +0100 Subject: [PATCH 37/61] 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 326172046f07b3f767d931b2929b67345893495f Mon Sep 17 00:00:00 2001 From: bmarty Date: Tue, 31 Jan 2023 06:06:05 +0000 Subject: [PATCH 38/61] 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 From 4dd71a6b85f44f7eb6fab598d41b2981ebc97160 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 31 Jan 2023 15:39:12 +0100 Subject: [PATCH 39/61] Fix compilation issue (need @integer/rtl_mirror_flip). --- features/onboarding/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index 42282ffa8c..fcefcb0068 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -32,6 +32,7 @@ dependencies { implementation(projects.libraries.designsystem) implementation(projects.libraries.architecture) implementation(projects.libraries.testtags) + implementation(projects.libraries.androidutils) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) testImplementation(libs.test.junit) From 704674e92bbffc89dff1a08a4df7b253eca0be21 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 31 Jan 2023 16:11:01 +0100 Subject: [PATCH 40/61] First setup of sonar. --- build.gradle.kts | 26 ++++++++++++++++++++++++++ gradle/libs.versions.toml | 1 + 2 files changed, 27 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index fa9822913a..fea5613a5d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ plugins { alias(libs.plugins.detekt) alias(libs.plugins.ktlint) alias(libs.plugins.dependencygraph) + alias(libs.plugins.sonarqube) } tasks.register("clean").configure { @@ -108,3 +109,28 @@ allprojects { plugin("org.owasp.dependencycheck") } } + +// To run a sonar analysis: +// Run './gradlew sonar -Dsonar.login=' +// The SONAR_LOGIN is stored in passbolt as Token Sonar Cloud Bma +sonar { + properties { + property("sonar.projectName", "element-x-android") + property("sonar.projectKey", "vector-im_element-x-android") + property("sonar.host.url", "https://sonarcloud.io") + property("sonar.projectVersion", "1.0") // TODO project(":app").android.defaultConfig.versionName) + property("sonar.sourceEncoding", "UTF-8") + property("sonar.links.homepage", "https://github.com/vector-im/element-x-android/") + property("sonar.links.ci", "https://github.com/vector-im/element-x-android/actions") + property("sonar.links.scm", "https://github.com/vector-im/element-x-android/") + property("sonar.links.issue", "https://github.com/vector-im/element-x-android/issues") + property("sonar.organization", "new_vector_ltd_organization") + // property("sonar.java.coveragePlugin", "jacoco") + // property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/generateCoverageReport/generateCoverageReport.xml") + property("sonar.login", if (project.hasProperty("SONAR_LOGIN")) project.property("SONAR_LOGIN")!! else "invalid") + + // exclude source code from analyses separated by a colon (:) + // Exclude Java source + property("sonar.exclusions", "**/BugReporterMultipartBody.java") + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92d50ac689..790db7aab5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -143,3 +143,4 @@ dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "dependencyc stem = { id = "com.likethesalad.stem", version.ref = "stem" } stemlibrary = { id = "com.likethesalad.stem-library", version.ref = "stem" } paparazzi = "app.cash.paparazzi:1.2.0" +sonarqube = "org.sonarqube:3.5.0.2730" From fe5541b243a9d5c06de47f0180244c0a4a686726 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 31 Jan 2023 20:46:33 +0100 Subject: [PATCH 41/61] Update appyx to 1.0.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92d50ac689..634c05b34a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,7 +37,7 @@ datetime = "0.4.0" serialization_json = "1.4.1" showkase = "1.0.0-beta14" jsoup = "1.15.3" -appyx = "1.0.1" +appyx = "1.0.3" dependencycheck = "7.4.4" stem = "2.2.3" From 581d0029183cbaf5b3b160d7118d797b28eafe31 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 31 Jan 2023 20:49:16 +0100 Subject: [PATCH 42/61] Handle activity and process recreation for session --- .../io/element/android/x/MainActivity.kt | 9 +- .../io/element/android/x/di/AppBindings.kt | 2 +- .../android/x/di/MatrixClientsHolder.kt | 79 ++++++++++++++++++ .../io/element/android/x/node/BackstackExt.kt | 31 +++++++ .../io/element/android/x/node/RootFlowNode.kt | 82 +++++++++++++------ .../auth/MatrixAuthenticationService.kt | 2 +- .../auth/RustMatrixAuthenticationService.kt | 4 +- .../matrix/session/PreferencesSessionStore.kt | 6 ++ .../libraries/matrix/session/SessionStore.kt | 2 + 9 files changed, 186 insertions(+), 31 deletions(-) create mode 100644 app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt create mode 100644 app/src/main/kotlin/io/element/android/x/node/BackstackExt.kt 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..d4b1b11db8 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -36,6 +36,7 @@ class MainActivity : NodeComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val appBindings = bindings() + appBindings.matrixClientsHolder().restore(savedInstanceState) WindowCompat.setDecorFitsSystemWindows(window, false) setContent { ElementXTheme { @@ -48,11 +49,17 @@ class MainActivity : NodeComponentActivity() { buildContext = it, appComponentOwner = applicationContext as DaggerComponentOwner, authenticationService = appBindings.authenticationService(), - presenter = appBindings.rootPresenter() + presenter = appBindings.rootPresenter(), + matrixClientsHolder = appBindings.matrixClientsHolder() ) } } } } } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + bindings().matrixClientsHolder().onSaveInstanceState(outState) + } } diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index f63a68f922..de8b29682e 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.CoroutineScope @ContributesTo(AppScope::class) interface AppBindings { - fun coroutineScope(): CoroutineScope fun rootPresenter(): RootPresenter fun authenticationService(): MatrixAuthenticationService + fun matrixClientsHolder(): MatrixClientsHolder } diff --git a/app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt b/app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt new file mode 100644 index 0000000000..22dfe8a3ef --- /dev/null +++ b/app/src/main/kotlin/io/element/android/x/di/MatrixClientsHolder.kt @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.di + +import android.os.Bundle +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.SingleIn +import io.element.android.libraries.matrix.MatrixClient +import io.element.android.libraries.matrix.auth.MatrixAuthenticationService +import io.element.android.libraries.matrix.core.SessionId +import kotlinx.coroutines.runBlocking +import timber.log.Timber +import java.util.concurrent.ConcurrentHashMap +import javax.inject.Inject + +private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey" + +@SingleIn(AppScope::class) +class MatrixClientsHolder @Inject constructor(private val authenticationService: MatrixAuthenticationService) { + + private val sessionIdsToMatrixClient = ConcurrentHashMap() + + fun add(matrixClient: MatrixClient) { + sessionIdsToMatrixClient[matrixClient.sessionId] = matrixClient + } + + fun removeAll() { + sessionIdsToMatrixClient.clear() + } + + fun remove(sessionId: SessionId) { + sessionIdsToMatrixClient.remove(sessionId) + } + + fun isEmpty(): Boolean = sessionIdsToMatrixClient.isEmpty() + + fun knowSession(sessionId: SessionId): Boolean = sessionIdsToMatrixClient.containsKey(sessionId) + + fun getOrNull(sessionId: SessionId): MatrixClient? { + return sessionIdsToMatrixClient[sessionId] + } + + @Suppress("DEPRECATION") + fun restore(savedInstanceState: Bundle?) { + if (savedInstanceState == null || sessionIdsToMatrixClient.isNotEmpty()) return + val sessionIds = savedInstanceState.getSerializable(SAVE_INSTANCE_KEY) as? Array + if (sessionIds.isNullOrEmpty()) return + // Not ideal but should only happens in case of process recreation. This ensure we restore all the active sessions before restoring the node graphs. + runBlocking { + sessionIds.forEach { sessionId -> + Timber.v("Restore matrix session: $sessionId") + val matrixClient = authenticationService.restoreSession(sessionId) + if (matrixClient != null) { + add(matrixClient) + } + } + } + } + + fun onSaveInstanceState(outState: Bundle) { + val sessionKeys = sessionIdsToMatrixClient.keys.toTypedArray() + Timber.v("Save matrix session keys = $sessionKeys") + outState.putSerializable(SAVE_INSTANCE_KEY, sessionKeys) + } +} diff --git a/app/src/main/kotlin/io/element/android/x/node/BackstackExt.kt b/app/src/main/kotlin/io/element/android/x/node/BackstackExt.kt new file mode 100644 index 0000000000..0476e50553 --- /dev/null +++ b/app/src/main/kotlin/io/element/android/x/node/BackstackExt.kt @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.x.node + +import com.bumble.appyx.navmodel.backstack.BackStack +import com.bumble.appyx.navmodel.backstack.operation.NewRoot + +/** + * Don't process NewRoot if the nav target already exists in the stack. + */ +fun BackStack.safeRoot(element: T) { + val containsRoot = elements.value.any { + it.key.navTarget == element + } + if (containsRoot) return + accept(NewRoot(element)) +} diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index d82ac55e7f..dc746d53ef 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -27,7 +27,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.lifecycle.lifecycleScope import com.bumble.appyx.core.composable.Children -import com.bumble.appyx.core.lifecycle.subscribe import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode @@ -41,9 +40,9 @@ import io.element.android.libraries.architecture.animation.rememberDefaultTransi import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.di.DaggerComponentOwner -import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.core.SessionId +import io.element.android.x.di.MatrixClientsHolder import io.element.android.x.root.RootPresenter import io.element.android.x.root.RootView import kotlinx.coroutines.flow.distinctUntilChanged @@ -51,54 +50,81 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.parcelize.Parcelize import timber.log.Timber -import java.util.concurrent.ConcurrentHashMap class RootFlowNode( - buildContext: BuildContext, + private val buildContext: BuildContext, private val backstack: BackStack = BackStack( initialElement = NavTarget.SplashScreen, savedStateMap = buildContext.savedStateMap, ), private val appComponentOwner: DaggerComponentOwner, private val authenticationService: MatrixAuthenticationService, + private val matrixClientsHolder: MatrixClientsHolder, presenter: RootPresenter ) : ParentNode( navModel = backstack, - buildContext = buildContext, + buildContext = buildContext ), DaggerComponentOwner by appComponentOwner { - private val matrixClientsHolder = ConcurrentHashMap() private val presenterConnector = presenterConnector(presenter) override fun onBuilt() { super.onBuilt() - whenChildAttached(LoggedInFlowNode::class) { _, child -> - child.lifecycle.subscribe( - onDestroy = { matrixClientsHolder.remove(child.sessionId) } - ) - } + observeLoggedInState() + } + + private fun observeLoggedInState() { authenticationService.isLoggedIn() .distinctUntilChanged() .onEach { isLoggedIn -> Timber.v("isLoggedIn=$isLoggedIn") if (isLoggedIn) { - val matrixClient = authenticationService.restoreSession() - if (matrixClient == null) { - backstack.newRoot(NavTarget.NotLoggedInFlow) - } else { - matrixClientsHolder[matrixClient.sessionId] = matrixClient - backstack.newRoot(NavTarget.LoggedInFlow(matrixClient.sessionId)) - } + tryToRestoreLatestSession( + onSuccess = { switchToLoggedInFlow(it) }, + onFailure = { switchToLogoutFlow() } + ) } else { - backstack.newRoot(NavTarget.NotLoggedInFlow) + switchToLogoutFlow() } } .launchIn(lifecycleScope) } + private fun switchToLoggedInFlow(sessionId: SessionId) { + backstack.safeRoot(NavTarget.LoggedInFlow(sessionId = sessionId)) + } + + private fun switchToLogoutFlow() { + matrixClientsHolder.removeAll() + backstack.safeRoot(NavTarget.NotLoggedInFlow) + } + + private suspend fun tryToRestoreLatestSession( + onSuccess: (SessionId) -> Unit = {}, + onFailure: () -> Unit = {} + ) { + val latestKnownSessionId = authenticationService.getLatestSessionId() + if (latestKnownSessionId == null) { + onFailure() + return + } + if (matrixClientsHolder.knowSession(latestKnownSessionId)) { + onSuccess(latestKnownSessionId) + return + } + val matrixClient = authenticationService.restoreSession(latestKnownSessionId) + if (matrixClient == null) { + Timber.v("Failed to restore session...") + onFailure() + } else { + matrixClientsHolder.add(matrixClient) + onSuccess(matrixClient.sessionId) + } + } + private fun onOpenBugReport() { backstack.push(NavTarget.BugReport) } @@ -142,8 +168,10 @@ class RootFlowNode( override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { return when (navTarget) { is NavTarget.LoggedInFlow -> { - val matrixClient = - matrixClientsHolder[navTarget.sessionId] ?: throw IllegalStateException("Makes sure to give a matrixClient with the given sessionId") + val matrixClient = matrixClientsHolder.getOrNull(navTarget.sessionId) ?: return splashNode(buildContext).also { + Timber.w("Couldn't find any session, go through SplashScreen") + backstack.newRoot(NavTarget.SplashScreen) + } LoggedInFlowNode( buildContext = buildContext, sessionId = navTarget.sessionId, @@ -152,12 +180,14 @@ class RootFlowNode( ) } NavTarget.NotLoggedInFlow -> NotLoggedInFlowNode(buildContext) - NavTarget.SplashScreen -> node(buildContext) { - Box(modifier = it.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator() - } - } + NavTarget.SplashScreen -> splashNode(buildContext) NavTarget.BugReport -> createNode(buildContext, plugins = listOf(bugReportNodeCallback)) } } + + private fun splashNode(buildContext: BuildContext) = node(buildContext) { + Box(modifier = it.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt index 122c079971..4323e3f79b 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/MatrixAuthenticationService.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.Flow interface MatrixAuthenticationService { fun isLoggedIn(): Flow suspend fun getLatestSessionId(): SessionId? - suspend fun restoreSession(): MatrixClient? + suspend fun restoreSession(sessionId: SessionId): MatrixClient? fun getHomeserver(): String? fun getHomeserverOrDefault(): String suspend fun setHomeserver(homeserver: String) diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt index d0d115123f..82bd9391b1 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/auth/RustMatrixAuthenticationService.kt @@ -52,8 +52,8 @@ class RustMatrixAuthenticationService @Inject constructor( sessionStore.getLatestSession()?.sessionId() } - override suspend fun restoreSession() = withContext(coroutineDispatchers.io) { - sessionStore.getLatestSession() + override suspend fun restoreSession(sessionId: SessionId) = withContext(coroutineDispatchers.io) { + sessionStore.getSession(sessionId) ?.let { session -> try { ClientBuilder() diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt index 02241bc0f9..c1ad49c90a 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/PreferencesSessionStore.kt @@ -26,6 +26,7 @@ import com.squareup.anvil.annotations.ContributesBinding import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.SingleIn +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map @@ -94,6 +95,11 @@ class PreferencesSessionStore @Inject constructor( } } + override suspend fun getSession(sessionId: SessionId): Session? { + //TODO we should have a proper session management + return getLatestSession() + } + override suspend fun reset() { store.edit { it.clear() } } diff --git a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt index 07c40ab54a..3ca806acee 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/session/SessionStore.kt @@ -16,12 +16,14 @@ package io.element.android.libraries.matrix.session +import io.element.android.libraries.matrix.core.SessionId import kotlinx.coroutines.flow.Flow import org.matrix.rustcomponents.sdk.Session interface SessionStore { fun isLoggedIn(): Flow suspend fun storeData(session: Session) + suspend fun getSession(sessionId: SessionId): Session? suspend fun getLatestSession(): Session? suspend fun reset() } From 0eed2895f6ab3bdd2bc8db9f873e9effd237eae3 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 31 Jan 2023 20:49:47 +0100 Subject: [PATCH 43/61] Add splash for android < 12 so app is not completely blank during process creation --- app/build.gradle.kts | 2 +- app/src/main/AndroidManifest.xml | 1 + .../io/element/android/x/MainActivity.kt | 4 ++- app/src/main/res/drawable/splash_icon.xml | 8 ++++++ app/src/main/res/values-night/themes.xml | 26 +++++++++++++++++++ app/src/main/res/values/themes.xml | 6 ++++- gradle/libs.versions.toml | 1 + 7 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/splash_icon.xml create mode 100644 app/src/main/res/values-night/themes.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 41029596ab..70ef693426 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -171,7 +171,7 @@ dependencies { // https://developer.android.com/studio/write/java8-support#library-desugaring-versions coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") implementation(libs.appyx.core) - + implementation(libs.androidx.splash) implementation(libs.androidx.corektx) implementation(libs.androidx.lifecycle.runtime) implementation(libs.androidx.activity.compose) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61a03241a1..00d6092632 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,6 +31,7 @@ tools:targetApi="33"> () appBindings.matrixClientsHolder().restore(savedInstanceState) diff --git a/app/src/main/res/drawable/splash_icon.xml b/app/src/main/res/drawable/splash_icon.xml new file mode 100644 index 0000000000..9b852a657f --- /dev/null +++ b/app/src/main/res/drawable/splash_icon.xml @@ -0,0 +1,8 @@ + + diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000000..6763f9b016 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,26 @@ + + + + + + +