FEAT: don't force drawers on people

Qase · Jul 3, 2018 · db7f0ef · db7f0ef
1 parent 37758f2
commit db7f0ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/demo/src/main/java/com/qase/android/appskeletondemo/MainActivity.kt b/demo/src/main/java/com/qase/android/appskeletondemo/MainActivity.kt
@@ -8,7 +8,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import com.qase.android.appskeleton.activity.BaseActivityViewHelper
-import com.qase.android.appskeleton.activity.BaseMainActivity
+import com.qase.android.appskeleton.activity.BaseDrawerMainActivity
 import com.qase.android.appskeleton.activity.DefaultDrawerActivityViewHelper
 import com.qase.android.appskeletondemo.main.preference.SettingsFragment
 import com.qase.android.appskeletondemo.main.test.TestFragment
@@ -17,7 +17,7 @@ import com.qase.android.appskeletondemo.main.test.TestFragment3
 import com.qase.android.appskeletondemo.main.testviewmodel.TestDaggerFragment
 import com.qase.android.appskeletondemo.main.testviewmodel.TestvmFragment
 
-class MainActivity : BaseMainActivity(), NavigationView.OnNavigationItemSelectedListener {
+class MainActivity : BaseDrawerMainActivity(), NavigationView.OnNavigationItemSelectedListener {
 
     override val activityViewHelper: BaseActivityViewHelper = DefaultDrawerActivityViewHelper(this, R.menu.main, android.R.drawable.sym_def_app_icon, "Skeleton Demo", "example@quanti.cz")
 

diff --git a/skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseDrawerMainActivity.kt b/skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseDrawerMainActivity.kt
@@ -0,0 +1,15 @@
+package com.qase.android.appskeleton.activity
+
+import android.os.Bundle
+import android.support.design.widget.NavigationView
+
+abstract class BaseDrawerMainActivity : BaseMainActivity() {
+
+    open val activityViewHelper: BaseActivityViewHelper = DefaultDrawerActivityViewHelper(NavigationView.OnNavigationItemSelectedListener {false })
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(activityViewHelper.mainLayoutRes)
+        activityViewHelper.onCreate(this)
+    }
+}
diff --git a/skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseMainActivity.kt b/skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseMainActivity.kt
@@ -8,14 +8,10 @@ import com.qase.android.appskeleton.BaseApp
 
 abstract class BaseMainActivity : AppCompatActivity() {
 
-    open val activityViewHelper: BaseActivityViewHelper = DefaultDrawerActivityViewHelper(NavigationView.OnNavigationItemSelectedListener {false })
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(activityViewHelper.mainLayoutRes)
         BaseApp.instance.baseActivity = this
         BaseApp.instance.fragmentManager.androidFragmentManager = supportFragmentManager
-        activityViewHelper.onCreate(this)
     }
 
     override fun onBackPressed() {