mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store latest visited main page & use it as default page on next app opening + fixed registration failure top bar click

Browse source
This commit is contained in:
Sylvain Berfini 2023-10-09 10:39:52 +02:00
parent 2fb97fbc51
commit 4a11554fa5
4 changed files with 105 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -48,6 +48,13 @@ class CorePreferences @UiThread constructor(private val context: Context) {
config.setBool("app", "debug", value)
}
@get:WorkerThread @set:WorkerThread
var defaultFragment: Int
get() = config.getInt("app", "default_page", -1)
set(value) {
config.setInt("app", "default_page", value)
}
@get:WorkerThread @set:WorkerThread
var conditionsAndPrivacyPolicyAccepted: Boolean
get() = config.getBool("app", "read_and_agree_terms_and_privacy", false)

92
app/src/main/java/org/linphone/ui/main/MainActivity.kt
View file

@ -40,20 +40,33 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.databinding.MainActivityBinding
import org.linphone.ui.main.viewmodel.MainViewModel
import org.linphone.ui.main.viewmodel.SharedMainViewModel
import org.linphone.utils.AppUtils
import org.linphone.utils.slideInToastFromTop
import org.linphone.utils.slideInToastFromTopForDuration
@UiThread
class MainActivity : AppCompatActivity() {
companion object {
private const val TAG = "[Main Activity]"
private const val CONTACTS_FRAGMENT_ID = 1
private const val HISTORY_FRAGMENT_ID = 2
private const val CHAT_FRAGMENT_ID = 3
private const val MEETINGS_FRAGMENT_ID = 4
}
private lateinit var binding: MainActivityBinding
private lateinit var viewModel: MainViewModel
private lateinit var sharedViewModel: SharedMainViewModel
override fun onCreate(savedInstanceState: Bundle?) {
WindowCompat.setDecorFitsSystemWindows(window, true)
super.onCreate(savedInstanceState)
@ -65,8 +78,6 @@ class MainActivity : AppCompatActivity() {
if (checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
loadContacts()
}
checkSelfPermission(Manifest.permission.CAMERA)
checkSelfPermission(Manifest.permission.RECORD_AUDIO)
binding = DataBindingUtil.setContentView(this, R.layout.main_activity)
binding.lifecycleOwner = this
@ -76,6 +87,10 @@ class MainActivity : AppCompatActivity() {
}
binding.viewModel = viewModel
sharedViewModel = run {
ViewModelProvider(this)[SharedMainViewModel::class.java]
}
viewModel.changeSystemTopBarColorEvent.observe(this) {
it.consume { mode ->
val color = when (mode) {
@ -102,6 +117,12 @@ class MainActivity : AppCompatActivity() {
}
}
viewModel.openDrawerEvent.observe(this) {
it.consume {
openDrawerMenu()
}
}
viewModel.defaultAccountRegistrationErrorEvent.observe(this) {
it.consume { error ->
val tag = "DEFAULT_ACCOUNT_REGISTRATION_ERROR"
@ -124,6 +145,40 @@ class MainActivity : AppCompatActivity() {
// TODO FIXME: uncomment
// startActivity(Intent(this, WelcomeActivity::class.java))
coreContext.postOnCoreThread {
val startDestination = when (corePreferences.defaultFragment) {
CONTACTS_FRAGMENT_ID -> {
Log.i("$TAG Latest visited page is contacts, setting it as start destination")
R.id.contactsFragment
}
HISTORY_FRAGMENT_ID -> {
Log.i(
"$TAG Latest visited page is call history, setting it as start destination"
)
R.id.historyFragment
}
CHAT_FRAGMENT_ID -> {
Log.i(
"$TAG Latest visited page is conversations, setting it as start destination"
)
R.id.conversationsFragment
}
/*MEETINGS_FRAGMENT_ID -> {
Log.i("$TAG Latest visited page is meetings, setting it as start destination")
R.id.meetingsFragment
}*/
else -> { // Default
Log.i("$TAG No latest visited page stored, using default one (call history)")
R.id.historyFragment
}
}
coreContext.postOnMainThread {
val navGraph = findNavController().navInflater.inflate(R.navigation.main_nav_graph)
navGraph.setStartDestination(startDestination)
findNavController().setGraph(navGraph, null)
}
}
coreContext.greenToastToShowEvent.observe(this) {
it.consume { pair ->
val message = pair.first
@ -133,12 +188,39 @@ class MainActivity : AppCompatActivity() {
}
}
override fun onPause() {
val defaultFragmentId = when (sharedViewModel.currentlyDisplayedFragment.value) {
R.id.contactsFragment -> {
CONTACTS_FRAGMENT_ID
}
R.id.historyFragment -> {
HISTORY_FRAGMENT_ID
}
R.id.conversationsFragment -> {
CHAT_FRAGMENT_ID
}
/*R.id.meetingsFragment -> {
MEETINGS_FRAGMENT_ID
}*/
else -> { // Default
HISTORY_FRAGMENT_ID
}
}
coreContext.postOnCoreThread {
Log.i("$TAG Storing default page [$defaultFragmentId]")
corePreferences.defaultFragment = defaultFragmentId
corePreferences.config.sync()
}
super.onPause()
}
@SuppressLint("RtlHardcoded")
fun toggleDrawerMenu() {
if (binding.drawerMenu.isDrawerOpen(Gravity.LEFT)) {
closeDrawerMenu()
} else {
binding.drawerMenu.openDrawer(binding.drawerMenuContent, true)
openDrawerMenu()
}
}
@ -146,6 +228,10 @@ class MainActivity : AppCompatActivity() {
binding.drawerMenu.closeDrawer(binding.drawerMenuContent, true)
}
private fun openDrawerMenu() {
binding.drawerMenu.openDrawer(binding.drawerMenuContent, true)
}
fun findNavController(): NavController {
return findNavController(R.id.main_nav_host_fragment)
}

10
app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
View file

@ -64,6 +64,10 @@ class MainViewModel @UiThread constructor() : ViewModel() {
MutableLiveData<Event<Boolean>>()
}
val openDrawerEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
var defaultAccountRegistrationFailed = false
private val coreListener = object : CoreListenerStub() {
@ -171,7 +175,11 @@ class MainViewModel @UiThread constructor() : ViewModel() {
@UiThread
fun onTopBarClicked() {
goBackToCallEvent.value = Event(true)
if (atLeastOneCall.value == true) {
goBackToCallEvent.value = Event(true)
} else {
openDrawerEvent.value = Event(true)
}
}
@WorkerThread

1
app/src/main/res/layout/main_activity.xml
View file

@ -39,7 +39,6 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:navGraph="@navigation/main_nav_graph"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/in_call_top_bar"