v4.1.2 (#137)

v4.1.2 Done Fixes #38
aiyu-ayaan · Jun 7, 2023 · 63586ba · 63586ba
1 parent 2d20218
commit 63586ba
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/bitapp/src/main/java/com/atech/bit/ui/activity/main_activity/MainActivity.kt b/bitapp/src/main/java/com/atech/bit/ui/activity/main_activity/MainActivity.kt
@@ -56,7 +56,6 @@ import com.atech.core.utils.APP_LOGO_LINK
 import com.atech.core.utils.ERROR_LOG
 import com.atech.core.utils.KEY_ANN_VERSION
 import com.atech.core.utils.KEY_CURRENT_SHOW_TIME
-import com.atech.core.utils.KEY_DO_NOT_SHOW_AGAIN
 import com.atech.core.utils.KEY_REACH_TO_HOME
 import com.atech.core.utils.KEY_SHOW_TIMES
 import com.atech.core.utils.KEY_USER_DONE_SET_UP
@@ -183,8 +182,8 @@ class MainActivity : AppCompatActivity(), DrawerLocker, SearchViewVisible {
         openAboutUs()
         onDestinationChange()
         checkForUpdate()
-        val u = pref.getBoolean(KEY_DO_NOT_SHOW_AGAIN, false)
-        if (u) getWarning()
+
+        getWarning()
         shareReview()
         getShowTimes()
         onBackPressDispatcher()
@@ -492,8 +491,11 @@ class MainActivity : AppCompatActivity(), DrawerLocker, SearchViewVisible {
                 TAG_REMOTE,
                 "getWarning: $isEnable $title $link $minVersion $buttonText $isMinEdition"
             )
-            Log.d(TAG_REMOTE, "$u , $isEnable , $isMinEdition")
-            if (isEnable && u && !isMinEdition) {
+            Log.d(TAG_REMOTE, "getWarning $u , $isEnable , $isMinEdition")
+            if (!isMinEdition) {
+                return@fetchData
+            }
+            if (isEnable && u) {
                 openWarningDialog(title, link, buttonText)
             }
         }

diff --git a/bitapp/src/main/java/com/atech/bit/ui/fragments/home/HomeFragment.kt b/bitapp/src/main/java/com/atech/bit/ui/fragments/home/HomeFragment.kt
@@ -907,10 +907,12 @@ class HomeFragment :
                 DataState.Empty -> {}
                 is DataState.Error -> {
                     if (dataState.exception is HttpException) {
+                        layoutChanges(false).also {
+                            binding.fragmentHomeExt.switchOldNew.isVisible = false
+                        }
                         binding.root.showSnackBar(
                             "${dataState.exception.message}", Snackbar.LENGTH_SHORT, "Report"
                         ) {
-//                            setViewOfOnlineSyllabusExt(false)
                             requireActivity().openBugLink(
                                 com.atech.core.R.string.bug_repost,
                                 "${this.javaClass.simpleName}.class",
@@ -923,6 +925,7 @@ class HomeFragment :
 
                 DataState.Loading -> {
                     binding.fragmentHomeExt.semChoseOnlineExt.apply {
+                        binding.fragmentHomeExt.switchOldNew.isVisible = true
                         progressBarLoading.isVisible = true
                         noData.isVisible = false
                         noDataText.isVisible = false

diff --git a/bitapp/src/main/java/com/atech/bit/utils/handleCustomBackPressed.kt b/bitapp/src/main/java/com/atech/bit/utils/handleCustomBackPressed.kt
@@ -3,11 +3,27 @@ package com.atech.bit.utils
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
 
 fun Fragment.handleCustomBackPressed(
     onBackPressed: OnBackPressedCallback.() -> Unit
 ) {
-    requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
-        onBackPressed()
+    viewLifecycleOwnerLiveData.observe(viewLifecycleOwner) { viewLifecycleOwner ->
+        viewLifecycleOwner.lifecycle.addObserver(object : LifecycleEventObserver {
+            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    viewLifecycleOwner.lifecycle.removeObserver(this)
+                    return
+                }
+                if (event == Lifecycle.Event.ON_CREATE)
+                    requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+                        onBackPressed()
+                    }
+
+            }
+        })
     }
+
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -20,8 +20,8 @@ object AndroidSdk {
 
 object App {
     const val id = "com.atech.bit"
-    const val versionCode = 58
-    const val versionName = "4.1.1 Patch 31"
+    const val versionCode = 59
+    const val versionName = "4.1.2"
 }
 
 object JavaVersionCompatibility {

diff --git a/core/src/main/java/com/atech/core/api/BITApiClient.kt b/core/src/main/java/com/atech/core/api/BITApiClient.kt
@@ -12,7 +12,7 @@ import retrofit2.http.Path
 interface BITApiClient {
 
     companion object {
-        const val BASE_URL = "https://aiyu-ayaan.github.io/BIT-App-Data/data/"
+        const val BASE_URL = "https://bit-lalpur-app.github.io/BIT-App-Data/data/"
     }