Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b01e0a62 authored by Hasib Prince's avatar Hasib Prince
Browse files

App Lounge: fixed flickering partially

parent a1736527
Loading
Loading
Loading
Loading
Loading
+11 −11
Original line number Original line Diff line number Diff line
@@ -90,6 +90,8 @@ class MainActivity : AppCompatActivity() {
            if (isInternetAvailable) {
            if (isInternetAvailable) {
                binding.noInternet.visibility = View.GONE
                binding.noInternet.visibility = View.GONE
                binding.fragment.visibility = View.VISIBLE
                binding.fragment.visibility = View.VISIBLE
            }
        }


        viewModel.userType.observe(this) { user ->
        viewModel.userType.observe(this) { user ->
            viewModel.handleAuthDataJson()
            viewModel.handleAuthDataJson()
@@ -103,8 +105,6 @@ class MainActivity : AppCompatActivity() {
        viewModel.authDataJson.observe(this) {
        viewModel.authDataJson.observe(this) {
            viewModel.handleAuthDataJson()
            viewModel.handleAuthDataJson()
        }
        }
            }
        }


        viewModel.authValidity.observe(this) {
        viewModel.authValidity.observe(this) {


+1 −1
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ class MainActivityViewModel @Inject constructor(


        if (!isUserLoggedIn(user, json)) {
        if (!isUserLoggedIn(user, json)) {
            generateAuthDataBasedOnUserType(user)
            generateAuthDataBasedOnUserType(user)
        } else if (isEligibleToValidateJson(json)) {
        } else if (isEligibleToValidateJson(json) && internetConnection.value == true) {
            validateAuthData()
            validateAuthData()
            Log.d(TAG, ">>> Authentication data is available!")
            Log.d(TAG, ">>> Authentication data is available!")
        }
        }
+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@
package foundation.e.apps.home
package foundation.e.apps.home


import android.os.Bundle
import android.os.Bundle
import android.util.Log
import android.view.View
import android.view.View
import android.widget.ImageView
import android.widget.ImageView
import androidx.fragment.app.activityViewModels
import androidx.fragment.app.activityViewModels
@@ -158,6 +159,7 @@ class HomeFragment : TimeoutFragment(R.layout.fragment_home), FusedAPIInterface
        homeViewModel.homeScreenData.observe(viewLifecycleOwner) {
        homeViewModel.homeScreenData.observe(viewLifecycleOwner) {
            stopLoadingUI()
            stopLoadingUI()
            if (it.second == ResultStatus.OK) {
            if (it.second == ResultStatus.OK) {
                Log.d("TAG", ">>> homeScreenData updated ")
                dismissTimeoutDialog()
                dismissTimeoutDialog()
                homeParentRVAdapter?.setData(it.first)
                homeParentRVAdapter?.setData(it.first)
            } else {
            } else {
+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@


package foundation.e.apps.home.model
package foundation.e.apps.home.model


import android.util.Log
import android.view.LayoutInflater
import android.view.LayoutInflater
import android.view.ViewGroup
import android.view.ViewGroup
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LifecycleOwner
@@ -93,6 +94,7 @@ class HomeParentRVAdapter(
    ) {
    ) {
        lifecycleOwner?.let {
        lifecycleOwner?.let {
            mainActivityViewModel.downloadList.observe(it) {
            mainActivityViewModel.downloadList.observe(it) {
                Log.d("TAG", ">>> ParentRVAdapter updated downloadlist: ")
                mainActivityViewModel.updateStatusOfFusedApps(fusedHome.list, it)
                mainActivityViewModel.updateStatusOfFusedApps(fusedHome.list, it)
                (homeChildRVAdapter as HomeChildRVAdapter).setData(fusedHome.list)
                (homeChildRVAdapter as HomeChildRVAdapter).setData(fusedHome.list)
            }
            }