Bug fixes and added Activity and task count

Author: mohitsingh35

.idea/misc.xml

@@ -50,6 +50,7 @@ import com.ncs.o2.Domain.Utility.ExtensionsUtil.invisible
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.isNull
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.performHapticFeedback
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.rotate180
+import com.ncs.o2.Domain.Utility.ExtensionsUtil.runDelayed
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.setOnClickThrottleBounceListener
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.visible
 import com.ncs.o2.Domain.Utility.GlobalUtils
@@ -140,7 +141,6 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
             binding.gioActionbar.offlineIndicator.gone()
 
         }
-
         binding.gioActionbar.offlineIndicator.setOnClickThrottleBounceListener {
             easyElements.twoBtnDialog("Offline Mode Active", msg = "As network is not available, offline mode is active, things may not be in sync with server","Check Network","Cancel",{
                 networkChangeReceiver.retryNetworkCheck()
@@ -168,10 +168,12 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
         // Hide keyboard at startup
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
         setContentView(binding.root)
-
         PrefManager.initialize(this)
         setUpInitilisations()
+
+
     }
+
     private fun setUpInitilisations(){
         manageViews()
         setUpViews()
@@ -189,6 +191,7 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
             Log.d("projectSegments",PrefManager.getProjectSegments(project).toString())
         }
     }
+
     private fun manageViews(){
         if (PrefManager.getcurrentsegment()== "Select Segment") {
             binding.placeholderText.visible()
@@ -283,6 +286,7 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
         val intentFilter = IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
         registerReceiver(networkChangeReceiver, intentFilter)
         setNotificationCountOnActionBar()
+        setUpInitilisations()
     }
 
 
@@ -494,9 +498,13 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
     override fun onSegmentSelected(segmentName: String) {
 
         // Handle segment selection
+        binding.gioActionbar.tabLayout.gone()
         binding.gioActionbar.titleTv.text = segmentName
         segmentText.value = segmentName
         viewModel.updateCurrentSegment(segmentName)
+        runDelayed(1000){
+            binding.gioActionbar.tabLayout.visible()
+        }
         if (segmentName=="Select Segment"){
             binding.gioActionbar.tabLayout.gone()
             binding.gioActionbar.searchCont.gone()
@@ -900,7 +908,10 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
                                     val intent =
                                         Intent(this@MainActivity, TaskDetailActivity::class.java)
                                     intent.putExtra("task_id", taskId)
+                                    intent.putExtra("type", "shareTask")
+
                                     startActivity(intent)
+                                    finish()
                                     overridePendingTransition(
                                         R.anim.slide_in_left,
                                         R.anim.slide_out_left
@@ -957,7 +968,10 @@ class MainActivity : AppCompatActivity(), ProjectCallback, SegmentSelectionBotto
                                     val intent =
                                         Intent(this@MainActivity, TaskDetailActivity::class.java)
                                     intent.putExtra("task_id", taskId)
+                                    intent.putExtra("type", "shareTask")
+
                                     startActivity(intent)
+                                    finish()
                                     overridePendingTransition(
                                         R.anim.slide_in_left,
                                         R.anim.slide_out_left

app/src/main/java/com/ncs/o2/UI/MainActivity.kt

@@ -36,6 +36,7 @@ class TaskDetailActivity : AppCompatActivity(), TaskDetailsFragment.ViewVisibili
         ActivityTaskDetailBinding.inflate(layoutInflater)
     }
     lateinit var taskId:String
+     var type: String? =null
     var index:String?=null
     lateinit var isworkspace:String
     var users:MutableList<UserInMessage> = mutableListOf()
@@ -53,6 +54,12 @@ class TaskDetailActivity : AppCompatActivity(), TaskDetailsFragment.ViewVisibili
         registerReceiver(networkChangeReceiver, intentFilter)
 
             taskId = intent.getStringExtra("task_id")!!
+            val _type=intent.getStringExtra("type")
+
+            if (_type!=null){
+                type=_type
+            }
+
             val _index= intent.getStringExtra("index")
             if (_index!=null){
                 index=_index
@@ -77,9 +84,14 @@ class TaskDetailActivity : AppCompatActivity(), TaskDetailsFragment.ViewVisibili
 
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
-        //startActivity(Intent(this@TaskDetailActivity, MainActivity::class.java))
         super.onBackPressed()
-        overridePendingTransition(R.anim.slide_in_right, me.shouheng.utils.R.anim.slide_out_right)
+        if (type=="shareTask" ){
+            startActivity(Intent(this@TaskDetailActivity, MainActivity::class.java))
+            overridePendingTransition(R.anim.slide_in_right, me.shouheng.utils.R.anim.slide_out_right)
+        }
+        else{
+            overridePendingTransition(R.anim.slide_in_right, me.shouheng.utils.R.anim.slide_out_right)
+        }
 
     }
     private fun setActionbar() {

app/src/main/java/com/ncs/o2/UI/Tasks/TaskPage/TaskDetailActivity.kt

@@ -1,20 +1,32 @@
 package com.ncs.o2.UI.Tasks.TaskPage
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
 import com.ncs.o2.Data.Room.MessageRepository.MessageDatabase
 import com.ncs.o2.Domain.Models.Message
+import com.ncs.o2.Domain.Utility.ExtensionsUtil.gone
+import com.ncs.o2.Domain.Utility.ExtensionsUtil.visible
 import com.ncs.o2.HelperClasses.PrefManager
+import com.ncs.o2.R
 import com.ncs.o2.UI.UIComponents.Adapters.TaskDetailsViewPagerAdpater
+import com.ncs.o2.UI.UIComponents.Adapters.TaskSectionViewPagerAdapter
 import com.ncs.o2.databinding.FragmentTasksDetailsHolderBinding
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
@@ -57,29 +69,75 @@ class TasksDetailsHolderFragment : Fragment() {
     private fun setUpTabsLayout() {
 
 
+        val viewPager2 = binding.viewPager2
+        val adapter = TaskDetailsViewPagerAdpater(this, 3)
+        viewPager2.adapter = adapter
+
+        val tabLayout = activityBinding.binding.tabLayout
+        tabLayout.removeAllTabs()
+
+        val tabLayoutMediator = TabLayoutMediator(tabLayout, viewPager2) { tab, position ->
+            val customTabView = LayoutInflater.from(tabLayout.context).inflate(R.layout.tab_item, null)
+            val tabText: TextView = customTabView.findViewById(R.id.tabText)
+            val iconCount: TextView = customTabView.findViewById(R.id.iconCount)
+            val countParent: ConstraintLayout = customTabView.findViewById(R.id.count)
 
-        TabLayoutMediator(
-            activityBinding.binding.tabLayout, binding.viewPager2
-        ) { tab, position ->
+            updateTabColors(viewPager2.currentItem)
+
+            viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    updateTabColors(position)
+                }
+            })
             when(position){
-                0-> tab.text="Details"
+                0-> {
+                    countParent.gone()
+                    tabText.text = "Details"
+                }
                 1-> {
                     CoroutineScope(Dispatchers.IO).launch {
                         val messages=db.messagesDao().getMessagesForTask(PrefManager.getcurrentProject(),activityBinding.taskId)
                         withContext(Dispatchers.Main){
                             if (messages.isEmpty()){
-                                tab.text="Activity"
+                                countParent.gone()
+                                tabText.text = "Activity"
                             }
                             else{
-                                tab.text="Activity (${messages.size})"
+                                countParent.visible()
+                                tabText.text = "Activity"
+                                iconCount.text=messages.size.toString()
                             }
                         }
                     }
 
                 }
-                2-> tab.text="Checklist"
+                2-> {
+                    countParent.gone()
+                    tabText.text = "Checklist"
+                }
+            }
+            tab.customView = customTabView
+        }
+
+        tabLayoutMediator.attach()
+
+    }
+    fun updateTabColors(selectedPosition: Int) {
+        val selectedColor = ContextCompat.getColor(activityBinding.binding.tabLayout.context, R.color.selected_tab_color)
+        val unselectedColor = ContextCompat.getColor(activityBinding.binding.tabLayout.context, R.color.unselected_tab_color)
+
+        for (i in 0 until activityBinding.binding.tabLayout.tabCount) {
+            val tab = activityBinding.binding.tabLayout.getTabAt(i)
+            val tabText = tab?.customView?.findViewById<TextView>(R.id.tabText)
+            val tabIconBg = tab?.customView?.findViewById<LinearLayout>(R.id.tabIcon)
+
+            if (tab != null && tabText != null && tabIconBg != null) {
+                val color = if (i == selectedPosition) selectedColor else unselectedColor
+                val drawable=if (i == selectedPosition) R.drawable.tab_selected__icon_bg else R.drawable.tab_unselected_icon_bg
+                tabText.setTextColor(color)
+                tabIconBg.setBackgroundDrawable(resources.getDrawable(drawable))
             }
-        }.attach()
+        }
     }
 
 }

app/src/main/java/com/ncs/o2/UI/Tasks/TaskPage/TasksDetailsHolderFragment.kt

@@ -5,11 +5,17 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
 import com.ncs.o2.Constants.SwitchFunctions
 import com.ncs.o2.Data.Room.TasksRepository.TasksDatabase
@@ -18,8 +24,10 @@ import com.ncs.o2.Domain.Models.Task
 import com.ncs.o2.Domain.Models.TaskItem
 import com.ncs.o2.Domain.Repositories.FirestoreRepository
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.gone
+import com.ncs.o2.Domain.Utility.ExtensionsUtil.setBackgroundDrawable
 import com.ncs.o2.Domain.Utility.ExtensionsUtil.visible
 import com.ncs.o2.HelperClasses.PrefManager
+import com.ncs.o2.R
 import com.ncs.o2.UI.MainActivity
 import com.ncs.o2.UI.Tasks.Sections.TaskSectionFragment
 import com.ncs.o2.UI.Tasks.Sections.TaskSectionViewModel
@@ -132,9 +140,27 @@ class TasksHolderFragment : Fragment(),SegmentSelectionBottomSheet.sendSectionsL
 
     private fun setUpTabsLayout(list: MutableList<String>) {
         Log.d("sectionslist", list.toString())
-        TabLayoutMediator(
-            activityBinding.gioActionbar.tabLayout, binding.viewPager2
-        ) { tab, position ->
+
+        val viewPager2 = binding.viewPager2
+        val adapter = TaskSectionViewPagerAdapter(this, list.size, list)
+        viewPager2.adapter = adapter
+
+        val tabLayout = activityBinding.gioActionbar.tabLayout
+        tabLayout.removeAllTabs()
+
+        val tabLayoutMediator = TabLayoutMediator(tabLayout, viewPager2) { tab, position ->
+            val customTabView = LayoutInflater.from(tabLayout.context).inflate(R.layout.tab_item, null)
+            val tabText: TextView = customTabView.findViewById(R.id.tabText)
+            val iconCount: TextView = customTabView.findViewById(R.id.iconCount)
+            val countParent: ConstraintLayout = customTabView.findViewById(R.id.count)
+
+            updateTabColors(viewPager2.currentItem)
+
+            viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    updateTabColors(position)
+                }
+            })
             if (position < list.size && position !in processedPositions) {
                 Log.d("sectionslist", "current position is $position")
 
@@ -151,9 +177,12 @@ class TasksHolderFragment : Fragment(),SegmentSelectionBottomSheet.sendSectionsL
 
                             withContext(Dispatchers.Main) {
                                 if (tasks.isEmpty()) {
-                                    tab.text = list[currentPosition]
+                                    countParent.gone()
+                                    tabText.text = list[position]
                                 } else {
-                                    tab.text = "${list[currentPosition]} (${tasks.size})"
+                                    countParent.visible()
+                                    tabText.text = list[position]
+                                    iconCount.text=tasks.size.toString()
                                 }
                             }
 
@@ -162,10 +191,31 @@ class TasksHolderFragment : Fragment(),SegmentSelectionBottomSheet.sendSectionsL
                     }
                 }
             }
-        }.attach()
+            tab.customView = customTabView
+        }
+
+        tabLayoutMediator.attach()
+
+
     }
 
