fix: changes according PR review

Author: PavloNetrebchuk

app/src/main/java/org/openedx/app/MainFragment.kt

@@ -40,10 +40,15 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         }
     }
 
-    @Suppress("LongMethod", "CyclomaticComplexMethod")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        handleArguments()
+        setupBottomNavigation()
+        setupViewPager()
+        observeViewModel()
+    }
 
+    private fun handleArguments() {
         requireArguments().apply {
             getString(ARG_COURSE_ID).takeIf { it.isNullOrBlank().not() }?.let { courseId ->
                 val infoType = getString(ARG_INFO_TYPE)
@@ -56,26 +61,43 @@ class MainFragment : Fragment(R.layout.fragment_main) {
                 putString(ARG_INFO_TYPE, "")
             }
         }
+    }
 
+    private fun setupBottomNavigation() {
         val openTabArg = requireArguments().getString(ARG_OPEN_TAB, HomeTab.LEARN.name)
+        val initialMenuId = getInitialMenuId(openTabArg)
+        binding.bottomNavView.selectedItemId = initialMenuId
+
+        val menu = binding.bottomNavView.menu
+        menu.clear()
+
+        val tabList = createTabList(openTabArg)
+        addMenuItems(menu, tabList)
+        setupBottomNavListener(tabList)
+
+        requireArguments().remove(ARG_OPEN_TAB)
+    }
+
+    private fun createTabList(openTabArg: String): List<Pair<Int, Fragment>> {
         val learnFragment = LearnFragment.newInstance(
             openTab = if (openTabArg == HomeTab.PROGRAMS.name) {
                 LearnTab.PROGRAMS.name
             } else {
                 LearnTab.COURSES.name
             }
         )
-        val tabList = mutableListOf<Pair<Int, Fragment>>().apply {
+
+        return mutableListOf<Pair<Int, Fragment>>().apply {
             add(R.id.fragmentLearn to learnFragment)
             add(R.id.fragmentDiscover to viewModel.getDiscoveryFragment)
             if (viewModel.isDownloadsFragmentEnabled) {
                 add(R.id.fragmentDownloads to DownloadsFragment())
             }
             add(R.id.fragmentProfile to ProfileFragment())
         }
+    }
 
-        val menu = binding.bottomNavView.menu
-        menu.clear()
+    private fun addMenuItems(menu: Menu, tabList: List<Pair<Int, Fragment>>) {
         val tabTitles = mapOf(
             R.id.fragmentLearn to resources.getString(R.string.app_navigation_learn),
             R.id.fragmentDiscover to resources.getString(R.string.app_navigation_discovery),
@@ -88,13 +110,14 @@ class MainFragment : Fragment(R.layout.fragment_main) {
             R.id.fragmentDownloads to R.drawable.app_ic_download_cloud,
             R.id.fragmentProfile to R.drawable.app_ic_profile
         )
+
         for ((id, _) in tabList) {
             val menuItem = menu.add(Menu.NONE, id, Menu.NONE, tabTitles[id] ?: "")
             tabIcons[id]?.let { menuItem.setIcon(it) }
         }
+    }
 
-        initViewPager(tabList)
-
+    private fun setupBottomNavListener(tabList: List<Pair<Int, Fragment>>) {
         val menuIdToIndex = tabList.mapIndexed { index, pair -> pair.first to index }.toMap()
 
         binding.bottomNavView.setOnItemSelectedListener { menuItem ->
@@ -109,7 +132,14 @@ class MainFragment : Fragment(R.layout.fragment_main) {
             }
             true
         }
+    }
+
+    private fun setupViewPager() {
+        val tabList = createTabList(requireArguments().getString(ARG_OPEN_TAB, HomeTab.LEARN.name))
+        initViewPager(tabList)
+    }
 
+    private fun observeViewModel() {
         viewModel.isBottomBarEnabled.observe(viewLifecycleOwner) { isBottomBarEnabled ->
             enableBottomBar(isBottomBarEnabled)
         }
@@ -121,22 +151,20 @@ class MainFragment : Fragment(R.layout.fragment_main) {
                 }
             }
         }
+    }
 
-        val initialMenuId = when (openTabArg) {
+    private fun getInitialMenuId(openTabArg: String): Int {
+        return when (openTabArg) {
             HomeTab.LEARN.name, HomeTab.PROGRAMS.name -> R.id.fragmentLearn
             HomeTab.DISCOVER.name -> R.id.fragmentDiscover
             HomeTab.DOWNLOADS.name -> if (viewModel.isDownloadsFragmentEnabled) {
                 R.id.fragmentDownloads
             } else {
                 R.id.fragmentLearn
             }
-
             HomeTab.PROFILE.name -> R.id.fragmentProfile
             else -> R.id.fragmentLearn
         }
-        binding.bottomNavView.selectedItemId = initialMenuId
-
-        requireArguments().remove(ARG_OPEN_TAB)
     }
 
     private fun initViewPager(tabList: List<Pair<Int, Fragment>>) {

app/src/main/res/values/main_manu_tab_ids.xml

@@ -4,4 +4,4 @@
     <item type="id" name="fragmentDiscover" />
     <item type="id" name="fragmentDownloads" />
     <item type="id" name="fragmentProfile" />
-</resources>
+</resources>

build.gradle

@@ -44,6 +44,7 @@ ext {
 
     zip_version = '2.6.3'
     //testing
+    compose_ui_tooling = '1.7.8'
     mockk_version = '1.13.12'
     android_arch_version = '2.2.0'
     junit_version = '4.13.2'

core/build.gradle

@@ -119,7 +119,8 @@ dependencies {
     //  OpenEdx libs
     api("com.github.openedx:openedx-app-foundation-android:1.0.0")
 
-    debugApi "androidx.compose.ui:ui-tooling:1.7.8"
+    // Preview
+    debugApi "androidx.compose.ui:ui-tooling:$compose_ui_tooling"
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'

core/src/main/java/org/openedx/core/ui/ComposeCommon.kt

@@ -222,6 +222,40 @@ fun Toolbar(
     }
 }
 
+@Composable
+fun MainToolbar(
+    modifier: Modifier = Modifier,
+    label: String,
+    onSettingsClick: () -> Unit,
+) {
+    Box(
+        modifier = modifier.fillMaxWidth()
+    ) {
+        Text(
+            modifier = Modifier
+                .align(Alignment.CenterStart)
+                .padding(start = 16.dp),
+            text = label,
+            color = MaterialTheme.appColors.textDark,
+            style = MaterialTheme.appTypography.headlineBold
+        )
+        IconButton(
+            modifier = Modifier
+                .align(Alignment.CenterEnd)
+                .padding(end = 12.dp),
+            onClick = {
+                onSettingsClick()
+            }
+        ) {
+            Icon(
+                imageVector = Icons.Default.ManageAccounts,
+                tint = MaterialTheme.appColors.textAccent,
+                contentDescription = stringResource(id = R.string.core_accessibility_settings)
+            )
+        }
+    }
+}
+
 @Composable
 fun SearchBar(
     modifier: Modifier,

dashboard/src/main/java/org/openedx/learn/presentation/LearnFragment.kt

@@ -5,7 +5,6 @@ import android.view.View
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -15,12 +14,10 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandMore
-import androidx.compose.material.icons.filled.ManageAccounts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -44,6 +41,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.openedx.core.adapter.NavigationFragmentAdapter
 import org.openedx.core.presentation.global.viewBinding
+import org.openedx.core.ui.MainToolbar
 import org.openedx.core.ui.crop
 import org.openedx.core.ui.displayCutoutForLandscape
 import org.openedx.core.ui.statusBarsInset
@@ -55,7 +53,6 @@ import org.openedx.dashboard.databinding.FragmentLearnBinding
 import org.openedx.foundation.presentation.rememberWindowSize
 import org.openedx.foundation.presentation.windowSizeValue
 import org.openedx.learn.LearnType
-import org.openedx.core.R as CoreR
 
 class LearnFragment : Fragment(R.layout.fragment_learn) {
 
@@ -140,7 +137,7 @@ private fun Header(
             .then(contentWidth),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Title(
+        MainToolbar(
             label = stringResource(id = R.string.dashboard_learn),
             onSettingsClick = {
                 viewModel.onSettingsClick(fragmentManager)
@@ -158,40 +155,6 @@ private fun Header(
     }
 }
 
-@Composable
-private fun Title(
-    modifier: Modifier = Modifier,
-    label: String,
-    onSettingsClick: () -> Unit,
-) {
-    Box(
-        modifier = modifier.fillMaxWidth()
-    ) {
-        Text(
-            modifier = Modifier
-                .align(Alignment.CenterStart)
-                .padding(start = 16.dp),
-            text = label,
-            color = MaterialTheme.appColors.textDark,
-            style = MaterialTheme.appTypography.headlineBold
-        )
-        IconButton(
-            modifier = Modifier
-                .align(Alignment.CenterEnd)
-                .padding(end = 12.dp),
-            onClick = {
-                onSettingsClick()
-            }
-        ) {
-            Icon(
-                imageVector = Icons.Default.ManageAccounts,
-                tint = MaterialTheme.appColors.textAccent,
-                contentDescription = stringResource(id = CoreR.string.core_accessibility_settings)
-            )
-        }
-    }
-}
-
 @Composable
 private fun LearnDropdownMenu(
     modifier: Modifier = Modifier,
@@ -277,7 +240,7 @@ private fun LearnDropdownMenu(
 @Composable
 private fun HeaderPreview() {
     OpenEdXTheme {
-        Title(
+        MainToolbar(
             label = stringResource(id = R.string.dashboard_learn),
             onSettingsClick = {}
         )

downloads/build.gradle

@@ -62,4 +62,4 @@ dependencies {
     testImplementation "io.mockk:mockk:$mockk_version"
     testImplementation "io.mockk:mockk-android:$mockk_version"
     testImplementation "androidx.arch.core:core-testing:$android_arch_version"
-}
+}

downloads/proguard-rules.pro

@@ -4,4 +4,4 @@
 # shrinking, optimization, and obfuscation for the entire application, including this library.
 -dontshrink
 -dontoptimize
--dontobfuscate
+-dontobfuscate

downloads/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
 
-</manifest>
+</manifest>

downloads/src/main/java/org/openedx/downloads/data/repository/DownloadRepository.kt

@@ -23,9 +23,9 @@ class DownloadRepository(
         val username = corePreferences.user?.username ?: ""
         val response = api.getDownloadCoursesPreview(username)
         val downloadCoursesPreview = response.map { it.mapToDomain() }
+        emit(downloadCoursesPreview)
         val downloadCoursesPreviewEntity = response.map { it.mapToRoomEntity() }
         dao.insertDownloadCoursePreview(downloadCoursesPreviewEntity)
-        emit(downloadCoursesPreview)
     }
 
     fun getDownloadModels() = dao.getAllDataFlow().map { list ->