Browse Source

CHange some packages

feature/bma/flipper
ganfra 2 years ago
parent
commit
f08efbf4c2
  1. 2
      app/src/main/java/io/element/android/x/ElementXApplication.kt
  2. 2
      app/src/main/java/io/element/android/x/MainActivity.kt
  3. 2
      app/src/main/java/io/element/android/x/MainViewModel.kt
  4. 2
      features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
  5. 2
      features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt
  6. 4
      features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt
  7. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt
  8. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt
  9. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/Type.kt
  10. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt
  11. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt
  12. 3
      libraries/matrix/src/main/java/io/element/android/x/matrix/LogTag.kt
  13. 6
      libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt
  14. 4
      libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt
  15. 2
      libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt
  16. 2
      libraries/matrix/src/main/java/io/element/android/x/matrix/RoomWrapper.kt
  17. 2
      libraries/matrix/src/main/java/io/element/android/x/matrix/store/SessionStore.kt
  18. 4
      libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt
  19. 3
      libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt

2
app/src/main/java/io/element/android/x/ElementXApplication.kt

@ -2,7 +2,7 @@ package io.element.android.x @@ -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() {

2
app/src/main/java/io/element/android/x/MainActivity.kt

@ -7,8 +7,8 @@ import androidx.activity.viewModels @@ -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() {

2
app/src/main/java/io/element/android/x/MainViewModel.kt

@ -1,7 +1,7 @@ @@ -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()

2
features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt

@ -19,7 +19,7 @@ import com.airbnb.mvrx.Loading @@ -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(

2
features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt

@ -5,7 +5,7 @@ import com.airbnb.mvrx.Fail @@ -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) :

4
features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt

@ -5,8 +5,8 @@ import com.airbnb.mvrx.Loading @@ -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

2
libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Color.kt → libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package io.element.android.x.libraries.designsystem
package io.element.android.x.designsystem
import androidx.compose.ui.graphics.Color

2
libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Theme.kt → libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt

@ -1,4 +1,4 @@ @@ -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

2
libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Type.kt → libraries/designsystem/src/main/java/io/element/android/x/designsystem/Type.kt

@ -1,4 +1,4 @@ @@ -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

2
libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorButton.kt → libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorButton.kt

@ -1,4 +1,4 @@ @@ -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

2
libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorTextField.kt → libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt

@ -1,4 +1,4 @@ @@ -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

3
libraries/matrix/src/main/java/io/element/android/x/matrix/LogTag.kt

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
package io.element.android.x.matrix
internal const val LOG_TAG = "Matrix"

6
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt → libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt

@ -1,8 +1,8 @@ @@ -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

4
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt → libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt

@ -1,7 +1,7 @@ @@ -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(

2
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixInstance.kt → libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt

@ -1,4 +1,4 @@ @@ -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

2
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/RoomWrapper.kt → libraries/matrix/src/main/java/io/element/android/x/matrix/RoomWrapper.kt

@ -1,4 +1,4 @@ @@ -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

2
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt → libraries/matrix/src/main/java/io/element/android/x/matrix/store/SessionStore.kt

@ -1,4 +1,4 @@ @@ -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

4
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt → libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt

@ -1,7 +1,7 @@ @@ -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) {

3
libraries/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt

@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
package io.element.android.x.sdk.matrix
internal const val LOG_TAG = "Matrix"
Loading…
Cancel
Save