Skip to content
Snippets Groups Projects
Commit 262bf9d9 authored by Kamal Bramwell's avatar Kamal Bramwell
Browse files

Renamed ColdStartActivity -> MainActivity and start pkg -> main

parent 86422dcd
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 32 deletions
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
tools:ignore="GoogleAppIndexingWarning" tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:allowBackup" > tools:replace="android:allowBackup" >
<activity android:name=".start.ui.ColdStartActivity" <activity android:name=".main.ui.MainActivity"
android:configChanges="orientation" android:configChanges="orientation"
android:exported="true" android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
......
package io.xxlabs.messenger.start.model package io.xxlabs.messenger.main.model
data class AppState( data class AppState(
val userState: UserState, val userState: UserState,
......
package io.xxlabs.messenger.start.model package io.xxlabs.messenger.main.model
enum class UserState { enum class UserState {
NewUser, ExistingUser NewUser, ExistingUser
......
package io.xxlabs.messenger.start.model package io.xxlabs.messenger.main.model
import com.google.gson.JsonElement import com.google.gson.JsonElement
import io.xxlabs.messenger.BuildConfig import io.xxlabs.messenger.BuildConfig
......
package io.xxlabs.messenger.start.model package io.xxlabs.messenger.main.model
import io.xxlabs.messenger.start.ui.VersionAlertUi import io.xxlabs.messenger.main.ui.VersionAlertUi
sealed class VersionState sealed class VersionState
......
package io.xxlabs.messenger.start.ui package io.xxlabs.messenger.main.ui
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
...@@ -12,24 +12,20 @@ import androidx.core.view.WindowInsetsControllerCompat ...@@ -12,24 +12,20 @@ import androidx.core.view.WindowInsetsControllerCompat
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import io.elixxir.feature.home.MainActivity
import io.elixxir.feature.home.MainActivity.Companion.INTENT_INVITATION
import io.elixxir.feature.home.MainActivity.Companion.INTENT_NOTIFICATION_CLICK
import io.xxlabs.messenger.R import io.xxlabs.messenger.R
import io.elixxir.feature.registration.registration.RegistrationFlowActivity import io.elixxir.feature.registration.registration.RegistrationFlowActivity
import io.elixxir.core.ui.util.getTransition import io.elixxir.core.ui.util.getTransition
import io.elixxir.core.ui.util.openLink import io.elixxir.core.ui.util.openLink
import io.xxlabs.messenger.start.model.* import io.xxlabs.messenger.main.model.*
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
/** /**
* The app entry point when initially launched. Has no UI. * The single Activity that hosts all Fragments.
* Handles Intent (if applicable) and routes to * Responsible for navigation between features and enforces minimum app version.
* Onboarding (new user) or MainActivity (existing user).
*/ */
class ColdStartActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {
private val viewModel: ColdStartViewModel by viewModels() private val viewModel: MainViewModel by viewModels()
private var mainIntent: Intent? = null private var mainIntent: Intent? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
...@@ -45,7 +41,7 @@ class ColdStartActivity : AppCompatActivity() { ...@@ -45,7 +41,7 @@ class ColdStartActivity : AppCompatActivity() {
hideSystemBars() hideSystemBars()
intent?.let { handleIntent(it) } intent?.let { handleIntent(it) }
setContentView(R.layout.activity_coldstart) setContentView(R.layout.activity_main)
} }
private fun hideSystemBars() { private fun hideSystemBars() {
...@@ -87,7 +83,7 @@ class ColdStartActivity : AppCompatActivity() { ...@@ -87,7 +83,7 @@ class ColdStartActivity : AppCompatActivity() {
private fun notificationIntent(intent: Intent) { private fun notificationIntent(intent: Intent) {
mainIntent = intent.getBundleExtra(INTENT_NOTIFICATION_CLICK)?.let { mainIntent = intent.getBundleExtra(INTENT_NOTIFICATION_CLICK)?.let {
Intent( Intent(
this@ColdStartActivity, this@MainActivity,
MainActivity::class.java MainActivity::class.java
).apply { ).apply {
putExtra(INTENT_NOTIFICATION_CLICK, it) putExtra(INTENT_NOTIFICATION_CLICK, it)
...@@ -123,7 +119,7 @@ class ColdStartActivity : AppCompatActivity() { ...@@ -123,7 +119,7 @@ class ColdStartActivity : AppCompatActivity() {
private fun navigateToRegistration() { private fun navigateToRegistration() {
val activity = Intent( val activity = Intent(
this@ColdStartActivity, this@MainActivity,
RegistrationFlowActivity::class.java RegistrationFlowActivity::class.java
) )
...@@ -134,20 +130,24 @@ class ColdStartActivity : AppCompatActivity() { ...@@ -134,20 +130,24 @@ class ColdStartActivity : AppCompatActivity() {
private fun navigateToMain() { private fun navigateToMain() {
val activity = mainIntent ?: Intent( val activity = mainIntent ?: Intent(
this@ColdStartActivity, this@MainActivity,
MainActivity::class.java MainActivity::class.java
) )
val options = getTransition(R.anim.fade_in, R.anim.fade_out) val options = getTransition(R.anim.fade_in, R.anim.fade_out)
startActivity(activity, options) startActivity(activity, options)
ActivityCompat.finishAfterTransition(this@ColdStartActivity) ActivityCompat.finishAfterTransition(this@MainActivity)
} }
private fun showAlert(alertUi: VersionAlertUi) { private fun showAlert(alertUi: VersionAlertUi) {
TODO() TODO()
} }
private fun showError(error: String) { companion object {
TODO() const val INTENT_NOTIFICATION_CLICK = "nav_bundle"
const val INTENT_PRIVATE_CHAT = "private_message"
const val INTENT_GROUP_CHAT = "group_message"
const val INTENT_REQUEST = "request"
const val INTENT_INVITATION = "invitation"
} }
} }
\ No newline at end of file
package io.xxlabs.messenger.start.ui package io.xxlabs.messenger.main.ui
import androidx.lifecycle.* import androidx.lifecycle.*
import com.google.gson.JsonElement import com.google.gson.JsonElement
...@@ -8,7 +8,7 @@ import io.elixxir.core.logging.log ...@@ -8,7 +8,7 @@ import io.elixxir.core.logging.log
import io.elixxir.core.preferences.PreferencesRepository import io.elixxir.core.preferences.PreferencesRepository
import io.elixxir.core.ui.model.UiText import io.elixxir.core.ui.model.UiText
import io.xxlabs.messenger.R import io.xxlabs.messenger.R
import io.xxlabs.messenger.start.model.* import io.xxlabs.messenger.main.model.*
import kotlinx.coroutines.Deferred import kotlinx.coroutines.Deferred
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
...@@ -19,7 +19,7 @@ import java.io.File ...@@ -19,7 +19,7 @@ import java.io.File
/** /**
* Responsible for minimum version enforcement and initializing core app components. * Responsible for minimum version enforcement and initializing core app components.
*/ */
class ColdStartViewModel( class MainViewModel(
private val preferences: PreferencesRepository private val preferences: PreferencesRepository
) : ViewModel() { ) : ViewModel() {
......
package io.xxlabs.messenger.main.ui
class MainFragment {
}
\ No newline at end of file
package io.xxlabs.messenger.start.ui package io.xxlabs.messenger.main.ui
import io.elixxir.core.ui.dialog.info.SpanConfig import io.elixxir.core.ui.dialog.info.SpanConfig
import io.elixxir.core.ui.dialog.info.TwoButtonInfoDialogUi import io.elixxir.core.ui.dialog.info.TwoButtonInfoDialogUi
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
<activity <activity
android:id="@+id/coldStartActivity" android:id="@+id/coldStartActivity"
android:name="io.xxlabs.messenger.start.ui.ColdStartActivity" android:name="io.xxlabs.messenger.main.ui.MainActivity"
android:label="ColdStartActivity" /> android:label="ColdStartActivity" />
</navigation> </navigation>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.elixxir.feature.home"> package="io.elixxir.feature.home">
<application>
<activity android:name=".MainActivity" />
</application>
</manifest> </manifest>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment