From 83600ee92d5cc50a80b2d490b00326c3d875a569 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 15 May 2020 22:10:29 +0200 Subject: [PATCH] enable multiple hashtags in one hashtag tab (#1790) * enable multiple hashtags in one hashtag tab * add comment explaining the code in TabAdapter * delete unused drawables * add padding to EditText in dialog --- .../java/com/keylesspalace/tusky/TabData.kt | 2 +- .../tusky/TabPreferenceActivity.kt | 30 ++++++++--- .../keylesspalace/tusky/ViewTagActivity.java | 4 +- .../keylesspalace/tusky/adapter/TabAdapter.kt | 43 ++++++++++++--- .../tusky/fragment/TimelineFragment.java | 53 ++++++++++++------- .../tusky/network/MastodonApi.kt | 1 + .../main/res/drawable-v26/ic_edit_chip.xml | 11 ---- app/src/main/res/drawable/ic_edit_chip.xml | 9 ---- .../main/res/layout/item_tab_preference.xml | 10 ++-- app/src/main/res/values/strings.xml | 4 +- 10 files changed, 105 insertions(+), 62 deletions(-) delete mode 100644 app/src/main/res/drawable-v26/ic_edit_chip.xml delete mode 100644 app/src/main/res/drawable/ic_edit_chip.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/TabData.kt b/app/src/main/java/com/keylesspalace/tusky/TabData.kt index 57ff95a3..0e239c5a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabData.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabData.kt @@ -45,7 +45,7 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD LOCAL -> TabData(LOCAL, R.string.title_public_local, R.drawable.ic_local_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_LOCAL) }) FEDERATED -> TabData(FEDERATED, R.string.title_public_federated, R.drawable.ic_public_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_FEDERATED) }) DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.ic_reblog_direct_24dp, { ConversationsFragment.newInstance() }) - HASHTAG -> TabData(HASHTAG, R.string.hashtag, R.drawable.ic_hashtag, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.TAG, args.getOrNull(0).orEmpty()) }, arguments) + HASHTAG -> TabData(HASHTAG, R.string.hashtags, R.drawable.ic_hashtag, { args -> TimelineFragment.newHashtagInstance(args) }, arguments) LIST -> TabData(LIST, R.string.list, R.drawable.ic_list, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.LIST, args.getOrNull(0).orEmpty()) }, arguments) else -> throw IllegalArgumentException("unknown tab type") } diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt index 864a7208..1b237f09 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt @@ -18,13 +18,16 @@ package com.keylesspalace.tusky import android.os.Bundle import android.util.Log import android.view.MenuItem +import android.widget.FrameLayout import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.AppCompatEditText +import androidx.core.view.updatePadding import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import at.connyduck.sparkbutton.helpers.Utils import com.keylesspalace.tusky.adapter.ItemInteractionListener import com.keylesspalace.tusky.adapter.ListSelectionAdapter import com.keylesspalace.tusky.adapter.TabAdapter @@ -150,7 +153,7 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene actionButton.isExpanded = false if (tab.id == HASHTAG) { - showEditHashtagDialog() + showAddHashtagDialog() return } @@ -173,19 +176,32 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene } override fun onActionChipClicked(tab: TabData) { - showEditHashtagDialog(tab) + showAddHashtagDialog(tab) } - private fun showEditHashtagDialog(tab: TabData? = null) { + override fun onChipClicked(tab: TabData, chipPosition: Int) { + val newArguments = tab.arguments.filterIndexed { i, _ -> i != chipPosition } + val newTab = tab.copy(arguments = newArguments) + val position = currentTabs.indexOf(tab) + currentTabs[position] = newTab + + currentTabsAdapter.notifyItemChanged(position) + } + + private fun showAddHashtagDialog(tab: TabData? = null) { + + val frameLayout = FrameLayout(this) + val padding = Utils.dpToPx(this, 8) + frameLayout.updatePadding(left = padding, right = padding) val editText = AppCompatEditText(this) editText.setHint(R.string.edit_hashtag_hint) editText.setText("") - editText.append(tab?.arguments?.first().orEmpty()) + frameLayout.addView(editText) val dialog = AlertDialog.Builder(this) - .setTitle(R.string.edit_hashtag_title) - .setView(editText) + .setTitle(R.string.add_hashtag_title) + .setView(frameLayout) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.action_save) { _, _ -> val input = editText.text.toString().trim() @@ -194,7 +210,7 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene currentTabs.add(newTab) currentTabsAdapter.notifyItemInserted(currentTabs.size - 1) } else { - val newTab = tab.copy(arguments = listOf(input)) + val newTab = tab.copy(arguments = tab.arguments + input) val position = currentTabs.indexOf(tab) currentTabs[position] = newTab diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java b/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java index f1985ec5..a49dcc88 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java @@ -28,6 +28,8 @@ import androidx.fragment.app.FragmentTransaction; import com.keylesspalace.tusky.fragment.TimelineFragment; +import java.util.Collections; + import javax.inject.Inject; import dagger.android.AndroidInjector; @@ -65,7 +67,7 @@ public class ViewTagActivity extends BottomSheetActivity implements HasAndroidIn } FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); - Fragment fragment = TimelineFragment.newInstance(TimelineFragment.Kind.TAG, hashtag); + Fragment fragment = TimelineFragment.newHashtagInstance(Collections.singletonList(hashtag)); fragmentTransaction.replace(R.id.fragment_container, fragment); fragmentTransaction.commit(); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt index 4d8dedfb..007ba546 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt @@ -19,7 +19,9 @@ import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.ViewGroup +import androidx.core.view.size import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.chip.Chip import com.keylesspalace.tusky.HASHTAG import com.keylesspalace.tusky.LIST import com.keylesspalace.tusky.R @@ -29,13 +31,13 @@ import com.keylesspalace.tusky.util.hide import com.keylesspalace.tusky.util.show import kotlinx.android.synthetic.main.item_tab_preference.view.* - interface ItemInteractionListener { fun onTabAdded(tab: TabData) fun onTabRemoved(position: Int) fun onStartDelete(viewHolder: RecyclerView.ViewHolder) fun onStartDrag(viewHolder: RecyclerView.ViewHolder) fun onActionChipClicked(tab: TabData) + fun onChipClicked(tab: TabData, chipPosition: Int) } class TabAdapter(private var data: List, @@ -86,9 +88,9 @@ class TabAdapter(private var data: List, if (holder.itemView.removeButton != null) { holder.itemView.removeButton.isEnabled = removeButtonEnabled ThemeUtils.setDrawableTint( - holder.itemView.context, - holder.itemView.removeButton.drawable, - (if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.textColorDisabled) + holder.itemView.context, + holder.itemView.removeButton.drawable, + (if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.textColorDisabled) ) } @@ -96,11 +98,38 @@ class TabAdapter(private var data: List, if (data[position].id == HASHTAG) { holder.itemView.chipGroup.show() - holder.itemView.actionChip.text = data[position].arguments[0] - holder.itemView.actionChip.setChipIconResource(R.drawable.ic_edit_chip) + /* + * The chip group will always contain the actionChip (it is defined in the xml layout). + * The other dynamic chips are inserted in front of the actionChip. + * This code tries to reuse already added chips to reduce the number of Views created. + */ + data[position].arguments.forEachIndexed { i, arg -> + + val chip = holder.itemView.chipGroup.getChildAt(i).takeUnless { it.id == R.id.actionChip } as Chip? + ?: Chip(context).apply { + text = arg + holder.itemView.chipGroup.addView(this, holder.itemView.chipGroup.size - 1) + } + + chip.text = arg + + if(data[position].arguments.size <= 1) { + chip.chipIcon = null + chip.setOnClickListener(null) + } else { + val cancelIcon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_cancel_24dp, android.R.attr.textColorPrimary) + chip.chipIcon = cancelIcon + chip.setOnClickListener { + listener.onChipClicked(data[position], i) + } + } + } + + while(holder.itemView.chipGroup.size - 1 > data[position].arguments.size) { + holder.itemView.chipGroup.removeViewAt(data[position].arguments.size - 1) + } - holder.itemView.actionChip.chipIcon = context.getDrawable(R.drawable.ic_edit_chip) holder.itemView.actionChip.setOnClickListener { listener.onActionChipClicked(data[position]) } diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java index 517c54a4..f63e692f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java @@ -75,11 +75,11 @@ import com.keylesspalace.tusky.view.EndlessOnScrollListener; import com.keylesspalace.tusky.viewdata.StatusViewData; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Objects; import java.util.concurrent.TimeUnit; import javax.inject.Inject; @@ -103,7 +103,8 @@ public class TimelineFragment extends SFragment implements Injectable, ReselectableFragment, RefreshableFragment { private static final String TAG = "TimelineF"; // logging tag private static final String KIND_ARG = "kind"; - private static final String HASHTAG_OR_ID_ARG = "hashtag_or_id"; + private static final String ID_ARG = "id"; + private static final String HASHTAGS_ARG = "hastags"; private static final String ARG_ENABLE_SWIPE_TO_REFRESH = "arg.enable.swipe.to.refresh"; private static final int LOAD_AT_ONCE = 30; @@ -147,7 +148,8 @@ public class TimelineFragment extends SFragment implements private TimelineAdapter adapter; private Kind kind; - private String hashtagOrId; + private String id; + private List tags; private LinearLayoutManager layoutManager; private EndlessOnScrollListener scrollListener; private boolean filterRemoveReplies; @@ -188,25 +190,37 @@ public class TimelineFragment extends SFragment implements public static TimelineFragment newInstance(Kind kind, @Nullable String hashtagOrId, boolean enableSwipeToRefresh) { TimelineFragment fragment = new TimelineFragment(); - Bundle arguments = new Bundle(); + Bundle arguments = new Bundle(3); arguments.putString(KIND_ARG, kind.name()); - arguments.putString(HASHTAG_OR_ID_ARG, hashtagOrId); + arguments.putString(ID_ARG, hashtagOrId); arguments.putBoolean(ARG_ENABLE_SWIPE_TO_REFRESH, enableSwipeToRefresh); fragment.setArguments(arguments); return fragment; } + public static TimelineFragment newHashtagInstance(@NonNull List hashtags) { + TimelineFragment fragment = new TimelineFragment(); + Bundle arguments = new Bundle(3); + arguments.putString(KIND_ARG, Kind.TAG.name()); + arguments.putStringArrayList(HASHTAGS_ARG, new ArrayList<>(hashtags)); + arguments.putBoolean(ARG_ENABLE_SWIPE_TO_REFRESH, true); + fragment.setArguments(arguments); + return fragment; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle arguments = Objects.requireNonNull(getArguments()); kind = Kind.valueOf(arguments.getString(KIND_ARG)); - if (kind == Kind.TAG - || kind == Kind.USER + if (kind == Kind.USER || kind == Kind.USER_PINNED || kind == Kind.USER_WITH_REPLIES || kind == Kind.LIST) { - hashtagOrId = arguments.getString(HASHTAG_OR_ID_ARG); + id = arguments.getString(ID_ARG); + } + if(kind == Kind.TAG) { + tags = arguments.getStringArrayList(HASHTAGS_ARG); } SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); @@ -828,7 +842,7 @@ public class TimelineFragment extends SFragment implements @Override public void onViewTag(String tag) { - if (kind == Kind.TAG && hashtagOrId.equals(tag)) { + if (kind == Kind.TAG && tags.size() == 1 && tags.contains(tag)) { // If already viewing a tag page, then ignore any request to view that tag again. return; } @@ -837,7 +851,7 @@ public class TimelineFragment extends SFragment implements @Override public void onViewAccount(String id) { - if ((kind == Kind.USER || kind == Kind.USER_WITH_REPLIES) && hashtagOrId.equals(id)) { + if ((kind == Kind.USER || kind == Kind.USER_WITH_REPLIES) && this.id.equals(id)) { /* If already viewing an account page, then any requests to view that account page * should be ignored. */ return; @@ -986,8 +1000,7 @@ public class TimelineFragment extends SFragment implements } } - private Call> getFetchCallByTimelineType(Kind kind, String tagOrId, String fromId, - String uptoId) { + private Call> getFetchCallByTimelineType(String fromId, String uptoId) { MastodonApi api = mastodonApi; SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); boolean withMuted = !preferences.getBoolean("hideMutedUsers", false); @@ -1000,19 +1013,21 @@ public class TimelineFragment extends SFragment implements case PUBLIC_LOCAL: return api.publicTimeline(true, fromId, uptoId, LOAD_AT_ONCE, withMuted); case TAG: - return api.hashtagTimeline(tagOrId, null, fromId, uptoId, LOAD_AT_ONCE, withMuted); + String firstHashtag = tags.get(0); + List additionalHashtags = tags.subList(1, tags.size()); + return api.hashtagTimeline(firstHashtag, additionalHashtags, null, fromId, uptoId, LOAD_AT_ONCE, withMuted); case USER: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, true, null, null, withMuted); + return api.accountStatuses(id, fromId, uptoId, LOAD_AT_ONCE, true, null, null, withMuted); case USER_PINNED: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, null, null, true, withMuted); + return api.accountStatuses(id, fromId, uptoId, LOAD_AT_ONCE, null, null, true, withMuted); case USER_WITH_REPLIES: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, null, null, null, withMuted); + return api.accountStatuses(id, fromId, uptoId, LOAD_AT_ONCE, null, null, null, withMuted); case FAVOURITES: return api.favourites(fromId, uptoId, LOAD_AT_ONCE, withMuted); case BOOKMARKS: return api.bookmarks(fromId, uptoId, LOAD_AT_ONCE, withMuted); case LIST: - return api.listTimeline(tagOrId, fromId, uptoId, LOAD_AT_ONCE, withMuted); + return api.listTimeline(id, fromId, uptoId, LOAD_AT_ONCE, withMuted); } } @@ -1054,7 +1069,7 @@ public class TimelineFragment extends SFragment implements } }; - Call> listCall = getFetchCallByTimelineType(kind, hashtagOrId, maxId, sinceId); + Call> listCall = getFetchCallByTimelineType(maxId, sinceId); callList.add(listCall); listCall.enqueue(callback); } @@ -1333,7 +1348,7 @@ public class TimelineFragment extends SFragment implements break; case USER: case USER_WITH_REPLIES: - if (status.getAccount().getId().equals(hashtagOrId)) { + if (status.getAccount().getId().equals(id)) { break; } else { return; diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt index fbe288a4..2b1531f4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -79,6 +79,7 @@ interface MastodonApi { @GET("api/v1/timelines/tag/{hashtag}") fun hashtagTimeline( @Path("hashtag") hashtag: String, + @Query("any[]") any: List?, @Query("local") local: Boolean?, @Query("max_id") maxId: String?, @Query("since_id") sinceId: String?, diff --git a/app/src/main/res/drawable-v26/ic_edit_chip.xml b/app/src/main/res/drawable-v26/ic_edit_chip.xml deleted file mode 100644 index a843e4c2..00000000 --- a/app/src/main/res/drawable-v26/ic_edit_chip.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_edit_chip.xml b/app/src/main/res/drawable/ic_edit_chip.xml deleted file mode 100644 index 99a54009..00000000 --- a/app/src/main/res/drawable/ic_edit_chip.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/item_tab_preference.xml b/app/src/main/res/layout/item_tab_preference.xml index d54c9ed0..b0926cea 100644 --- a/app/src/main/res/layout/item_tab_preference.xml +++ b/app/src/main/res/layout/item_tab_preference.xml @@ -26,10 +26,10 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" android:layout_weight="1" android:drawablePadding="12dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" android:textColor="?android:attr/textColorSecondary" android:textSize="?attr/status_text_large" app:layout_constraintBottom_toTopOf="@id/chipGroup" @@ -57,9 +57,7 @@ android:id="@+id/chipGroup" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="32dp" android:layout_marginBottom="8dp" - android:paddingTop="8dp" app:layout_constraintBottom_toBottomOf="parent"> + android:text="@string/add_hashtag_title" + app:chipIcon="@drawable/ic_plus_24dp" + app:chipSurfaceColor="@color/tusky_blue" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 899b0d99..04c7230d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -472,9 +472,9 @@ List name - Edit hashtag + Add hashtag Hashtag without # - Hashtag + Hashtags Select list List Clear