From 992ac9a76b3b0b0d76041d2bf7b58c7afb4a9d3d Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Tue, 28 Jul 2020 12:25:44 +0200
Subject: [PATCH] #2227 moved activity_main.xml to custom

---
 .../kiwixmobile/core/main/CoreMainActivity.kt |  6 ------
 .../custom/main/CustomMainActivity.kt         | 20 ++++++++-----------
 .../src/main/res/layout/activity_main.xml     |  0
 3 files changed, 8 insertions(+), 18 deletions(-)
 rename {core => custom}/src/main/res/layout/activity_main.xml (100%)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
index a8b01c8ff..029b457d2 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
@@ -19,7 +19,6 @@ package org.kiwix.kiwixmobile.core.main
 
 import android.content.Intent
 import android.net.Uri
-import android.os.Bundle
 import android.view.ActionMode
 import android.view.MenuItem
 import androidx.appcompat.app.ActionBarDrawerToggle
@@ -47,11 +46,6 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
   @Inject lateinit var alertDialogShower: AlertDialogShower
   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?) {
     super.onActivityResult(requestCode, resultCode, data)
     supportFragmentManager.fragments.forEach { it.onActivityResult(requestCode, resultCode, data) }
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
index 9b0591e5d..7609191c3 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
@@ -21,24 +21,20 @@ package org.kiwix.kiwixmobile.custom.main
 import android.os.Bundle
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.widget.Toolbar
-import androidx.drawerlayout.widget.DrawerLayout
-import com.google.android.material.navigation.NavigationView
+import kotlinx.android.synthetic.main.activity_main.custom_drawer_container
+import kotlinx.android.synthetic.main.activity_main.drawer_nav_view
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.intent
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 import org.kiwix.kiwixmobile.core.utils.REQUEST_PREFERENCES
 import org.kiwix.kiwixmobile.custom.R
 import org.kiwix.kiwixmobile.custom.customActivityComponent
-import org.kiwix.kiwixmobile.custom.lazyView
 import org.kiwix.kiwixmobile.custom.settings.CustomSettingsActivity
 
 const val REQUEST_READ_FOR_OBB = 5002
 
 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) {
     customActivityComponent.inject(this)
   }
@@ -58,23 +54,23 @@ class CustomMainActivity : CoreMainActivity() {
     drawerToggle =
       ActionBarDrawerToggle(
         this,
-        drawerContainer,
+        custom_drawer_container,
         toolbar,
         R.string.open,
         R.string.close_all_tabs
       )
-    drawerContainer.addDrawerListener(drawerToggle)
+    custom_drawer_container.addDrawerListener(drawerToggle)
     drawerToggle.syncState()
-    drawerNavView.setNavigationItemSelectedListener(this)
-    drawerNavView.menu.findItem(R.id.menu_host_books)
+    drawer_nav_view.setNavigationItemSelectedListener(this)
+    drawer_nav_view.menu.findItem(R.id.menu_host_books)
       .isVisible = false
   }
 
   override fun navigationDrawerIsOpen(): Boolean =
-    drawerContainer.isDrawerOpen(drawerNavView)
+    custom_drawer_container.isDrawerOpen(drawer_nav_view)
 
   override fun closeNavigationDrawer() {
-    drawerContainer.closeDrawer(drawerNavView)
+    custom_drawer_container.closeDrawer(drawer_nav_view)
   }
 
   override fun openSettingsActivity() {
diff --git a/core/src/main/res/layout/activity_main.xml b/custom/src/main/res/layout/activity_main.xml
similarity index 100%
rename from core/src/main/res/layout/activity_main.xml
rename to custom/src/main/res/layout/activity_main.xml