Edit favourite category activity
parent
345a1379ae
commit
4771882f50
@ -0,0 +1,147 @@
|
|||||||
|
package org.koitharu.kotatsu.favourites.ui.categories.edit
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.Menu
|
||||||
|
import android.view.MenuItem
|
||||||
|
import android.view.View
|
||||||
|
import android.widget.AdapterView
|
||||||
|
import android.widget.ArrayAdapter
|
||||||
|
import androidx.core.graphics.Insets
|
||||||
|
import androidx.core.view.isVisible
|
||||||
|
import androidx.core.view.updatePadding
|
||||||
|
import org.koin.androidx.viewmodel.ext.android.viewModel
|
||||||
|
import org.koin.core.parameter.parametersOf
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.base.ui.BaseActivity
|
||||||
|
import org.koitharu.kotatsu.core.model.FavouriteCategory
|
||||||
|
import org.koitharu.kotatsu.core.ui.titleRes
|
||||||
|
import org.koitharu.kotatsu.databinding.ActivityCategoryEditBinding
|
||||||
|
import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
|
||||||
|
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||||
|
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
|
||||||
|
|
||||||
|
class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>(), AdapterView.OnItemClickListener {
|
||||||
|
|
||||||
|
private val viewModel by viewModel<FavouritesCategoryEditViewModel> {
|
||||||
|
parametersOf(intent.getLongExtra(EXTRA_ID, NO_ID))
|
||||||
|
}
|
||||||
|
private var selectedSortOrder: SortOrder? = null
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContentView(ActivityCategoryEditBinding.inflate(layoutInflater))
|
||||||
|
supportActionBar?.run {
|
||||||
|
setDisplayHomeAsUpEnabled(true)
|
||||||
|
setHomeAsUpIndicator(com.google.android.material.R.drawable.abc_ic_clear_material)
|
||||||
|
}
|
||||||
|
initSortSpinner()
|
||||||
|
|
||||||
|
viewModel.onSaved.observe(this) { finishAfterTransition() }
|
||||||
|
viewModel.category.observe(this, ::onCategoryChanged)
|
||||||
|
viewModel.isLoading.observe(this, ::onLoadingStateChanged)
|
||||||
|
viewModel.onError.observe(this, ::onError)
|
||||||
|
viewModel.isTrackerEnabled.observe(this) {
|
||||||
|
binding.switchTracker.isVisible = it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onSaveInstanceState(outState: Bundle) {
|
||||||
|
super.onSaveInstanceState(outState)
|
||||||
|
outState.putSerializable(KEY_SORT_ORDER, selectedSortOrder)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
|
||||||
|
super.onRestoreInstanceState(savedInstanceState)
|
||||||
|
val order = savedInstanceState.getSerializable(KEY_SORT_ORDER)
|
||||||
|
if (order != null && order is SortOrder) {
|
||||||
|
selectedSortOrder = order
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateOptionsMenu(menu: Menu): Boolean {
|
||||||
|
menuInflater.inflate(R.menu.opt_config, menu)
|
||||||
|
menu.findItem(R.id.action_done)?.setTitle(R.string.save)
|
||||||
|
return super.onCreateOptionsMenu(menu)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
|
||||||
|
R.id.action_done -> {
|
||||||
|
viewModel.save(
|
||||||
|
title = binding.editName.text?.toString().orEmpty(),
|
||||||
|
sortOrder = getSelectedSortOrder(),
|
||||||
|
isTrackerEnabled = binding.switchTracker.isChecked,
|
||||||
|
)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
else -> super.onOptionsItemSelected(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onWindowInsetsChanged(insets: Insets) {
|
||||||
|
binding.scrollView.updatePadding(
|
||||||
|
left = insets.left,
|
||||||
|
right = insets.right,
|
||||||
|
bottom = insets.bottom,
|
||||||
|
)
|
||||||
|
binding.toolbar.updatePadding(
|
||||||
|
top = insets.top,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
|
||||||
|
selectedSortOrder = CategoriesActivity.SORT_ORDERS.getOrNull(position)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onCategoryChanged(category: FavouriteCategory?) {
|
||||||
|
setTitle(if (category == null) R.string.create_category else R.string.edit_category)
|
||||||
|
if (selectedSortOrder != null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
binding.editName.setText(category?.title)
|
||||||
|
selectedSortOrder = category?.order
|
||||||
|
val sortText = getString((category?.order ?: SortOrder.NEWEST).titleRes)
|
||||||
|
binding.editSort.setText(sortText, false)
|
||||||
|
binding.switchTracker.isChecked = category?.isTrackingEnabled ?: true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onError(e: Throwable) {
|
||||||
|
binding.textViewError.text = e.getDisplayMessage(resources)
|
||||||
|
binding.textViewError.isVisible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onLoadingStateChanged(isLoading: Boolean) {
|
||||||
|
binding.editSort.isEnabled = !isLoading
|
||||||
|
binding.editName.isEnabled = !isLoading
|
||||||
|
binding.switchTracker.isEnabled = !isLoading
|
||||||
|
if (isLoading) {
|
||||||
|
binding.textViewError.isVisible = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun initSortSpinner() {
|
||||||
|
val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
|
||||||
|
val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, entries)
|
||||||
|
binding.editSort.setAdapter(adapter)
|
||||||
|
binding.editSort.onItemClickListener = this
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getSelectedSortOrder(): SortOrder {
|
||||||
|
selectedSortOrder?.let { return it }
|
||||||
|
val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
|
||||||
|
val index = entries.indexOf(binding.editSort.text.toString())
|
||||||
|
return CategoriesActivity.SORT_ORDERS.getOrNull(index) ?: SortOrder.NEWEST
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
private const val EXTRA_ID = "id"
|
||||||
|
private const val KEY_SORT_ORDER = "sort"
|
||||||
|
private const val NO_ID = -1L
|
||||||
|
|
||||||
|
fun newIntent(context: Context, id: Long = NO_ID): Intent {
|
||||||
|
return Intent(context, FavouritesCategoryEditActivity::class.java)
|
||||||
|
.putExtra(EXTRA_ID, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
package org.koitharu.kotatsu.favourites.ui.categories.edit
|
||||||
|
|
||||||
|
import androidx.lifecycle.MutableLiveData
|
||||||
|
import androidx.lifecycle.liveData
|
||||||
|
import androidx.lifecycle.viewModelScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import org.koitharu.kotatsu.base.ui.BaseViewModel
|
||||||
|
import org.koitharu.kotatsu.core.model.FavouriteCategory
|
||||||
|
import org.koitharu.kotatsu.core.prefs.AppSettings
|
||||||
|
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
|
||||||
|
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||||
|
import org.koitharu.kotatsu.utils.SingleLiveEvent
|
||||||
|
|
||||||
|
private const val NO_ID = -1L
|
||||||
|
|
||||||
|
class FavouritesCategoryEditViewModel(
|
||||||
|
private val categoryId: Long,
|
||||||
|
private val repository: FavouritesRepository,
|
||||||
|
private val settings: AppSettings,
|
||||||
|
) : BaseViewModel() {
|
||||||
|
|
||||||
|
val onSaved = SingleLiveEvent<Unit>()
|
||||||
|
val category = MutableLiveData<FavouriteCategory?>()
|
||||||
|
|
||||||
|
val isTrackerEnabled = liveData(viewModelScope.coroutineContext + Dispatchers.Default) {
|
||||||
|
emit(settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources)
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
launchLoadingJob {
|
||||||
|
category.value = if (categoryId != NO_ID) {
|
||||||
|
repository.getCategory(categoryId)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun save(
|
||||||
|
title: String,
|
||||||
|
sortOrder: SortOrder,
|
||||||
|
isTrackerEnabled: Boolean,
|
||||||
|
) {
|
||||||
|
launchLoadingJob {
|
||||||
|
if (categoryId == NO_ID) {
|
||||||
|
repository.createCategory(title, sortOrder, isTrackerEnabled)
|
||||||
|
} else {
|
||||||
|
repository.updateCategory(categoryId, title, sortOrder, isTrackerEnabled)
|
||||||
|
}
|
||||||
|
onSaved.call(Unit)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
<?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"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:id="@+id/scrollView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:clipToPadding="false"
|
||||||
|
android:overScrollMode="ifContentScrolls">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
|
android:id="@+id/layout_name"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
|
android:id="@+id/edit_name"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/name" />
|
||||||
|
|
||||||
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
|
android:id="@+id/layout_sort"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
app:endIconMode="dropdown_menu">
|
||||||
|
|
||||||
|
<AutoCompleteTextView
|
||||||
|
android:id="@+id/edit_sort"
|
||||||
|
style="?editTextStyle"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/sort_order"
|
||||||
|
android:inputType="none" />
|
||||||
|
|
||||||
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
|
android:id="@+id/switch_tracker"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:text="@string/check_for_new_chapters"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_error"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:textColor="?colorError"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:text="@tools:sample/lorem[4]"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_order"
|
||||||
|
android:orderInCategory="30"
|
||||||
|
android:title="@string/sort_order">
|
||||||
|
|
||||||
|
<menu>
|
||||||
|
|
||||||
|
<group
|
||||||
|
android:id="@+id/group_order"
|
||||||
|
android:checkableBehavior="single" />
|
||||||
|
</menu>
|
||||||
|
|
||||||
|
</item>
|
||||||
|
|
||||||
|
</menu>
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<style name="Theme.Kotatsu.DialogWhenLarge">
|
||||||
|
<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
|
||||||
|
<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
|
||||||
|
<item name="windowFixedHeightMajor">@dimen/abc_dialog_fixed_height_major</item>
|
||||||
|
<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
|
||||||
|
<item name="android:windowElevation">@dimen/abc_floating_window_z</item>
|
||||||
|
<item name="android:colorBackground">?attr/colorBackgroundFloating</item>
|
||||||
|
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||||
|
|
||||||
|
<item name="android:windowFrame">@null</item>
|
||||||
|
<item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
|
||||||
|
<item name="android:windowTitleBackgroundStyle">@style/Base.DialogWindowTitleBackground.AppCompat</item>
|
||||||
|
<item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
|
||||||
|
<item name="android:windowIsFloating">true</item>
|
||||||
|
<item name="android:backgroundDimEnabled">true</item>
|
||||||
|
<item name="android:windowContentOverlay">@null</item>
|
||||||
|
<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
|
||||||
|
<item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
|
||||||
|
|
||||||
|
<item name="windowActionBar">false</item>
|
||||||
|
<item name="windowActionModeOverlay">true</item>
|
||||||
|
|
||||||
|
<item name="listPreferredItemPaddingLeft">24dip</item>
|
||||||
|
<item name="listPreferredItemPaddingRight">24dip</item>
|
||||||
|
|
||||||
|
<item name="android:listDivider">@null</item>
|
||||||
|
|
||||||
|
<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
|
||||||
|
<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
|
||||||
|
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
Loading…
Reference in New Issue