Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

updated filters menu entry

This commit is contained in:
Mariotaku Lee 2017-09-11 20:57:20 +08:00
parent 963af014f1
commit f4ec5dd81d
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt
View File

@ -20,7 +20,7 @@ import android.widget.ImageView
import android.widget.TextView
import kotlinx.android.synthetic.main.fragment_content_listview.*
import org.mariotaku.kpreferences.KPreferences
import org.mariotaku.ktextension.setItemAvailability
import org.mariotaku.ktextension.setGroupAvailability
import org.mariotaku.ktextension.spannable
import org.mariotaku.library.objectcursor.ObjectCursor
import org.mariotaku.twidere.R
@ -100,8 +100,7 @@ class FilteredUsersFragment : BaseFiltersFragment() {
override fun onPrepareOptionsMenu(menu: Menu) {
super.onPrepareOptionsMenu(menu)
val isFeaturesSupported = extraFeaturesService.isSupported()
menu.setItemAvailability(R.id.add_user_single, !isFeaturesSupported)
menu.setItemAvailability(R.id.add_user_submenu, isFeaturesSupported)
menu.setGroupAvailability(R.id.import_export, isFeaturesSupported)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -109,7 +108,7 @@ class FilteredUsersFragment : BaseFiltersFragment() {
intent.putExtra(EXTRA_SINGLE_SELECTION, true)
intent.putExtra(EXTRA_SELECT_ONLY_ITEM_AUTOMATICALLY, true)
val requestCode = when (item.itemId) {
R.id.add_user_single, R.id.add_user -> REQUEST_ADD_USER_SELECT_ACCOUNT
R.id.add_user -> REQUEST_ADD_USER_SELECT_ACCOUNT
R.id.import_from_blocked_users -> {
REQUEST_IMPORT_BLOCKS_SELECT_ACCOUNT
}

27
twidere/src/main/res/menu/menu_filters_users.xml
View File

@ -5,27 +5,18 @@
tools:ignore="AlwaysShowAction">
<item
android:id="@+id/add_user_single"
android:id="@+id/add_user"
android:icon="@drawable/ic_action_add"
android:title="@string/select_user"
app:showAsAction="always"/>
<item
android:id="@+id/add_user_submenu"
android:icon="@drawable/ic_action_add"
android:title="@string/action_add"
app:showAsAction="always">
<menu>
<item
android:id="@+id/add_user"
android:title="@string/select_user"/>
<item
android:id="@+id/import_from_blocked_users"
android:title="@string/action_filter_import_from_blocked_users"/>
<item
android:id="@+id/import_from_muted_users"
android:title="@string/action_filter_import_from_muted_users"/>
</menu>
</item>
<group android:id="@+id/import_export">
<item
android:id="@+id/import_from_blocked_users"
android:title="@string/action_filter_import_from_blocked_users"/>
<item
android:id="@+id/import_from_muted_users"
android:title="@string/action_filter_import_from_muted_users"/>
</group>
</menu>