diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt b/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt index d12af0fbe..e4623d14d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.activity.viewModels +import androidx.appcompat.widget.PopupMenu import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope @@ -122,6 +123,22 @@ class RssSortActivity : VMBaseActivity + popup.menu.add(0, index, index, pair.first) + } + popup.setOnMenuItemClickListener { item -> + binding.viewPager.setCurrentItem(item.itemId, true) + true + } + popup.setOnDismissListener { + binding.btnExpandTabs.isChecked = false + } + popup.show() + } + } private fun setSourceVariable() { diff --git a/app/src/main/res/drawable/tab_right_fade.xml b/app/src/main/res/drawable/tab_right_fade.xml new file mode 100644 index 000000000..655cd7943 --- /dev/null +++ b/app/src/main/res/drawable/tab_right_fade.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_rss_artivles.xml b/app/src/main/res/layout/activity_rss_artivles.xml index 8b44bf114..044b65069 100644 --- a/app/src/main/res/layout/activity_rss_artivles.xml +++ b/app/src/main/res/layout/activity_rss_artivles.xml @@ -36,12 +36,47 @@ - + android:orientation="horizontal" + android:gravity="center_vertical" + android:paddingStart="16dp" + android:paddingEnd="10dp"> + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_rss_articles.xml b/app/src/main/res/layout/fragment_rss_articles.xml index 11853e9a9..38c015b92 100644 --- a/app/src/main/res/layout/fragment_rss_articles.xml +++ b/app/src/main/res/layout/fragment_rss_articles.xml @@ -8,6 +8,7 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" + android:padding="4dp" android:clipToPadding="false" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_rss_article_1.xml b/app/src/main/res/layout/item_rss_article_1.xml index 2f85967ff..315b944ca 100644 --- a/app/src/main/res/layout/item_rss_article_1.xml +++ b/app/src/main/res/layout/item_rss_article_1.xml @@ -2,7 +2,7 @@