Skip to content

Navigation bar now visible in details page (#6316) #6342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shraavv wants to merge 1 commit into from
Closed

Navigation bar now visible in details page (#6316) #6342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ import java.util.regex.Matcher
import java.util.regex.Pattern
import javax.inject.Inject
import javax.inject.Named
import fr.free.nrw.commons.navtab.NavTabLayout
import fr.free.nrw.commons.contributions.MainActivity
import fr.free.nrw.commons.navtab.NavTab

class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.Callback {
private var editable: Boolean = false
Expand Down Expand Up @@ -246,6 +249,8 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
initialListTop = binding.mediaDetailScrollView.scrollY
}

private lateinit var navTabLayout: NavTabLayout

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
Expand Down Expand Up @@ -418,6 +423,40 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
return view
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

// Hide MainActivity nav tabs when this fragment is open
(requireActivity() as MainActivity).hideTabs()

// Initialize NavTabLayout
navTabLayout = binding.fragmentMainNavTabLayout

navTabLayout.setOnNavigationItemSelectedListener { item ->
val navTab = NavTab.of(item.order)
when (navTab) {
NavTab.CONTRIBUTIONS -> {
(requireActivity() as MainActivity).setSelectedItemId(NavTab.CONTRIBUTIONS.code())
true
}
NavTab.NEARBY -> {
(requireActivity() as MainActivity).setSelectedItemId(NavTab.NEARBY.code())
true
}
NavTab.EXPLORE -> {
(requireActivity() as MainActivity).setSelectedItemId(NavTab.EXPLORE.code())
true
}
NavTab.MORE -> {
(requireActivity() as MainActivity).setSelectedItemId(NavTab.MORE.code())
true
}
else -> false
}
}

}

fun launchZoomActivity(view: View) {
val hasPermission: Boolean = hasPermission(requireActivity(), PERMISSIONS_STORAGE)
if (hasPermission) {
Expand Down Expand Up @@ -2263,4 +2302,4 @@ fun FileUsagesContainer(
}

}
}
}
14 changes: 13 additions & 1 deletion app/src/main/res/layout/fragment_media_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
android:id="@+id/mediaDetailScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="?attr/actionBarSize"
android:background="@android:color/transparent"
android:cacheColorHint="@android:color/transparent"
android:fillViewport="true">
Expand Down Expand Up @@ -512,4 +513,15 @@
</LinearLayout>
</ScrollView>

</FrameLayout>
<fr.free.nrw.commons.navtab.NavTabLayout
android:id="@+id/fragment_main_nav_tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="?attr/nav_bar_background"
android:elevation="6dp"
app:itemIconTint="?attr/nav_tab_item_color_state"
app:itemTextColor="?attr/navbar_item_text_color" />

</FrameLayout>
Loading