From 1195323acd2f84bab7939b4061e6af464206b1ef Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 23 Jun 2022 14:54:30 +0300 Subject: [PATCH 01/13] Add icon to metadata --- metadata/en-US/icon.png | Bin 0 -> 24934 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 metadata/en-US/icon.png diff --git a/metadata/en-US/icon.png b/metadata/en-US/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f63e533f0297b36535f01f0a8aa6e9316aa2bf8c GIT binary patch literal 24934 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 pA0(s`aL*9}2p1gJ)=T0H{6D Date: Fri, 24 Jun 2022 12:54:48 +0300 Subject: [PATCH 02/13] Update dependencies --- app/build.gradle | 12 ++++++------ app/src/main/res/values/styles.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bf66187c7..67ad71a1c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ afterEvaluate { } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - implementation('com.github.nv95:kotatsu-parsers:8a3b6df91d') { + implementation('com.github.nv95:kotatsu-parsers:c92f89f307') { exclude group: 'org.json', module: 'json' } @@ -82,10 +82,10 @@ dependencies { implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.activity:activity-ktx:1.5.0-rc01' implementation 'androidx.fragment:fragment-ktx:1.5.0-rc01' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0-rc01' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0-rc01' - implementation 'androidx.lifecycle:lifecycle-service:2.5.0-rc01' - implementation 'androidx.lifecycle:lifecycle-process:2.5.0-rc01' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0-rc02' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0-rc02' + implementation 'androidx.lifecycle:lifecycle-service:2.5.0-rc02' + implementation 'androidx.lifecycle:lifecycle-process:2.5.0-rc02' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' @@ -95,7 +95,7 @@ dependencies { implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04' implementation 'com.google.android.material:material:1.7.0-alpha02' //noinspection LifecycleAnnotationProcessorWithJava8 - kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0-rc01' + kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0-rc02' implementation 'androidx.room:room-runtime:2.4.2' implementation 'androidx.room:room-ktx:2.4.2' diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b44b1c1e5..e2f663c0e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -133,7 +133,7 @@ ?attr/colorOnBackground - + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e2f663c0e..8951634e9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -88,9 +88,8 @@ From 03c2b5577668f4130b2b1f29402406af39b7c9a3 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 25 Jun 2022 21:10:56 +0300 Subject: [PATCH 09/13] Replace done menu item with button --- .../edit/FavouritesCategoryEditActivity.kt | 20 ++++------- .../select/FavouriteCategoriesBottomSheet.kt | 17 ++-------- .../widget/shelf/ShelfConfigActivity.kt | 34 ++++++++----------- .../main/res/layout/activity_categories.xml | 18 ++++++++-- .../res/layout/activity_category_edit.xml | 13 ++++++- .../res/layout/dialog_favorite_categories.xml | 14 ++++++-- app/src/main/res/menu/opt_config.xml | 11 ------ app/src/main/res/values/dimens.xml | 1 + 8 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 app/src/main/res/menu/opt_config.xml diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt index b38dfec26..96de7ea86 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt @@ -3,8 +3,6 @@ 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.view.ViewGroup import android.widget.AdapterView @@ -24,7 +22,8 @@ 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(), AdapterView.OnItemClickListener { +class FavouritesCategoryEditActivity : BaseActivity(), AdapterView.OnItemClickListener, + View.OnClickListener { private val viewModel by viewModel { parametersOf(intent.getLongExtra(EXTRA_ID, NO_ID)) @@ -39,6 +38,7 @@ class FavouritesCategoryEditActivity : BaseActivity setHomeAsUpIndicator(com.google.android.material.R.drawable.abc_ic_clear_material) } initSortSpinner() + binding.buttonDone.setOnClickListener(this) viewModel.onSaved.observe(this) { finishAfterTransition() } viewModel.category.observe(this, ::onCategoryChanged) @@ -62,22 +62,14 @@ class FavouritesCategoryEditActivity : BaseActivity } } - 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( + override fun onClick(v: View) { + when (v.id) { + R.id.button_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) { diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt index aa2bacbbe..f13cce9a7 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt @@ -2,11 +2,9 @@ package org.koitharu.kotatsu.favourites.ui.categories.select import android.os.Bundle import android.view.LayoutInflater -import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.Toast -import androidx.appcompat.widget.Toolbar import androidx.fragment.app.FragmentManager import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.core.parameter.parametersOf @@ -28,7 +26,7 @@ class FavouriteCategoriesBottomSheet : BaseBottomSheet(), OnListItemClickListener, CategoriesEditDelegate.CategoriesEditCallback, - Toolbar.OnMenuItemClickListener, View.OnClickListener { + View.OnClickListener { private val viewModel by viewModel { parametersOf(requireNotNull(arguments?.getParcelableArrayList(KEY_MANGA_LIST)).map { it.manga }) @@ -45,7 +43,7 @@ class FavouriteCategoriesBottomSheet : super.onViewCreated(view, savedInstanceState) adapter = MangaCategoriesAdapter(this) binding.recyclerViewCategories.adapter = adapter - binding.toolbar.setOnMenuItemClickListener(this) + binding.buttonDone.setOnClickListener(this) binding.itemCreate.setOnClickListener(this) viewModel.content.observe(viewLifecycleOwner, this::onContentChanged) @@ -57,19 +55,10 @@ class FavouriteCategoriesBottomSheet : super.onDestroyView() } - override fun onMenuItemClick(item: MenuItem): Boolean { - return when (item.itemId) { - R.id.action_done -> { - dismiss() - true - } - else -> false - } - } - override fun onClick(v: View) { when (v.id) { R.id.item_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext())) + R.id.button_done -> dismiss() } } diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt index b7eea4171..b404b3286 100644 --- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt @@ -4,11 +4,10 @@ import android.app.Activity import android.appwidget.AppWidgetManager import android.content.Intent import android.os.Bundle -import android.view.Menu -import android.view.MenuItem import android.view.View import android.view.ViewGroup import androidx.core.graphics.Insets +import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.recyclerview.widget.RecyclerView @@ -26,7 +25,7 @@ import org.koitharu.kotatsu.widget.shelf.model.CategoryItem import com.google.android.material.R as materialR class ShelfConfigActivity : BaseActivity(), - OnListItemClickListener { + OnListItemClickListener, View.OnClickListener { private val viewModel by viewModel() @@ -45,6 +44,8 @@ class ShelfConfigActivity : BaseActivity(), MaterialDividerItemDecoration(this, RecyclerView.VERTICAL) ) binding.recyclerView.adapter = adapter + binding.buttonDone.isVisible = true + binding.buttonDone.setOnClickListener(this) binding.fabAdd.hide() val appWidgetId = intent?.getIntExtra( AppWidgetManager.EXTRA_APPWIDGET_ID, @@ -61,23 +62,18 @@ class ShelfConfigActivity : BaseActivity(), viewModel.onError.observe(this, this::onError) } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.opt_config, menu) - return super.onCreateOptionsMenu(menu) - } - - override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) { - R.id.action_done -> { - config.categoryId = viewModel.checkedId - updateWidget() - setResult( - Activity.RESULT_OK, - Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId) - ) - finish() - true + override fun onClick(v: View) { + when (v.id) { + R.id.button_done -> { + config.categoryId = viewModel.checkedId + updateWidget() + setResult( + Activity.RESULT_OK, + Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId) + ) + finish() + } } - else -> super.onOptionsItemSelected(item) } override fun onItemClick(item: CategoryItem, view: View) { diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml index ff28de4f7..e427c9be0 100644 --- a/app/src/main/res/layout/activity_categories.xml +++ b/app/src/main/res/layout/activity_categories.xml @@ -8,9 +8,9 @@ + android:layout_height="wrap_content" + android:fitsSystemWindows="true"> + app:layout_collapseMode="pin"> + +