kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-09 15:27:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

#2227 moved navigation view to custom main activity and loaded in custom fragment

Browse Source
This commit is contained in:
HissPirat 2020-07-28 12:12:51 +02:00
parent 4a83d6837f
commit 7abcbc858e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
View File

@ -175,7 +175,6 @@ public abstract class CoreReaderFragment extends BaseFragment
ImageButton exitFullscreenButton; ImageButton exitFullscreenButton;
@BindView(R2.id.navigation_fragment_main_drawer_layout) @BindView(R2.id.navigation_fragment_main_drawer_layout)
protected DrawerLayout drawerLayout; protected DrawerLayout drawerLayout;
@BindView(R2.id.activity_main_nav_view)
protected NavigationView tableDrawerRightContainer; protected NavigationView tableDrawerRightContainer;
@BindView(R2.id.activity_main_content_frame) @BindView(R2.id.activity_main_content_frame)
protected FrameLayout contentFrame; protected FrameLayout contentFrame;

8
core/src/main/res/layout/activity_main.xml
View File

@ -43,4 +43,12 @@
app:headerLayout="@layout/nav_main" app:headerLayout="@layout/nav_main"
app:menu="@menu/menu_drawer_main" /> app:menu="@menu/menu_drawer_main" />
<com.google.android.material.navigation.NavigationView
android:id="@+id/activity_main_nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="24dp"
android:fitsSystemWindows="true"
app:headerLayout="@layout/drawer_right" />
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

8
core/src/main/res/layout/fragment_main.xml
View File

@ -60,12 +60,4 @@
android:visibility="invisible" /> android:visibility="invisible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.navigation.NavigationView
android:id="@+id/activity_main_nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="24dp"
android:fitsSystemWindows="true"
app:headerLayout="@layout/drawer_right" />
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

1
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
View File

@ -169,6 +169,7 @@ class CustomReaderFragment : CoreReaderFragment() {
override fun loadDrawerViews() { override fun loadDrawerViews() {
drawerLayout = requireActivity().findViewById(R.id.custom_drawer_container) drawerLayout = requireActivity().findViewById(R.id.custom_drawer_container)
tableDrawerRightContainer = requireActivity().findViewById(R.id.activity_main_nav_view)
} }
override fun createMainMenu(menu: Menu?): MainMenu { override fun createMainMenu(menu: Menu?): MainMenu {