Make settings more modular

app/src/main/AndroidManifest.xml

@@ -8,14 +8,14 @@
   <!--<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />-->
 
   <application
-    android:name="de.kuschku.quasseldroid.QuasselDroid"
+    android:name=".QuasselDroid"
     android:allowBackup="true"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
     android:supportsRtl="true"
     android:theme="@style/Theme.SplashTheme">
     <activity
-      android:name="de.kuschku.quasseldroid.ui.chat.ChatActivity"
+      android:name=".ui.chat.ChatActivity"
       android:exported="true"
       android:label="@string/app_name"
       android:launchMode="singleTask"
@@ -34,31 +34,32 @@
     </activity>
 
     <activity
-      android:name="de.kuschku.quasseldroid.ui.setup.accounts.setup.AccountSetupActivity"
+      android:name=".ui.setup.accounts.setup.AccountSetupActivity"
       android:exported="false"
       android:label="@string/app_name"
-      android:parentActivityName="de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity"
+      android:parentActivityName=".ui.setup.accounts.selection.AccountSelectionActivity"
       android:windowSoftInputMode="adjustResize" />
     <activity
-      android:name="de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditActivity"
+      android:name=".ui.setup.accounts.edit.AccountEditActivity"
       android:exported="false"
       android:label="@string/app_name"
-      android:parentActivityName="de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity"
+      android:parentActivityName=".ui.setup.accounts.selection.AccountSelectionActivity"
       android:windowSoftInputMode="adjustResize" />
     <activity
-      android:name="de.kuschku.quasseldroid.ui.settings.SettingsActivity"
+      android:name=".ui.settings.app.AppSettingsActivity"
       android:exported="false"
       android:label="@string/label_settings"
-      android:parentActivityName="de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity"
+      android:parentActivityName=".ui.chat.ChatActivity"
       android:windowSoftInputMode="adjustResize" />
     <activity
-      android:name="de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity"
+      android:name=".ui.setup.accounts.selection.AccountSelectionActivity"
       android:exported="false"
       android:label="@string/app_name"
+      android:parentActivityName=".ui.chat.ChatActivity"
       android:windowSoftInputMode="adjustResize" />
 
     <service
-      android:name="de.kuschku.quasseldroid.service.QuasselService"
+      android:name=".service.QuasselService"
       android:description="@string/connection_service_description"
       android:exported="false"
       android:label="@string/connection_service_title" />

app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt

@@ -6,8 +6,8 @@ import de.kuschku.quasseldroid.service.QuasselService
 import de.kuschku.quasseldroid.ui.chat.ChatActivity
 import de.kuschku.quasseldroid.ui.chat.ChatActivityModule
 import de.kuschku.quasseldroid.ui.chat.ChatFragmentProvider
-import de.kuschku.quasseldroid.ui.settings.SettingsActivity
-import de.kuschku.quasseldroid.ui.settings.SettingsFragmentProvider
+import de.kuschku.quasseldroid.ui.settings.app.AppSettingsActivity
+import de.kuschku.quasseldroid.ui.settings.app.AppSettingsFragmentProvider
 import de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditActivity
 import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity
 import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionFragmentProvider
