diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.kt index 859374497e..83737c4a39 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.kt @@ -68,13 +68,8 @@ class MyTeamsDetailFragment : BaseNewsFragment() { } } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - fragmentMyTeamsDetailBinding = - FragmentMyTeamsDetailBinding.inflate(inflater, container, false) + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { + fragmentMyTeamsDetailBinding = FragmentMyTeamsDetailBinding.inflate(inflater, container, false) val v: View = fragmentMyTeamsDetailBinding.root initializeViews(v) dbService = DatabaseService(requireActivity()) @@ -90,18 +85,16 @@ class MyTeamsDetailFragment : BaseNewsFragment() { tvDescription = v.findViewById(R.id.description) tabLayout = v.findViewById(R.id.tab_layout) listContent = v.findViewById(R.id.list_content) - fragmentMyTeamsDetailBinding.btnInvite.visibility = - if (showBetaFeature(Constants.KEY_MEETUPS, requireContext())) { - View.VISIBLE - } else { - View.GONE - } - fragmentMyTeamsDetailBinding.btnLeave.visibility = - if (showBetaFeature(Constants.KEY_MEETUPS, requireContext())) { - View.VISIBLE - } else { - View.GONE - } + fragmentMyTeamsDetailBinding.btnInvite.visibility = if (showBetaFeature(Constants.KEY_MEETUPS, requireContext())) { + View.VISIBLE + } else { + View.GONE + } + fragmentMyTeamsDetailBinding.btnLeave.visibility = if (showBetaFeature(Constants.KEY_MEETUPS, requireContext())) { + View.VISIBLE + } else { + View.GONE + } v.findViewById(R.id.add_message).setOnClickListener { showAddMessage() } } @@ -144,22 +137,12 @@ class MyTeamsDetailFragment : BaseNewsFragment() { rvDiscussion.layoutManager = LinearLayoutManager(activity) showRecyclerView(realmNewsList) listContent.visibility = View.GONE - val courses = mRealm.where(RealmMyCourse::class.java) - .`in`("id", team?.courses?.toTypedArray()).findAll() - libraries = mRealm.where(RealmMyLibrary::class.java) - .`in`("id", getResourceIds(teamId, mRealm).toTypedArray()).findAll() - tabLayout.getTabAt(1) - ?.setText(String.format(getString(R.string.joined_members_colon) + " (%s)", users.size)) - tabLayout.getTabAt(3) - ?.setText(String.format(getString(R.string.courses_colon) + " (%s)", courses.size)) - tabLayout.getTabAt(2)?.setText( - String.format( - getString(R.string.requested_members_colon) + " (%s)", - reqUsers.size - ) - ) - tabLayout.getTabAt(4) - ?.setText(String.format(getString(R.string.resources_colon) + " (%s)", libraries?.size)) + val courses = mRealm.where(RealmMyCourse::class.java).`in`("id", team?.courses?.toTypedArray()).findAll() + libraries = mRealm.where(RealmMyLibrary::class.java).`in`("id", getResourceIds(teamId, mRealm).toTypedArray()).findAll() + tabLayout.getTabAt(1)?.setText(String.format(getString(R.string.joined_members_colon) + " (%s)", users.size)) + tabLayout.getTabAt(3)?.setText(String.format(getString(R.string.courses_colon) + " (%s)", courses.size)) + tabLayout.getTabAt(2)?.setText(String.format(getString(R.string.requested_members_colon) + " (%s)", reqUsers.size)) + tabLayout.getTabAt(4)?.setText(String.format(getString(R.string.resources_colon) + " (%s)", libraries?.size)) if (!isMyTeam) { try { (tabLayout.getChildAt(0) as ViewGroup).getChildAt(0).visibility = View.GONE @@ -188,22 +171,16 @@ class MyTeamsDetailFragment : BaseNewsFragment() { } private fun showRecyclerView(realmNewsList: List?) { - val adapterNews = activity?.let { - realmNewsList?.let { it1 -> - AdapterNews(it, it1.toMutableList(), user, null) - } - } + val adapterNews = activity?.let { realmNewsList?.let { it1 -> + AdapterNews(it, it1.toMutableList(), user, null) + } } adapterNews?.setmRealm(mRealm) adapterNews?.setListener(this) rvDiscussion.adapter = adapterNews llRv.visibility = View.VISIBLE } - private fun setTabListener( - users: List, - courses: RealmResults, - reqUsers: List - ) { + private fun setTabListener(users: List, courses: RealmResults, reqUsers: List) { tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener { override fun onTabSelected(tab: TabLayout.Tab) { when (tab.position) { @@ -212,24 +189,8 @@ class MyTeamsDetailFragment : BaseNewsFragment() { llRv.visibility = View.VISIBLE } - 1 -> setListContent( - tab, - String.format( - getString(R.string.joined_members_colon) + " (%s)", - users.size - ), - users - ) - - 2 -> setListContent( - tab, - String.format( - getString(R.string.requested_members_colon) + " (%s)", - reqUsers.size - ), - reqUsers - ) - + 1 -> setListContent(tab, String.format(getString(R.string.joined_members_colon) + " (%s)", users.size), users) + 2 -> setListContent(tab, String.format(getString(R.string.requested_members_colon) + " (%s)", reqUsers.size), reqUsers) 3 -> setCourseList(tab, courses) 4 -> setLibraryList(tab) } @@ -242,19 +203,17 @@ class MyTeamsDetailFragment : BaseNewsFragment() { private fun setLibraryList(tab: TabLayout.Tab) { hideRv(tab, String.format(getString(R.string.resources_colon) + " (%s)", libraries?.size)) - listContent.adapter = - ArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, libraries!!) - listContent.onItemClickListener = - AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, i: Int, _: Long -> - if (homeItemClickListener != null) { - val f = ResourceDetailFragment() - val b = Bundle() - b.putString("libraryId", libraries!![i]?.id) - b.putString("openFrom", team?.teamType + "-" + team?.title) - f.arguments = b - homeItemClickListener?.openCallFragment(f) - } + listContent.adapter = ArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, libraries!!) + listContent.onItemClickListener = AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, i: Int, _: Long -> + if (homeItemClickListener != null) { + val f = ResourceDetailFragment() + val b = Bundle() + b.putString("libraryId", libraries!![i]?.id) + b.putString("openFrom", team?.teamType + "-" + team?.title) + f.arguments = b + homeItemClickListener?.openCallFragment(f) } + } } private fun setCourseList(tab: TabLayout.Tab, courses: RealmResults) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 725e0a45d1..7e61c2257d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -178,7 +178,6 @@ Showing reply of: Open Date mySurvey - %s (%d %s) @@ -1047,6 +1046,7 @@ checking server app is below allowed version. please update the app to the latest version. add a note (optional) + %s (%d %s) %s\'s Planet submissions not available no previous chats