CHange some packages
This commit is contained in:
@@ -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() {
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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) :
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package io.element.android.x.libraries.designsystem
|
||||
package io.element.android.x.designsystem
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -0,0 +1,3 @@
|
||||
package io.element.android.x.matrix
|
||||
|
||||
internal const val LOG_TAG = "Matrix"
|
||||
@@ -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
|
||||
@@ -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(
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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) {
|
||||
@@ -1,3 +0,0 @@
|
||||
package io.element.android.x.sdk.matrix
|
||||
|
||||
internal const val LOG_TAG = "Matrix"
|
||||
Reference in New Issue
Block a user