Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xx Messenger Android
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile
android
xx Messenger Android
Commits
163d5cdc
Commit
163d5cdc
authored
Sep 23, 2022
by
Kamal Bramwell
Browse files
Options
Downloads
Patches
Plain Diff
Made MainActivity nav host container
parent
0ced2ebc
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/io/xxlabs/messenger/main/ui/MainActivity.kt
+9
-37
9 additions, 37 deletions
...src/main/java/io/xxlabs/messenger/main/ui/MainActivity.kt
app/src/main/res/layout/activity_main.xml
+27
-4
27 additions, 4 deletions
app/src/main/res/layout/activity_main.xml
with
36 additions
and
41 deletions
app/src/main/java/io/xxlabs/messenger/main/ui/MainActivity.kt
+
9
−
37
View file @
163d5cdc
...
...
@@ -4,7 +4,6 @@ import android.content.Intent
import
android.os.Bundle
import
androidx.activity.viewModels
import
androidx.appcompat.app.AppCompatActivity
import
androidx.core.app.ActivityCompat
import
androidx.core.view.ViewCompat
import
androidx.core.view.WindowCompat
import
androidx.core.view.WindowInsetsCompat
...
...
@@ -13,8 +12,6 @@ import androidx.lifecycle.Lifecycle
import
androidx.lifecycle.lifecycleScope
import
androidx.lifecycle.repeatOnLifecycle
import
io.xxlabs.messenger.R
import
io.elixxir.feature.registration.registration.RegistrationFlowActivity
import
io.elixxir.core.ui.util.getTransition
import
io.elixxir.core.ui.util.openLink
import
io.xxlabs.messenger.main.model.*
import
kotlinx.coroutines.launch
...
...
@@ -73,22 +70,11 @@ class MainActivity : AppCompatActivity() {
}
private
fun
invitationIntent
(
username
:
String
)
{
val
intent
=
Intent
(
this
,
MainActivity
::
class
.
java
).
apply
{
putExtra
(
INTENT_INVITATION
,
username
)
}
startActivity
(
intent
)
finish
()
TODO
(
"Go to requests screen"
)
}
private
fun
notificationIntent
(
intent
:
Intent
)
{
mainIntent
=
intent
.
getBundleExtra
(
INTENT_NOTIFICATION_CLICK
)
?.
let
{
Intent
(
this
@MainActivity
,
MainActivity
::
class
.
java
).
apply
{
putExtra
(
INTENT_NOTIFICATION_CLICK
,
it
)
}
}
TODO
(
"Go to chat/group chat"
)
}
private
fun
observeState
()
{
...
...
@@ -98,10 +84,10 @@ class MainActivity : AppCompatActivity() {
when
(
versionState
)
{
is
VersionOk
->
{
if
(
userState
==
UserState
.
NewUser
)
navigateToRegistration
()
else
navigateTo
Main
()
else
navigateTo
Home
()
}
is
UpdateRecommended
->
showAlert
(
versionState
.
alertUi
)
is
UpdateRequired
->
showAlert
(
versionState
.
alertUi
)
is
UpdateRecommended
->
show
Version
Alert
(
versionState
.
alertUi
)
is
UpdateRequired
->
show
Version
Alert
(
versionState
.
alertUi
)
else
->
{}
}
}
...
...
@@ -118,29 +104,15 @@ class MainActivity : AppCompatActivity() {
}
private
fun
navigateToRegistration
()
{
val
activity
=
Intent
(
this
@MainActivity
,
RegistrationFlowActivity
::
class
.
java
)
val
options
=
getTransition
(
R
.
anim
.
hold
,
R
.
anim
.
hold
)
startActivity
(
activity
,
options
)
ActivityCompat
.
finishAfterTransition
(
this
)
}
private
fun
navigateToMain
()
{
val
activity
=
mainIntent
?:
Intent
(
this
@MainActivity
,
MainActivity
::
class
.
java
)
private
fun
navigateToHome
()
{
val
options
=
getTransition
(
R
.
anim
.
fade_in
,
R
.
anim
.
fade_out
)
startActivity
(
activity
,
options
)
ActivityCompat
.
finishAfterTransition
(
this
@MainActivity
)
}
private
fun
showAlert
(
alertUi
:
VersionAlertUi
)
{
TODO
()
private
fun
show
Version
Alert
(
alertUi
:
VersionAlertUi
)
{
}
companion
object
{
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/activity_main.xml
+
27
−
4
View file @
163d5cdc
<?xml version="1.0" encoding="utf-8"?>
<
androidx.constraintlayout.widget.ConstraintL
ayout
<
l
ayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@drawable/bg_splash_screen"
/>
\ No newline at end of file
android:background=
"@color/brand_background"
tools:context=
"io.xxlabs.messenger.main.ui.MainActivity"
>
<androidx.fragment.app.FragmentContainerView
android:id=
"@+id/registrationNavHost"
android:name=
"androidx.navigation.fragment.NavHostFragment"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
app:defaultNavHost=
"true"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:navGraph=
"@navigation/nav_graph"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment