From df8dc3a198c5f0cb11d535eaa23931a86e5bb229 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-ar/strings.xml | 2 - app/src/main/res/values-bn-rIN/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-eo/strings.xml | 3 -- app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-eu/strings.xml | 2 - app/src/main/res/values-fa/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-is/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-no-rNB/strings.xml | 2 - app/src/main/res/values-oc/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sl/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rHK/strings.xml | 2 - app/src/main/res/values-zh-rMO/strings.xml | 2 - app/src/main/res/values-zh-rSG/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 4 +- 39 files changed, 105 insertions(+), 121 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 57ff95a35..0e239c5a5 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 26e85deba..ad622ea79 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 f1985ec54..a49dcc889 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 4d8dedfb6..007ba5465 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 10e1d1334..47ce86578 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java @@ -88,11 +88,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; @@ -116,7 +116,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; @@ -160,7 +161,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; @@ -201,25 +203,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 = requireArguments(); 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()); @@ -822,7 +836,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; } @@ -831,7 +845,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; @@ -981,8 +995,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; switch (kind) { default: @@ -993,19 +1006,21 @@ public class TimelineFragment extends SFragment implements case PUBLIC_LOCAL: return api.publicTimeline(true, fromId, uptoId, LOAD_AT_ONCE); case TAG: - return api.hashtagTimeline(tagOrId, null, fromId, uptoId, LOAD_AT_ONCE); + String firstHashtag = tags.get(0); + List additionalHashtags = tags.subList(1, tags.size()); + return api.hashtagTimeline(firstHashtag, additionalHashtags, null, fromId, uptoId, LOAD_AT_ONCE); case USER: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, true, null, null); + return api.accountStatuses(id, fromId, uptoId, LOAD_AT_ONCE, true, null, null); case USER_PINNED: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, null, null, true); + return api.accountStatuses(id, fromId, uptoId, LOAD_AT_ONCE, null, null, true); case USER_WITH_REPLIES: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, null, null, null); + return api.accountStatuses(id, fromId, uptoId, LOAD_AT_ONCE, null, null, null); case FAVOURITES: return api.favourites(fromId, uptoId, LOAD_AT_ONCE); case BOOKMARKS: return api.bookmarks(fromId, uptoId, LOAD_AT_ONCE); case LIST: - return api.listTimeline(tagOrId, fromId, uptoId, LOAD_AT_ONCE); + return api.listTimeline(id, fromId, uptoId, LOAD_AT_ONCE); } } @@ -1047,7 +1062,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); } @@ -1330,7 +1345,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 dc69ed7d5..d0d78ee69 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -76,6 +76,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 a843e4c22..000000000 --- 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 99a54009e..000000000 --- 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 d54c9ed0f..b0926cead 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-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 48064584a..edcc2b83e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -342,9 +342,7 @@ جارٍ تنزيل الوسائط هل تريد حذف وإعادة صياغة هذا التبويق؟ تم تفضيله - تعديل الوسم وسم بدون # - الوسم مسح عامل تصفية طَبِّق diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 580c56124..0211b1aff 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -416,9 +416,7 @@ নামের তালিকা - হ্যাশট্যাগ সম্পাদনা করুন # ছাড়া হ্যাশট্যাগ - হ্যাশট্যাগ পরিষ্কার ফিল্টার প্রয়োগ diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index e62c1b076..55b06765e 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -420,9 +420,7 @@ Directe Nom de la llista - Modificar el hashtag Hashtag sense # - Hashtag Netejar Filtrar Aplicar diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 984bbd0dc..c38278527 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -364,9 +364,7 @@ Přímý Název seznamu - Upravit hashtag Hashtag bez # - Hashtag Napsat toot Napsat diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8e3499f56..5b8fabb24 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -329,9 +329,7 @@ Liste konnte nicht gelöscht werden Suche nach Leuten denen du folgst Von der Liste entfernen - Hashtag bearbeiten Hashtag ohne # - Hashtag Öffne Autor des geteilten Beitrages Öffentliche Zeitleisten diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index a8704d16b..72ccd1fda 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -367,10 +367,7 @@ Enketoj Sciigoj pri enketoj kiuj finiĝis - - Redakti kradvorton Kradvortoj sen # - Kradvorto Viŝi Filtri Apliki diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0a4daabfa..683c73683 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -381,9 +381,7 @@ Sin listar Directo Nombre de la lista - Editar etiqueta Etiqueta sin # - Etiqueta Limpiar Filtro Componer toot diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index d1c8f98cc..bfb599ec8 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -373,9 +373,7 @@ Zuzena Inkestatu aukerekin: %1$s, %2$s, %3$s, %4$s; %5$s Zerrendaren izena - Editatu traola Traola # gabe - Traola Garbitu Iragazi Aplikatu diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index ae6e6a38a..9b6b58e88 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -364,9 +364,7 @@ مستقیم نظرسنجی با انتخاب‌ها: %1$s، %2$s، %3$s، %4$s؛ %5$s نام فهرست - ویرایش برچسب برچسب بدون # - برچسب پاک‌سازی پالایش اعمال diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bf24a142e..86e251318 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -362,9 +362,7 @@ Direct Nom de la liste - Édition des hashtags Hashtags sans # - Hashtag Effacer Filtrer Appliquer diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 80644617a..f96fd477c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -390,9 +390,7 @@ Lista neve - Hashtag szerkesztése Hashtag # nélkül - Hashtag Törlés Szűrés Alkalmaz diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 4bbd56dc8..371d90c8f 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -428,9 +428,7 @@ Heiti á lista - Breyta myllumerki Myllumerki án # - Myllumerki Veldu lista Listi Hreinsa diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f3d404ad6..9299975e6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -359,9 +359,7 @@ Scarica media Scaricando media - Modifica hashtag Hashtag senza # - Hashtag Componi Toot diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6fd8aec96..5c599e020 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -398,8 +398,6 @@ 公開タイムライン 閲覧注意：%s - ハッシュタグの編集 - ハッシュタグ 適用 投票終了 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index af75eaf76..b48c6e87d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -368,9 +368,7 @@ 다이렉트 투표 선택지: %1$s, %2$s, %3$s, %4$s, %5$s 리스트 이름 - 해시태그 편집 #를 제외한 해시태그 - 해시태그 알림 지우기 필터 적용 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a0e2e0aa6..bf108ea72 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -356,9 +356,7 @@ Account aan de lijst toevoegen Account uit de lijst verwijderen Naam van lijst - Hashtag bewerken Hashtag zonder # - Hashtag Verwijderen en herschrijven Deze toot verwijderen en herschrijven\? Leegmaken diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml index 368d69e50..f64a7eb24 100644 --- a/app/src/main/res/values-no-rNB/strings.xml +++ b/app/src/main/res/values-no-rNB/strings.xml @@ -328,9 +328,7 @@ Følgere Direkte Listenavn - Endre emneord Emneord uten # - Emneord Slett Filter Bruk diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 86d135c9e..6105a18f4 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -351,9 +351,7 @@ Seguidors Dirècte Nom de la lista - Modificar las etiquetas Etiquetas sens # - Etiqueta Escriure un tut Escriure Suprimir e reformular diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 07e22ff9e..ca9c3ac4d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -373,9 +373,7 @@ Bezpośrednio Głosowanie z opcjami: %1$s, %2$s, %3$s, %4$s; %5$s Nazwa listy - Edytuj hashtag Hashtag bez # - Hashtag Wyczyść Filtr Zastosuj diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index bee77d3ff..839738c46 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -356,9 +356,7 @@ Não-listado Direta Nome da lista - Editar hashtag Hashtag sem # - Hashtag Limpar Filtro Salvar diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 774b95233..3bf028f91 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -394,9 +394,7 @@ Для упомянутых Название списка - Изм. хэштег Хэштег без # - Хэштег Очистить Фильтр Применить diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 503830a5d..6040a53f3 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -332,9 +332,7 @@ Sledilci Neposredno Ime seznama - Uredi ključnik Ključnik brez # - Ključnik Počisti Filter Uporabi diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9afa00d6a..d5825561b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -358,9 +358,7 @@ Listnamn Ladda ned media Laddar ned media - Redigera hashtag Hashtag utan # - Hashtag Skriv toot Skriv Rensa diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f5c248f3e..b1d55da7b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -351,9 +351,7 @@ Direkt Seçenekli anket: %1$s, %2$s, %3$s, %4$s; %5$s Liste adı - Hashtag\'i düzenle # olmadan hashtag - Hashtag Temizle Filtre Uygula diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index dfcf04ba1..6df5044ef 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -370,9 +370,7 @@ 私信 列表名 - 编辑话题 话题名（不含前面的 # 号） - 话题 清空 分类 应用 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 98b2e0f7c..b867dd7fe 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -366,9 +366,7 @@ 私信 列表名 - 編輯話題 話題名（不含前面的 # 號） - 話題 清空 分類 應用 diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 66358b91b..8236fb165 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -366,9 +366,7 @@ 私信 列表名 - 編輯話題 話題名（不含前面的 # 號） - 話題 清空 分類 應用 diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index 8ee40db1c..c89af6369 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -434,9 +434,7 @@ 列表名 - 编辑话题 话题名（不含前面的 # 号） - 话题 清空 分类 应用 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 78a18de73..47c613f63 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -366,9 +366,7 @@ 私信 列表名 - 編輯話題 話題名（不含前面的 # 號） - 話題 清空 分類 應用 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9a754467b..91fa69c80 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -474,9 +474,9 @@ List name - Edit hashtag + Add hashtag Hashtag without # - Hashtag + Hashtags Select list List Clear