diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsView.kt b/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsView.kt index ac659e654..944da54e2 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsView.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsView.kt @@ -1,27 +1,26 @@ package org.koitharu.kotatsu.ui.details import moxy.MvpView -import moxy.viewstate.strategy.AddToEndSingleStrategy -import moxy.viewstate.strategy.OneExecutionStateStrategy -import moxy.viewstate.strategy.StateStrategyType +import moxy.viewstate.strategy.alias.AddToEndSingle +import moxy.viewstate.strategy.alias.OneExecution import org.koitharu.kotatsu.core.model.FavouriteCategory import org.koitharu.kotatsu.core.model.Manga import org.koitharu.kotatsu.core.model.MangaHistory interface MangaDetailsView : MvpView { - @StateStrategyType(AddToEndSingleStrategy::class) + @AddToEndSingle fun onMangaUpdated(manga: Manga) - @StateStrategyType(AddToEndSingleStrategy::class) + @AddToEndSingle fun onLoadingStateChanged(isLoading: Boolean) - @StateStrategyType(OneExecutionStateStrategy::class) + @OneExecution fun onError(e: Exception) - @StateStrategyType(AddToEndSingleStrategy::class) + @AddToEndSingle fun onHistoryChanged(history: MangaHistory?) - @StateStrategyType(AddToEndSingleStrategy::class) + @AddToEndSingle fun onFavouriteChanged(categories: List) } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt b/app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt index 7bbc298bd..42a5b744a 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt @@ -46,8 +46,6 @@ class ListModeSelectDialog : AlertDialogFragment(R.layout.dialog_list_mode), Vie private const val TAG = "ListModeSelectDialog" - fun show(fm: FragmentManager) = ListModeSelectDialog().show(fm, - TAG - ) + fun show(fm: FragmentManager) = ListModeSelectDialog().show(fm, TAG) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt index 2ebb0e951..99b3ed97c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt @@ -95,6 +95,10 @@ class ReaderActivity : BaseFullscreenActivity(), ReaderView, ChaptersDialog.OnCh } override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) { + R.id.action_settings -> { + ReaderConfigDialog.show(supportFragmentManager) + true + } R.id.action_chapters -> { ChaptersDialog.show( supportFragmentManager, diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderConfigDialog.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderConfigDialog.kt new file mode 100644 index 000000000..2d9a3b894 --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderConfigDialog.kt @@ -0,0 +1,36 @@ +package org.koitharu.kotatsu.ui.reader + +import android.os.Bundle +import android.view.View +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.FragmentManager +import org.koitharu.kotatsu.R +import org.koitharu.kotatsu.ui.common.AlertDialogFragment + +class ReaderConfigDialog : AlertDialogFragment(R.layout.dialog_reader_config), + View.OnClickListener { + + override fun onBuildDialog(builder: AlertDialog.Builder) { + builder//.setTitle(R.string.list_mode) + .setCancelable(true) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + } + + override fun onClick(v: View) { + when (v.id) { + R.id.button_ok -> dismiss() + + } + } + + companion object { + + private const val TAG = "ReaderConfigDialog" + + fun show(fm: FragmentManager) = ReaderConfigDialog().show(fm, TAG) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_book_page.xml b/app/src/main/res/drawable/ic_book_page.xml new file mode 100644 index 000000000..e53b1da5c --- /dev/null +++ b/app/src/main/res/drawable/ic_book_page.xml @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_script.xml b/app/src/main/res/drawable/ic_script.xml new file mode 100644 index 000000000..b24bc7154 --- /dev/null +++ b/app/src/main/res/drawable/ic_script.xml @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_reader_config.xml b/app/src/main/res/layout/dialog_reader_config.xml new file mode 100644 index 000000000..6d29f4e19 --- /dev/null +++ b/app/src/main/res/layout/dialog_reader_config.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 06a32053f..fa91a7afe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,4 +80,6 @@ Cache B|kB|MB|GB|TB Downloading: %d%% + Standard + Webtoon \ No newline at end of file