+    fun updateTabColors(selectedPosition: Int) {
+        val selectedColor = ContextCompat.getColor(activityBinding.gioActionbar.tabLayout.context, R.color.selected_tab_color)
+        val unselectedColor = ContextCompat.getColor(activityBinding.gioActionbar.tabLayout.context, R.color.unselected_tab_color)
+
+        for (i in 0 until activityBinding.gioActionbar.tabLayout.tabCount) {
+            val tab = activityBinding.gioActionbar.tabLayout.getTabAt(i)
+            val tabText = tab?.customView?.findViewById<TextView>(R.id.tabText)
+            val tabIconBg = tab?.customView?.findViewById<LinearLayout>(R.id.tabIcon)
 
+            if (tab != null && tabText != null && tabIconBg != null) {
+                val color = if (i == selectedPosition) selectedColor else unselectedColor
+                val drawable=if (i == selectedPosition) R.drawable.tab_selected__icon_bg else R.drawable.tab_unselected_icon_bg
+                tabText.setTextColor(color)
+                tabIconBg.setBackgroundDrawable(resources.getDrawable(drawable))
+            }
+        }
+    }
 
     override fun sendSectionsList(list: MutableList<String>) {
         sectionsList.clear()

app/src/main/java/com/ncs/o2/UI/Tasks/TasksHolderFragment.kt

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/primary"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
+</vector>

app/src/main/res/drawable/baseline_circle_primary_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/account"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
+</vector>

app/src/main/res/drawable/baseline_circle_unselected_24.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primary" android:state_selected="true" />
+    <item android:color="@color/account" />
+</selector>

app/src/main/res/drawable/tab_icon_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/baseline_circle_primary_24" android:state_selected="true" />
+    <item android:drawable="@drawable/baseline_circle_unselected_24" />
+</selector>

app/src/main/res/drawable/tab_icon_selector.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/primary"/>
+    <corners android:radius="5sp"/>
+</shape>

app/src/main/res/drawable/tab_selected__icon_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/account"/>
+    <corners android:radius="5sp"/>
+</shape>