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

#2227 moved activity_main.xml to custom

Browse Source
This commit is contained in:
HissPirat 2020-07-28 12:25:44 +02:00
parent 7abcbc858e
commit 992ac9a76b
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
View File

@ -19,7 +19,6 @@ package org.kiwix.kiwixmobile.core.main
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle
import android.view.ActionMode import android.view.ActionMode
import android.view.MenuItem import android.view.MenuItem
import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.ActionBarDrawerToggle
@ -47,11 +46,6 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
@Inject lateinit var alertDialogShower: AlertDialogShower @Inject lateinit var alertDialogShower: AlertDialogShower
protected lateinit var drawerToggle: ActionBarDrawerToggle protected lateinit var drawerToggle: ActionBarDrawerToggle
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
supportFragmentManager.fragments.forEach { it.onActivityResult(requestCode, resultCode, data) } supportFragmentManager.fragments.forEach { it.onActivityResult(requestCode, resultCode, data) }

20
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
View File

@ -21,24 +21,20 @@ package org.kiwix.kiwixmobile.custom.main
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.drawerlayout.widget.DrawerLayout import kotlinx.android.synthetic.main.activity_main.custom_drawer_container
import com.google.android.material.navigation.NavigationView import kotlinx.android.synthetic.main.activity_main.drawer_nav_view
import org.kiwix.kiwixmobile.core.di.components.CoreComponent import org.kiwix.kiwixmobile.core.di.components.CoreComponent
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.intent import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.intent
import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.core.utils.REQUEST_PREFERENCES import org.kiwix.kiwixmobile.core.utils.REQUEST_PREFERENCES
import org.kiwix.kiwixmobile.custom.R import org.kiwix.kiwixmobile.custom.R
import org.kiwix.kiwixmobile.custom.customActivityComponent import org.kiwix.kiwixmobile.custom.customActivityComponent
import org.kiwix.kiwixmobile.custom.lazyView
import org.kiwix.kiwixmobile.custom.settings.CustomSettingsActivity import org.kiwix.kiwixmobile.custom.settings.CustomSettingsActivity
const val REQUEST_READ_FOR_OBB = 5002 const val REQUEST_READ_FOR_OBB = 5002
class CustomMainActivity : CoreMainActivity() { class CustomMainActivity : CoreMainActivity() {
private val drawerNavView: NavigationView by lazyView(R.id.drawer_nav_view)
private val drawerContainer: DrawerLayout by lazyView(R.id.custom_drawer_container)
override fun injection(coreComponent: CoreComponent) { override fun injection(coreComponent: CoreComponent) {
customActivityComponent.inject(this) customActivityComponent.inject(this)
} }
@ -58,23 +54,23 @@ class CustomMainActivity : CoreMainActivity() {
drawerToggle = drawerToggle =
ActionBarDrawerToggle( ActionBarDrawerToggle(
this, this,
drawerContainer, custom_drawer_container,
toolbar, toolbar,
R.string.open, R.string.open,
R.string.close_all_tabs R.string.close_all_tabs
) )
drawerContainer.addDrawerListener(drawerToggle) custom_drawer_container.addDrawerListener(drawerToggle)
drawerToggle.syncState() drawerToggle.syncState()
drawerNavView.setNavigationItemSelectedListener(this) drawer_nav_view.setNavigationItemSelectedListener(this)
drawerNavView.menu.findItem(R.id.menu_host_books) drawer_nav_view.menu.findItem(R.id.menu_host_books)
.isVisible = false .isVisible = false
} }
override fun navigationDrawerIsOpen(): Boolean = override fun navigationDrawerIsOpen(): Boolean =
drawerContainer.isDrawerOpen(drawerNavView) custom_drawer_container.isDrawerOpen(drawer_nav_view)
override fun closeNavigationDrawer() { override fun closeNavigationDrawer() {
drawerContainer.closeDrawer(drawerNavView) custom_drawer_container.closeDrawer(drawer_nav_view)
} }
override fun openSettingsActivity() { override fun openSettingsActivity() {

0
core/src/main/res/layout/activity_main.xml → custom/src/main/res/layout/activity_main.xml
View File