Settings

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.koitharu.kotatsu">
 
 	<uses-permission android:name="android.permission.INTERNET" />
@@ -34,14 +35,17 @@
 				android:name="android.app.searchable"
 				android:resource="@xml/search" />
 		</activity>
+		<activity
+			android:name=".ui.settings.SettingsActivity"
+			android:label="@string/settings" />
 
 		<service android:name=".ui.download.DownloadService" />
 
 		<provider
 			android:name="androidx.core.content.FileProvider"
 			android:authorities="${applicationId}.files"
-			android:grantUriPermissions="true"
+			android:exported="false"
-			android:exported="false">
+			android:grantUriPermissions="true">
 			<meta-data
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />

app/src/main/java/org/koitharu/kotatsu/ui/common/BasePreferenceFragment.kt

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.ui.common
+
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
+	PreferenceFragmentCompat(), KoinComponent {
+
+	protected val settings by inject<AppSettings>()
+
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		activity?.setTitle(titleId)
+	}
+
+	fun <T : Preference> findPreference(@StringRes keyId: Int): T? =
+		findPreference(getString(keyId))
+
+}

app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.ui.main.list.favourites.FavouritesListFragment
 import org.koitharu.kotatsu.ui.main.list.history.HistoryListFragment
 import org.koitharu.kotatsu.ui.main.list.local.LocalListFragment
 import org.koitharu.kotatsu.ui.main.list.remote.RemoteListFragment
+import org.koitharu.kotatsu.ui.settings.SettingsActivity
 import org.koitharu.kotatsu.utils.SearchHelper
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
@@ -70,6 +71,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 			R.id.nav_history -> setPrimaryFragment(HistoryListFragment.newInstance())
 			R.id.nav_favourites -> setPrimaryFragment(FavouritesListFragment.newInstance())
 			R.id.nav_local_storage -> setPrimaryFragment(LocalListFragment.newInstance())
+			R.id.nav_action_settings -> {
+				startActivity(SettingsActivity.newIntent(this))
+				return true
+			}
 			else -> return false
 		}
 		drawer.closeDrawers()

app/src/main/java/org/koitharu/kotatsu/ui/settings/AppearanceSettingsFragment.kt

@@ -0,0 +1,58 @@
+package org.koitharu.kotatsu.ui.settings
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import androidx.collection.arrayMapOf
+import androidx.preference.Preference
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.ListMode
+import org.koitharu.kotatsu.ui.common.BasePreferenceFragment
+import org.koitharu.kotatsu.ui.main.list.ListModeSelectDialog
+
+class AppearanceSettingsFragment : BasePreferenceFragment(R.string.appearance),
+	SharedPreferences.OnSharedPreferenceChangeListener {
+
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+		addPreferencesFromResource(R.xml.pref_appearance)
+
+		findPreference<Preference>(R.string.key_list_mode)?.summary =
+			listModes[settings.listMode]?.let(::getString)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		settings.subscribe(this)
+	}
+
+	override fun onDestroyView() {
+		settings.unsubscribe(this)
+		super.onDestroyView()
+	}
+
+	override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+		return when (preference?.key) {
+			getString(R.string.key_list_mode) -> {
+				ListModeSelectDialog.show(childFragmentManager)
+				true
+			}
+			else -> super.onPreferenceTreeClick(preference)
+		}
+	}
+
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+		when (key) {
+			getString(R.string.key_list_mode) -> findPreference<Preference>(R.string.key_list_mode)?.summary =
+				listModes[settings.listMode]?.let(::getString)
+		}
+	}
+
+	private companion object {
+
+		val listModes = arrayMapOf(
+			ListMode.DETAILED_LIST to R.string.detailed_list,
+			ListMode.GRID to R.string.grid,
+			ListMode.LIST to R.string.list
+		)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/ui/settings/SettingsActivity.kt

@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.ui.settings
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.ui.common.BaseActivity
+
+class SettingsActivity : BaseActivity() {
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_settings)
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+		if (supportFragmentManager.findFragmentById(R.id.container) == null) {
+			supportFragmentManager.beginTransaction()
+				.replace(R.id.container, SettingsHeadersFragment())
+				.commit()
+		}
+	}
+
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, SettingsActivity::class.java)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/ui/settings/SettingsHeadersFragment.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.ui.settings
+
+import android.os.Bundle
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.ui.common.BasePreferenceFragment
+
+class SettingsHeadersFragment : BasePreferenceFragment(R.string.settings) {
+
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+		addPreferencesFromResource(R.xml.pref_headers)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/utils/ext/PreferenceExt.kt

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.utils.ext
+
+import androidx.preference.EditTextPreference
+import androidx.preference.ListPreference
+
+fun ListPreference.bindSummary(listener: (String) -> Boolean = { true }) {
+	summary = entries.getOrNull(findIndexOfValue(value))
+	this.setOnPreferenceChangeListener { preference, newValue ->
+		newValue as String
+		preference as ListPreference
+		val res = listener(newValue)
+		if (res) {
+			preference.summary = preference.entries.getOrNull(preference.findIndexOfValue(newValue))
+		}
+		res
+	}
+}
+
+fun EditTextPreference.bindSummary(
+	formatter: (String) -> String = { it },
+	listener: (String) -> Boolean = { true }
+) {
+	summary = formatter(text)
+	this.setOnPreferenceChangeListener { preference, newValue ->
+		newValue as String
+		preference as EditTextPreference
+		val res = listener(newValue)
+		if (res) {
+			preference.summary = formatter(newValue)
+		}
+		res
+	}
+}

app/src/main/res/drawable/ic_palette.xml

@@ -0,0 +1,23 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.12 0.05,0.23 0.13,0.33 0.41,0.47 0.64,1.06 0.64,1.67 0,1.38 -1.12,2.5 -2.5,2.5zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5 0,-0.16 -0.08,-0.28 -0.14,-0.35 -0.41,-0.46 -0.63,-1.05 -0.63,-1.65 0,-1.38 1.12,-2.5 2.5,-2.5L16,15c2.21,0 4,-1.79 4,-4 0,-3.86 -3.59,-7 -8,-7z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M6.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M9.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M14.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M17.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+</vector>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@id/container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" />
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -55,4 +55,5 @@
 	<string name="sort_order">Sort order</string>
 	<string name="genre">Genre</string>
 	<string name="filter">Filter</string>
+	<string name="appearance">Appearance</string>
 </resources>

app/src/main/res/xml/pref_appearance.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<Preference
+		android:key="@string/key_list_mode"
+		android:title="@string/list_mode"
+		android:persistent="false"
+		app:iconSpaceReserved="false" />
+
+</PreferenceScreen>

app/src/main/res/xml/pref_headers.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<PreferenceScreen
+		android:fragment="org.koitharu.kotatsu.ui.settings.AppearanceSettingsFragment"
+		android:icon="@drawable/ic_palette"
+		android:title="@string/appearance" />
+
+</PreferenceScreen>