@@ -19,8 +19,8 @@ abstract class ActivityModule {
   @ContributesAndroidInjector(modules = [ChatActivityModule::class, ChatFragmentProvider::class])
   abstract fun bindChatActivity(): ChatActivity
 
-  @ContributesAndroidInjector(modules = [SettingsFragmentProvider::class])
-  abstract fun bindSettingsActivity(): SettingsActivity
+  @ContributesAndroidInjector(modules = [AppSettingsFragmentProvider::class])
+  abstract fun bindAppSettingsActivity(): AppSettingsActivity
 
   @ContributesAndroidInjector(modules = [AccountSetupFragmentProvider::class])
   abstract fun bindAccountSetupActivity(): AccountSetupActivity

app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt

@@ -37,7 +37,7 @@ import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.persistence.QuasselDatabase
 import de.kuschku.quasseldroid.ui.chat.input.Editor
 import de.kuschku.quasseldroid.ui.chat.input.MessageHistoryAdapter
-import de.kuschku.quasseldroid.ui.settings.SettingsActivity
+import de.kuschku.quasseldroid.ui.settings.app.AppSettingsActivity
 import de.kuschku.quasseldroid.util.helper.editCommit
 import de.kuschku.quasseldroid.util.helper.invoke
 import de.kuschku.quasseldroid.util.helper.toLiveData
@@ -346,7 +346,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
       true
     }
     R.id.settings        -> {
-      startActivity(Intent(applicationContext, SettingsActivity::class.java))
+      startActivity(Intent(applicationContext, AppSettingsActivity::class.java))
       true
     }
     R.id.disconnect      -> {

app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsActivity.kt

 package de.kuschku.quasseldroid.ui.settings
 
 import android.os.Bundle
+import android.support.v4.app.Fragment
 import android.support.v7.widget.Toolbar
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
 
-class SettingsActivity : ServiceBoundActivity() {
+abstract class SettingsActivity : ServiceBoundActivity() {
+  protected abstract val fragment: Fragment
+
   @BindView(R.id.toolbar)
   lateinit var toolbar: Toolbar
 
@@ -18,5 +21,9 @@ class SettingsActivity : ServiceBoundActivity() {
 
     setSupportActionBar(toolbar)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+    val transaction = supportFragmentManager.beginTransaction()
+    transaction.add(R.id.fragment_container, fragment)
+    transaction.commit()
   }
 }
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/settings/app/AppSettingsActivity.kt

+package de.kuschku.quasseldroid.ui.settings.app
+
+import de.kuschku.quasseldroid.ui.settings.SettingsActivity
+
+class AppSettingsActivity : SettingsActivity() {
+  override val fragment = AppSettingsFragment()
+}
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsFragment.kt → app/src/main/java/de/kuschku/quasseldroid/ui/settings/app/AppSettingsFragment.kt

-package de.kuschku.quasseldroid.ui.settings
+package de.kuschku.quasseldroid.ui.settings.app
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -11,7 +11,7 @@ import de.kuschku.quasseldroid.settings.Settings
 import de.kuschku.quasseldroid.util.backport.DaggerPreferenceFragmentCompat
 import javax.inject.Inject
 
-class SettingsFragment : DaggerPreferenceFragmentCompat(),
+class AppSettingsFragment : DaggerPreferenceFragmentCompat(),
                             SharedPreferences.OnSharedPreferenceChangeListener {
   @Inject
   lateinit var appearanceSettings: AppearanceSettings

app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsFragmentProvider.kt → app/src/main/java/de/kuschku/quasseldroid/ui/settings/app/AppSettingsFragmentProvider.kt

-package de.kuschku.quasseldroid.ui.settings
+package de.kuschku.quasseldroid.ui.settings.app
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module
-abstract class SettingsFragmentProvider {
+abstract class AppSettingsFragmentProvider {
   @ContributesAndroidInjector
-  abstract fun bindSettingsFragment(): SettingsFragment
+  abstract fun bindAppSettingsFragment(): AppSettingsFragment
 }
\ No newline at end of file

app/src/main/res/layout-sw720dp/activity_settings.xml

 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="#eeeeee"
@@ -41,12 +40,10 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical">
 
-        <fragment
-          android:id="@+id/settingsFragment"
-          android:name="de.kuschku.quasseldroid.ui.settings.SettingsFragment"
+        <FrameLayout
+          android:id="@+id/fragment_container"
           android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          tools:layout="@xml/preferences" />
+          android:layout_height="wrap_content" />
       </android.support.v4.widget.NestedScrollView>
     </android.support.v7.widget.CardView>
 

app/src/main/res/layout/activity_settings.xml

 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:fitsSystemWindows="true">
 
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
@@ -27,12 +25,10 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <fragment
-      android:id="@+id/settingsFragment"
-      android:name="de.kuschku.quasseldroid.ui.settings.SettingsFragment"
+    <FrameLayout
+      android:id="@+id/fragment_container"
       android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      tools:layout="@xml/preferences" />
+      android:layout_height="fill_parent" />
   </LinearLayout>
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file