From c172d419349c65413bd9c331480149524677947e Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 27 Oct 2022 20:01:27 +0200 Subject: [PATCH] CHange some packages --- .../main/java/io/element/android/x/ElementXApplication.kt | 2 +- app/src/main/java/io/element/android/x/MainActivity.kt | 2 +- app/src/main/java/io/element/android/x/MainViewModel.kt | 2 +- .../java/io/element/android/x/features/login/LoginScreen.kt | 2 +- .../io/element/android/x/features/login/LoginViewModel.kt | 2 +- .../android/x/features/roomlist/RoomListViewModel.kt | 4 ++-- .../element/android/x/{libraries => }/designsystem/Color.kt | 2 +- .../element/android/x/{libraries => }/designsystem/Theme.kt | 2 +- .../element/android/x/{libraries => }/designsystem/Type.kt | 2 +- .../{libraries => }/designsystem/components/VectorButton.kt | 2 +- .../designsystem/components/VectorTextField.kt | 2 +- .../src/main/java/io/element/android/x/matrix/LogTag.kt | 3 +++ .../java/io/element/android/x/{sdk => }/matrix/Matrix.kt | 6 +++--- .../io/element/android/x/{sdk => }/matrix/MatrixClient.kt | 4 ++-- .../io/element/android/x/{sdk => }/matrix/MatrixInstance.kt | 2 +- .../io/element/android/x/{sdk => }/matrix/RoomWrapper.kt | 2 +- .../android/x/{sdk => }/matrix/store/SessionStore.kt | 2 +- .../io/element/android/x/{sdk => }/matrix/util/Error.kt | 4 ++-- .../src/main/java/io/element/android/x/sdk/matrix/LogTag.kt | 3 --- 19 files changed, 25 insertions(+), 25 deletions(-) rename libraries/designsystem/src/main/java/io/element/android/x/{libraries => }/designsystem/Color.kt (82%) rename libraries/designsystem/src/main/java/io/element/android/x/{libraries => }/designsystem/Theme.kt (97%) rename libraries/designsystem/src/main/java/io/element/android/x/{libraries => }/designsystem/Type.kt (94%) rename libraries/designsystem/src/main/java/io/element/android/x/{libraries => }/designsystem/components/VectorButton.kt (87%) rename libraries/designsystem/src/main/java/io/element/android/x/{libraries => }/designsystem/components/VectorTextField.kt (89%) create mode 100644 libraries/matrix/src/main/java/io/element/android/x/matrix/LogTag.kt rename libraries/matrix/src/main/java/io/element/android/x/{sdk => }/matrix/Matrix.kt (90%) rename libraries/matrix/src/main/java/io/element/android/x/{sdk => }/matrix/MatrixClient.kt (95%) rename libraries/matrix/src/main/java/io/element/android/x/{sdk => }/matrix/MatrixInstance.kt (88%) rename libraries/matrix/src/main/java/io/element/android/x/{sdk => }/matrix/RoomWrapper.kt (89%) rename libraries/matrix/src/main/java/io/element/android/x/{sdk => }/matrix/store/SessionStore.kt (97%) rename libraries/matrix/src/main/java/io/element/android/x/{sdk => }/matrix/util/Error.kt (78%) delete mode 100644 libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt diff --git a/app/src/main/java/io/element/android/x/ElementXApplication.kt b/app/src/main/java/io/element/android/x/ElementXApplication.kt index 88136d002b..7cf10d0e7e 100644 --- a/app/src/main/java/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/java/io/element/android/x/ElementXApplication.kt @@ -2,7 +2,7 @@ package io.element.android.x import android.app.Application import com.airbnb.mvrx.Mavericks -import io.element.android.x.sdk.matrix.MatrixInstance +import io.element.android.x.matrix.MatrixInstance class ElementXApplication : Application() { diff --git a/app/src/main/java/io/element/android/x/MainActivity.kt b/app/src/main/java/io/element/android/x/MainActivity.kt index 69aaf64b7f..460fd533f3 100644 --- a/app/src/main/java/io/element/android/x/MainActivity.kt +++ b/app/src/main/java/io/element/android/x/MainActivity.kt @@ -7,8 +7,8 @@ import androidx.activity.viewModels import androidx.compose.runtime.Composable import com.ramcosta.composedestinations.DestinationsNavHost import com.ramcosta.composedestinations.rememberNavHostEngine +import io.element.android.x.designsystem.ElementXTheme import io.element.android.x.destinations.LoginScreenNavigationDestination -import io.element.android.x.libraries.designsystem.ElementXTheme import kotlinx.coroutines.runBlocking class MainActivity : ComponentActivity() { diff --git a/app/src/main/java/io/element/android/x/MainViewModel.kt b/app/src/main/java/io/element/android/x/MainViewModel.kt index 7474901daa..7790a9f133 100644 --- a/app/src/main/java/io/element/android/x/MainViewModel.kt +++ b/app/src/main/java/io/element/android/x/MainViewModel.kt @@ -1,7 +1,7 @@ package io.element.android.x import androidx.lifecycle.ViewModel -import io.element.android.x.sdk.matrix.MatrixInstance +import io.element.android.x.matrix.MatrixInstance class MainViewModel : ViewModel() { private val matrix = MatrixInstance.getInstance() diff --git a/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt b/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt index 976b0616dd..2bc570d369 100644 --- a/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt +++ b/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt @@ -19,7 +19,7 @@ import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.compose.collectAsState import com.airbnb.mvrx.compose.mavericksViewModel -import io.element.android.x.libraries.designsystem.components.VectorButton +import io.element.android.x.designsystem.components.VectorButton @Composable fun LoginScreen( diff --git a/features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt b/features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt index 1c53c505c2..ce1d093925 100644 --- a/features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt +++ b/features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt @@ -5,7 +5,7 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.MavericksViewModel import com.airbnb.mvrx.Success -import io.element.android.x.sdk.matrix.MatrixInstance +import io.element.android.x.matrix.MatrixInstance import kotlinx.coroutines.launch class LoginViewModel(initialState: LoginViewState) : diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt index 38b0673e27..383d2d9605 100644 --- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt +++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt @@ -5,8 +5,8 @@ import com.airbnb.mvrx.Loading import com.airbnb.mvrx.MavericksViewModel import com.airbnb.mvrx.Success import io.element.android.x.core.data.tryOrNull -import io.element.android.x.sdk.matrix.MatrixClient -import io.element.android.x.sdk.matrix.MatrixInstance +import io.element.android.x.matrix.MatrixClient +import io.element.android.x.matrix.MatrixInstance import kotlinx.coroutines.launch import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.StoppableSpawn diff --git a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Color.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt similarity index 82% rename from libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Color.kt rename to libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt index b7845741b1..087195d9e4 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Color.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt @@ -1,4 +1,4 @@ -package io.element.android.x.libraries.designsystem +package io.element.android.x.designsystem import androidx.compose.ui.graphics.Color diff --git a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Theme.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt similarity index 97% rename from libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Theme.kt rename to libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt index 503d4b9e01..88cac26359 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Theme.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt @@ -1,4 +1,4 @@ -package io.element.android.x.libraries.designsystem +package io.element.android.x.designsystem import android.app.Activity import android.os.Build diff --git a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Type.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Type.kt similarity index 94% rename from libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Type.kt rename to libraries/designsystem/src/main/java/io/element/android/x/designsystem/Type.kt index 591b84d10a..61abc8f135 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Type.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Type.kt @@ -1,4 +1,4 @@ -package io.element.android.x.libraries.designsystem +package io.element.android.x.designsystem import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorButton.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt similarity index 87% rename from libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorButton.kt rename to libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt index b26c05727e..ee7c188f8c 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorButton.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt @@ -1,4 +1,4 @@ -package io.element.android.x.libraries.designsystem.components +package io.element.android.x.designsystem.components import androidx.compose.material3.Button import androidx.compose.material3.Text diff --git a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorTextField.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt similarity index 89% rename from libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorTextField.kt rename to libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt index 8daab1a8ba..53ffa2739a 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorTextField.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt @@ -1,4 +1,4 @@ -package io.element.android.x.libraries.designsystem.components +package io.element.android.x.designsystem.components import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.ExperimentalMaterial3Api diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/LogTag.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/LogTag.kt new file mode 100644 index 0000000000..cb480d172f --- /dev/null +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/LogTag.kt @@ -0,0 +1,3 @@ +package io.element.android.x.matrix + +internal const val LOG_TAG = "Matrix" diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt similarity index 90% rename from libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt rename to libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt index dff931f53e..f230a36185 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt @@ -1,8 +1,8 @@ -package io.element.android.x.sdk.matrix +package io.element.android.x.matrix import android.content.Context -import io.element.android.x.sdk.matrix.store.SessionStore -import io.element.android.x.sdk.matrix.util.logError +import io.element.android.x.matrix.store.SessionStore +import io.element.android.x.matrix.util.logError import org.matrix.rustcomponents.sdk.AuthenticationService import org.matrix.rustcomponents.sdk.ClientBuilder import java.io.File diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt similarity index 95% rename from libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt rename to libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt index d1528d363f..0c0994f581 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt @@ -1,7 +1,7 @@ -package io.element.android.x.sdk.matrix +package io.element.android.x.matrix import android.util.Log -import io.element.android.x.sdk.matrix.store.SessionStore +import io.element.android.x.matrix.store.SessionStore import org.matrix.rustcomponents.sdk.* class MatrixClient internal constructor( diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixInstance.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt similarity index 88% rename from libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixInstance.kt rename to libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt index 231ae54eb6..f7217b1695 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixInstance.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt @@ -1,4 +1,4 @@ -package io.element.android.x.sdk.matrix +package io.element.android.x.matrix import android.annotation.SuppressLint import android.content.Context diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/RoomWrapper.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/RoomWrapper.kt similarity index 89% rename from libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/RoomWrapper.kt rename to libraries/matrix/src/main/java/io/element/android/x/matrix/RoomWrapper.kt index bf20258a4c..90aaaa6251 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/RoomWrapper.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/RoomWrapper.kt @@ -1,4 +1,4 @@ -package io.element.android.x.sdk.matrix +package io.element.android.x.matrix import android.util.Log import org.matrix.rustcomponents.sdk.Client diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/store/SessionStore.kt similarity index 97% rename from libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt rename to libraries/matrix/src/main/java/io/element/android/x/matrix/store/SessionStore.kt index 6725f21b56..f483256c08 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/store/SessionStore.kt @@ -1,4 +1,4 @@ -package io.element.android.x.sdk.matrix.store +package io.element.android.x.matrix.store import android.content.Context import androidx.datastore.core.DataStore diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt similarity index 78% rename from libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt rename to libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt index e9a7e7c4d8..7fda7869c9 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt @@ -1,7 +1,7 @@ -package io.element.android.x.sdk.matrix.util +package io.element.android.x.matrix.util import android.util.Log -import io.element.android.x.sdk.matrix.LOG_TAG +import io.element.android.x.matrix.LOG_TAG import org.matrix.rustcomponents.sdk.ClientException fun logError(throwable: Throwable) { diff --git a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt b/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt deleted file mode 100644 index 29092e5fa5..0000000000 --- a/libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt +++ /dev/null @@ -1,3 +0,0 @@ -package io.element.android.x.sdk.matrix - -internal const val LOG_TAG = "Matrix"