From 1cac394c27ffda62c516273f4980ec4fcae5466b Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Sun, 19 Feb 2017 17:41:14 +0800 Subject: [PATCH] improved link handler --- .../twidere/provider/TwidereDataStore.java | 1 + twidere/src/main/AndroidManifest.xml | 2 +- .../tab/impl/SearchTabConfiguration.java | 2 +- .../util/KeyboardShortcutsHandler.java | 2 +- ...LinkHandlerFragmentLifecycleCallbacks.java | 47 +++++++++++++++++++ .../twidere/activity/LinkHandlerActivity.kt | 11 +++++ .../fragment/AbsToolbarTabPagesFragment.kt | 22 ++------- .../twidere/fragment/UserFragment.kt | 8 ---- .../message/MessagesConversationFragment.kt | 25 ++++++++-- .../util/database/SuggestionsCursorCreator.kt | 1 - .../main/res-localized/values-ast/strings.xml | 2 +- .../main/res-localized/values-ca/strings.xml | 2 +- .../main/res-localized/values-cs/strings.xml | 2 +- .../main/res-localized/values-da/strings.xml | 2 +- .../main/res-localized/values-de/strings.xml | 2 +- .../main/res-localized/values-el/strings.xml | 2 +- .../main/res-localized/values-es/strings.xml | 2 +- .../main/res-localized/values-fa/strings.xml | 2 +- .../main/res-localized/values-fi/strings.xml | 2 +- .../main/res-localized/values-fr/strings.xml | 2 +- .../main/res-localized/values-gl/strings.xml | 2 +- .../main/res-localized/values-hr/strings.xml | 2 +- .../main/res-localized/values-hu/strings.xml | 2 +- .../main/res-localized/values-in/strings.xml | 2 +- .../main/res-localized/values-it/strings.xml | 2 +- .../main/res-localized/values-ja/strings.xml | 2 +- .../main/res-localized/values-ko/strings.xml | 2 +- .../main/res-localized/values-nl/strings.xml | 2 +- .../main/res-localized/values-no/strings.xml | 2 +- .../main/res-localized/values-pl/strings.xml | 2 +- .../main/res-localized/values-pt/strings.xml | 2 +- .../main/res-localized/values-ro/strings.xml | 2 +- .../main/res-localized/values-ru/strings.xml | 2 +- .../main/res-localized/values-sv/strings.xml | 2 +- .../main/res-localized/values-th/strings.xml | 2 +- .../main/res-localized/values-tr/strings.xml | 2 +- .../main/res-localized/values-uk/strings.xml | 2 +- .../res-localized/values-zh-rCN/strings.xml | 2 +- .../res-localized/values-zh-rHK/strings.xml | 2 +- .../main/res-localized/values-zh/strings.xml | 2 +- .../res/layout/activity_user_selector.xml | 2 +- .../layout/fragment_messages_conversation.xml | 20 +++++++- .../layout_actionbar_message_user_picker.xml | 2 +- .../main/res/menu/menu_account_dashboard.xml | 2 +- .../res/menu/menu_messages_conversation.xml | 9 +++- twidere/src/main/res/values/strings.xml | 3 +- .../xml/preferences_keyboard_shortcuts.xml | 2 +- 47 files changed, 150 insertions(+), 71 deletions(-) create mode 100644 twidere/src/main/java/org/mariotaku/twidere/util/activity/LinkHandlerFragmentLifecycleCallbacks.java diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java index ea6de3d31..aa054f42c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java @@ -317,6 +317,7 @@ public interface TwidereDataStore { String TYPE_USER = "user"; String TYPE_SEARCH_HISTORY = "search_history"; String TYPE_SCREEN_NAME = "screen_name"; + String TYPE_MESSAGE = "message"; } } diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml index 80bef0973..62a2c1eae 100644 --- a/twidere/src/main/AndroidManifest.xml +++ b/twidere/src/main/AndroidManifest.xml @@ -251,7 +251,7 @@ diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/SearchTabConfiguration.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/SearchTabConfiguration.java index 74e80c0dc..b7843de4c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/SearchTabConfiguration.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/SearchTabConfiguration.java @@ -24,7 +24,7 @@ public class SearchTabConfiguration extends TabConfiguration { @NonNull @Override public StringHolder getName() { - return StringHolder.resource(R.string.search); + return StringHolder.resource(R.string.action_search); } @NonNull diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java index cfdedd456..90e8486a3 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java @@ -41,7 +41,7 @@ public class KeyboardShortcutsHandler implements KeyboardShortcutConstants { static { sActionLabelMap.put(ACTION_COMPOSE, R.string.action_compose); - sActionLabelMap.put(ACTION_SEARCH, R.string.search); + sActionLabelMap.put(ACTION_SEARCH, R.string.action_search); sActionLabelMap.put(ACTION_MESSAGE, R.string.new_direct_message); sActionLabelMap.put(ACTION_HOME_ACCOUNTS_DASHBOARD, R.string.open_accounts_dashboard); sActionLabelMap.put(ACTION_STATUS_REPLY, R.string.action_reply); diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/activity/LinkHandlerFragmentLifecycleCallbacks.java b/twidere/src/main/java/org/mariotaku/twidere/util/activity/LinkHandlerFragmentLifecycleCallbacks.java new file mode 100644 index 000000000..4400a0fa8 --- /dev/null +++ b/twidere/src/main/java/org/mariotaku/twidere/util/activity/LinkHandlerFragmentLifecycleCallbacks.java @@ -0,0 +1,47 @@ +/* + * Twidere - Twitter client for Android + * + * Copyright (C) 2012-2017 Mariotaku Lee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.mariotaku.twidere.util.activity; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.view.View; + +import org.mariotaku.twidere.activity.LinkHandlerActivity; +import org.mariotaku.twidere.fragment.iface.IToolBarSupportFragment; + +/** + * Created by mariotaku on 2017/2/19. + */ + +public class LinkHandlerFragmentLifecycleCallbacks { + + public static FragmentManager.FragmentLifecycleCallbacks get(final LinkHandlerActivity activity) { + final FragmentManager fm = activity.getSupportFragmentManager(); + return fm.new FragmentLifecycleCallbacks() { + @Override + public void onFragmentViewCreated(final FragmentManager fm1, final Fragment f, final View v, final Bundle savedInstanceState) { + if (f instanceof IToolBarSupportFragment) { + activity.setSupportActionBar(((IToolBarSupportFragment) f).getToolbar()); + } + } + }; + } +} diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt index 75b39252a..9938c3b2e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt @@ -28,6 +28,7 @@ import android.net.Uri import android.os.BadParcelableException import android.os.Bundle import android.support.v4.app.Fragment +import android.support.v4.app.FragmentManager.FragmentLifecycleCallbacks import android.support.v4.app.NavUtils import android.support.v4.view.WindowCompat import android.support.v7.widget.Toolbar @@ -64,6 +65,7 @@ import org.mariotaku.twidere.model.analyzer.PurchaseFinished import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback import org.mariotaku.twidere.util.Utils.LINK_ID_FILTERS_IMPORT_BLOCKS +import org.mariotaku.twidere.util.activity.LinkHandlerFragmentLifecycleCallbacks import org.mariotaku.twidere.util.linkhandler.TwidereLinkMatcher import org.mariotaku.twidere.util.theme.getCurrentThemeResource @@ -76,6 +78,7 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro private var actionBarHeight: Int = 0 private var subtitle: CharSequence? = null private var hideOffsetNotSupported: Boolean = false + private lateinit var fragmentLifecycleCallbacks: FragmentLifecycleCallbacks override val currentVisibleFragment: Fragment? get() = supportFragmentManager.findFragmentByTag("content_fragment") @@ -86,6 +89,9 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro controlBarShowHideHelper = ControlBarShowHideHelper(this) multiSelectHandler.dispatchOnCreate() + fragmentLifecycleCallbacks = LinkHandlerFragmentLifecycleCallbacks.get(this) + supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false) + val uri = intent.data ?: run { finish() return @@ -147,6 +153,11 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro } } + override fun onDestroy() { + supportFragmentManager.unregisterFragmentLifecycleCallbacks(fragmentLifecycleCallbacks) + super.onDestroy() + } + override fun onStart() { super.onStart() multiSelectHandler.dispatchOnStart() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt index fcc217365..fce59ac7b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt @@ -7,7 +7,6 @@ import android.os.Bundle import android.support.v4.app.Fragment import android.support.v4.app.FragmentActivity import android.support.v4.view.ViewPager.OnPageChangeListener -import android.support.v7.app.AppCompatActivity import android.support.v7.widget.Toolbar import android.view.KeyEvent import android.view.LayoutInflater @@ -41,7 +40,6 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte private lateinit var pagerAdapter: SupportTabsAdapter override val toolbar: Toolbar get() = toolbarContainer.toolbar - private var mControlBarHeight: Int = 0 override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) @@ -103,15 +101,6 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte return inflater!!.inflate(R.layout.fragment_toolbar_tab_pages, container, false) } - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - val host = host - if (host is AppCompatActivity) { - host.setSupportActionBar(toolbar) - } - } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { val o = pagerAdapter.instantiateItem(viewPager, viewPager.currentItem) if (o is Fragment) { @@ -150,7 +139,6 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte } override fun onControlBarOffsetChanged(activity: IControlBarActivity, offset: Float) { - mControlBarHeight = activity.controlBarHeight } override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { @@ -212,14 +200,14 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte } override fun isKeyboardShortcutHandled(handler: KeyboardShortcutsHandler, keyCode: Int, - event: KeyEvent, metaState: Int): Boolean { + event: KeyEvent, metaState: Int): Boolean { if (isFragmentKeyboardShortcutHandled(handler, keyCode, event, metaState)) return true val action = handler.getKeyAction(CONTEXT_TAG_NAVIGATION, keyCode, event, metaState) return ACTION_NAVIGATION_PREVIOUS_TAB == action || ACTION_NAVIGATION_NEXT_TAB == action } override fun handleKeyboardShortcutRepeat(handler: KeyboardShortcutsHandler, keyCode: Int, - repeatCount: Int, event: KeyEvent, metaState: Int): Boolean { + repeatCount: Int, event: KeyEvent, metaState: Int): Boolean { return handleFragmentKeyboardShortcutRepeat(handler, keyCode, repeatCount, event, metaState) } @@ -227,7 +215,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte get() = currentVisibleFragment private fun handleFragmentKeyboardShortcutRepeat(handler: KeyboardShortcutsHandler, keyCode: Int, - repeatCount: Int, event: KeyEvent, metaState: Int): Boolean { + repeatCount: Int, event: KeyEvent, metaState: Int): Boolean { val fragment = keyboardShortcutRecipient if (fragment is KeyboardShortcutCallback) { return fragment.handleKeyboardShortcutRepeat(handler, keyCode, @@ -237,7 +225,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte } private fun handleFragmentKeyboardShortcutSingle(handler: KeyboardShortcutsHandler, keyCode: Int, - event: KeyEvent, metaState: Int): Boolean { + event: KeyEvent, metaState: Int): Boolean { val fragment = keyboardShortcutRecipient if (fragment is KeyboardShortcutCallback) { return fragment.handleKeyboardShortcutSingle(handler, keyCode, @@ -247,7 +235,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte } private fun isFragmentKeyboardShortcutHandled(handler: KeyboardShortcutsHandler, keyCode: Int, - event: KeyEvent, metaState: Int): Boolean { + event: KeyEvent, metaState: Int): Boolean { val fragment = keyboardShortcutRecipient if (fragment is KeyboardShortcutCallback) { return fragment.isKeyboardShortcutHandled(handler, keyCode, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index 24adbdae3..2e1eb3979 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -1044,14 +1044,6 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, return true } - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - val host = host - if (host is AppCompatActivity) { - host.setSupportActionBar(toolbar) - } - } - override fun handleKeyboardShortcutSingle(handler: KeyboardShortcutsHandler, keyCode: Int, event: KeyEvent, metaState: Int): Boolean { if (handleFragmentKeyboardShortcutSingle(handler, keyCode, event, metaState)) return true val action = handler.getKeyAction(CONTEXT_TAG_NAVIGATION, keyCode, event, metaState) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt index 82d7c9ce0..e79759231 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt @@ -25,16 +25,19 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle +import android.support.v4.app.FragmentActivity import android.support.v4.app.LoaderManager import android.support.v4.content.Loader import android.support.v7.widget.FixedLinearLayoutManager import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView +import android.support.v7.widget.Toolbar import android.view.* import android.widget.Toast import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.activity_premium_dashboard.* import kotlinx.android.synthetic.main.fragment_messages_conversation.* +import kotlinx.android.synthetic.main.fragment_messages_conversation.view.* import org.mariotaku.abstask.library.TaskStarter import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.empty @@ -59,6 +62,7 @@ import org.mariotaku.twidere.extension.model.isOfficial import org.mariotaku.twidere.extension.model.readOnly import org.mariotaku.twidere.fragment.AbsContentListRecyclerViewFragment import org.mariotaku.twidere.fragment.EditAltTextDialogFragment +import org.mariotaku.twidere.fragment.iface.IToolBarSupportFragment import org.mariotaku.twidere.loader.ObjectCursorLoader import org.mariotaku.twidere.model.* import org.mariotaku.twidere.model.ParcelableMessageConversation.ConversationType @@ -81,7 +85,8 @@ import org.mariotaku.twidere.view.holder.compose.MediaPreviewViewHolder import java.util.concurrent.atomic.AtomicReference class MessagesConversationFragment : AbsContentListRecyclerViewFragment(), - LoaderManager.LoaderCallbacks?>, EditAltTextDialogFragment.EditAltTextCallback { + IToolBarSupportFragment, LoaderManager.LoaderCallbacks?>, + EditAltTextDialogFragment.EditAltTextCallback { private lateinit var mediaPreviewAdapter: MediaPreviewAdapter private val accountKey: UserKey get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY) @@ -103,6 +108,14 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment?> { return ConversationLoader(context, accountKey, conversationId) } @@ -415,9 +432,9 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragmentQuiciabes yá guardesti esta gueta Tuits planificaos Bagul d\'axustes - Guetar + Guetar Gueta tuits o usuarios Guetar usuarios Guetar tuits diff --git a/twidere/src/main/res-localized/values-ca/strings.xml b/twidere/src/main/res-localized/values-ca/strings.xml index 2fbd8bbe2..8d1357eef 100644 --- a/twidere/src/main/res-localized/values-ca/strings.xml +++ b/twidere/src/main/res-localized/values-ca/strings.xml @@ -612,7 +612,7 @@ Potser ja heu desat aquesta cerca Piulades programades Caixa d\'eines - Cerca + Cerca Cerca piulades o usuaris Cerca Piulades Piulades diff --git a/twidere/src/main/res-localized/values-cs/strings.xml b/twidere/src/main/res-localized/values-cs/strings.xml index 75672c31a..86aec2a91 100644 --- a/twidere/src/main/res-localized/values-cs/strings.xml +++ b/twidere/src/main/res-localized/values-cs/strings.xml @@ -295,7 +295,7 @@ Použít stejnou adresu URL pro přihlášení OAuth Uložit do galerie Uložená hledání - Hledat + Hledat Hledat Tweety nebo uživatele Hledat Tweety Tweety diff --git a/twidere/src/main/res-localized/values-da/strings.xml b/twidere/src/main/res-localized/values-da/strings.xml index fe5a71de6..c1841c47f 100644 --- a/twidere/src/main/res-localized/values-da/strings.xml +++ b/twidere/src/main/res-localized/values-da/strings.xml @@ -210,7 +210,7 @@ Retweetet af %1$s og %2$d andre Ringetone Gemte søgninger - Søg + Søg Søg tweets eller brugere Søg i tweets Tweets diff --git a/twidere/src/main/res-localized/values-de/strings.xml b/twidere/src/main/res-localized/values-de/strings.xml index 5c8bb14cc..1343ecbea 100644 --- a/twidere/src/main/res-localized/values-de/strings.xml +++ b/twidere/src/main/res-localized/values-de/strings.xml @@ -714,7 +714,7 @@ Vielleicht hast du diese Suche bereits gespeichert Geplante Tweets Schrottplatz - Suchen + Suchen Tweets oder Benutzer suchen Benutzer suchen Tweets suchen diff --git a/twidere/src/main/res-localized/values-el/strings.xml b/twidere/src/main/res-localized/values-el/strings.xml index dff07a061..47cb60969 100644 --- a/twidere/src/main/res-localized/values-el/strings.xml +++ b/twidere/src/main/res-localized/values-el/strings.xml @@ -109,7 +109,7 @@ Έγινε ρετουϊτ από %s Έγινε ρετουϊτ από %1$s και %2$d άλλους Χρησιμοποίησε ίδιο URL για εισαγωγή OAuth - Αναζήτηση + Αναζήτηση Tweets Χρήστες Επιλογή λογαριασμού diff --git a/twidere/src/main/res-localized/values-es/strings.xml b/twidere/src/main/res-localized/values-es/strings.xml index 87e30bc3d..2c9962e5e 100644 --- a/twidere/src/main/res-localized/values-es/strings.xml +++ b/twidere/src/main/res-localized/values-es/strings.xml @@ -705,7 +705,7 @@ Quizá ya hayas guardado esta búsqueda Planificación de tweets Más ajustes - Búsqueda + Búsqueda Búsqueda de tweets o usuarios Buscar usuarios Buscar Tweets diff --git a/twidere/src/main/res-localized/values-fa/strings.xml b/twidere/src/main/res-localized/values-fa/strings.xml index b12197cdd..35431ee98 100644 --- a/twidere/src/main/res-localized/values-fa/strings.xml +++ b/twidere/src/main/res-localized/values-fa/strings.xml @@ -633,7 +633,7 @@ احتمالاً از پیش این جست‌‌وجو را ذخیره کرده‌اید تویتت‌های زمان‌بندی شده ظاهر - جست‌وجو + جست‌وجو جست‌وجوی توییت‌ها یا کاربران جست‌وجوی توییت‌ها توییت‌ها diff --git a/twidere/src/main/res-localized/values-fi/strings.xml b/twidere/src/main/res-localized/values-fi/strings.xml index 95fd543e7..979c1ea2e 100644 --- a/twidere/src/main/res-localized/values-fi/strings.xml +++ b/twidere/src/main/res-localized/values-fi/strings.xml @@ -602,7 +602,7 @@ Kenties olet jo tallentanut tämän haun Ajoitetut twiitit Romuvarasto - Hae + Hae Hae twiittejä tai käyttäjiä Hae twiittejä Twiitit diff --git a/twidere/src/main/res-localized/values-fr/strings.xml b/twidere/src/main/res-localized/values-fr/strings.xml index 34303ef9c..ce66a0dd6 100644 --- a/twidere/src/main/res-localized/values-fr/strings.xml +++ b/twidere/src/main/res-localized/values-fr/strings.xml @@ -714,7 +714,7 @@ Vous avez certainement déjà enregistré cette recherche Tweets programmés Divers - Rechercher + Rechercher Rechercher des tweets ou des utilisateurs Rechercher des utilisateurs Rechercher des tweets diff --git a/twidere/src/main/res-localized/values-gl/strings.xml b/twidere/src/main/res-localized/values-gl/strings.xml index 346d2a02d..573ec8abc 100644 --- a/twidere/src/main/res-localized/values-gl/strings.xml +++ b/twidere/src/main/res-localized/values-gl/strings.xml @@ -611,7 +611,7 @@ Se cadra xa tes gardada esta busca Chíos programados Scrapyard - Buscar + Buscar Buscar chíos ou usuarios Buscar chíos Chíos diff --git a/twidere/src/main/res-localized/values-hr/strings.xml b/twidere/src/main/res-localized/values-hr/strings.xml index 9601ce467..fae684dbc 100644 --- a/twidere/src/main/res-localized/values-hr/strings.xml +++ b/twidere/src/main/res-localized/values-hr/strings.xml @@ -501,7 +501,7 @@ Spremljene pretrage Planirani tweetovi Reciklažno dvorište - Pretraži + Pretraži Pretraži tweetove ili korisnike Pretraži Tweetove Tweetovi diff --git a/twidere/src/main/res-localized/values-hu/strings.xml b/twidere/src/main/res-localized/values-hu/strings.xml index bddead36d..5c51b1949 100644 --- a/twidere/src/main/res-localized/values-hu/strings.xml +++ b/twidere/src/main/res-localized/values-hu/strings.xml @@ -613,7 +613,7 @@ Talán egyszer már mentetted ezt a keresést Időzített tweet-ek Szemetes - Keresés + Keresés Keresés tweetek és felhasználók között Tweetek keresése Tweet diff --git a/twidere/src/main/res-localized/values-in/strings.xml b/twidere/src/main/res-localized/values-in/strings.xml index 2c47e9c6e..c132cb8fc 100644 --- a/twidere/src/main/res-localized/values-in/strings.xml +++ b/twidere/src/main/res-localized/values-in/strings.xml @@ -688,7 +688,7 @@ Mungkin anda sudah menyimpan pencarian ini Tweet terjadwal Scrapyard - Pencarian + Pencarian Pencarian tweets atau pengguna Cari Kicauan Kicauan diff --git a/twidere/src/main/res-localized/values-it/strings.xml b/twidere/src/main/res-localized/values-it/strings.xml index 1e9171c7f..4ff467183 100644 --- a/twidere/src/main/res-localized/values-it/strings.xml +++ b/twidere/src/main/res-localized/values-it/strings.xml @@ -601,7 +601,7 @@ Forse hai già salvato questa ricerca Tweet schedulati Discarica - Cerca + Cerca Cerca tweets o utenti Ricerca tweet Tweet diff --git a/twidere/src/main/res-localized/values-ja/strings.xml b/twidere/src/main/res-localized/values-ja/strings.xml index 24b43fd16..8274d0086 100644 --- a/twidere/src/main/res-localized/values-ja/strings.xml +++ b/twidere/src/main/res-localized/values-ja/strings.xml @@ -716,7 +716,7 @@ おそらく、既にこの検索は保存されています 定期ツイート ゴミ置き場 - 検索 + 検索 ツイートかユーザーの検索 ユーザー検索 ツイートの検索 diff --git a/twidere/src/main/res-localized/values-ko/strings.xml b/twidere/src/main/res-localized/values-ko/strings.xml index 78ef40a5b..1862fdfd2 100644 --- a/twidere/src/main/res-localized/values-ko/strings.xml +++ b/twidere/src/main/res-localized/values-ko/strings.xml @@ -618,7 +618,7 @@ 이 검색을 이미 저장한 것 같습니다. 예약 트윗 폐기된 설정 - 검색 + 검색 트윗이나 사용자 검색 트윗 검색 트윗 diff --git a/twidere/src/main/res-localized/values-nl/strings.xml b/twidere/src/main/res-localized/values-nl/strings.xml index 4906720d9..e525b3d07 100644 --- a/twidere/src/main/res-localized/values-nl/strings.xml +++ b/twidere/src/main/res-localized/values-nl/strings.xml @@ -620,7 +620,7 @@ Misschien had je deze zoekopdracht al bewaard Ingeplande tweets Schroothoop - Zoeken + Zoeken Zoek tweets of gebruikers Zoek Tweets Tweets diff --git a/twidere/src/main/res-localized/values-no/strings.xml b/twidere/src/main/res-localized/values-no/strings.xml index f38863c1b..c059dfec3 100644 --- a/twidere/src/main/res-localized/values-no/strings.xml +++ b/twidere/src/main/res-localized/values-no/strings.xml @@ -535,7 +535,7 @@ Lagrede søk Planlagte tweets Diverse - Søk + Søk Søk tweets eller brukere Søk tweets Tweets diff --git a/twidere/src/main/res-localized/values-pl/strings.xml b/twidere/src/main/res-localized/values-pl/strings.xml index 250eb6e40..fdf197c20 100644 --- a/twidere/src/main/res-localized/values-pl/strings.xml +++ b/twidere/src/main/res-localized/values-pl/strings.xml @@ -436,7 +436,7 @@ Użyj tego samego adresu do logowania przez OAuth Zapisz w galerii Zapisane wyniki wyszukiwania - Szukaj + Szukaj Szukaj tweetów lub użytkowników Szukaj tweetów Tweety diff --git a/twidere/src/main/res-localized/values-pt/strings.xml b/twidere/src/main/res-localized/values-pt/strings.xml index 5807341d6..b4beb5bab 100644 --- a/twidere/src/main/res-localized/values-pt/strings.xml +++ b/twidere/src/main/res-localized/values-pt/strings.xml @@ -624,7 +624,7 @@ Talvez você já tenha salvo esta busca Tweets agendados Interface - Procurar + Procurar Procurar por tweets ou usuários Buscar Tweets Tweets diff --git a/twidere/src/main/res-localized/values-ro/strings.xml b/twidere/src/main/res-localized/values-ro/strings.xml index 859c62643..db225776c 100644 --- a/twidere/src/main/res-localized/values-ro/strings.xml +++ b/twidere/src/main/res-localized/values-ro/strings.xml @@ -50,7 +50,7 @@ Twidere - Căutare + Căutare Configurări Autentificare Inregistrare diff --git a/twidere/src/main/res-localized/values-ru/strings.xml b/twidere/src/main/res-localized/values-ru/strings.xml index bc562af01..855697b8e 100644 --- a/twidere/src/main/res-localized/values-ru/strings.xml +++ b/twidere/src/main/res-localized/values-ru/strings.xml @@ -691,7 +691,7 @@ Возможно, вы уже сохранили этот поиск Запланированные твиты Прочие настройки вида - Поиск + Поиск Поиск твитов или пользователей Найти твиты Твиты diff --git a/twidere/src/main/res-localized/values-sv/strings.xml b/twidere/src/main/res-localized/values-sv/strings.xml index 408a9dda6..8c39b20c5 100644 --- a/twidere/src/main/res-localized/values-sv/strings.xml +++ b/twidere/src/main/res-localized/values-sv/strings.xml @@ -367,7 +367,7 @@ Säkerhet Använd samma URL för OAuth-signering Sparade sökningar - Sök + Sök Sök efter tweets eller användare Sök tweets Tweets diff --git a/twidere/src/main/res-localized/values-th/strings.xml b/twidere/src/main/res-localized/values-th/strings.xml index 9187e69b1..fc57cd6b4 100644 --- a/twidere/src/main/res-localized/values-th/strings.xml +++ b/twidere/src/main/res-localized/values-th/strings.xml @@ -622,7 +622,7 @@ คุณได้บันทึกผลการค้นหานี้ไปก่อนแล้ว ทวีตตั้งเวลาส่ง กองขยะ - ค้นหา + ค้นหา ค้นหาทวีตหรือผู้ใช้ ค้นหาทวีต ทวีต diff --git a/twidere/src/main/res-localized/values-tr/strings.xml b/twidere/src/main/res-localized/values-tr/strings.xml index d971f3dee..02edf8341 100644 --- a/twidere/src/main/res-localized/values-tr/strings.xml +++ b/twidere/src/main/res-localized/values-tr/strings.xml @@ -621,7 +621,7 @@ Belki de zaten bu arama kaydedilmiştir Zamanlanmış tweetler Scrapyard - Ara + Ara Tweet yada kullanıcı ara Tweet/ler ara Tweetler diff --git a/twidere/src/main/res-localized/values-uk/strings.xml b/twidere/src/main/res-localized/values-uk/strings.xml index 539d1251f..ec03d68b9 100644 --- a/twidere/src/main/res-localized/values-uk/strings.xml +++ b/twidere/src/main/res-localized/values-uk/strings.xml @@ -622,7 +622,7 @@ Мабуть ви вже зберегли цей пошуковий запит Заплановані твіти Смітник - Пошук + Пошук Пошук твітів або користувачів Пошук твітів Твіти diff --git a/twidere/src/main/res-localized/values-zh-rCN/strings.xml b/twidere/src/main/res-localized/values-zh-rCN/strings.xml index c1c759830..999cb3900 100644 --- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml +++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml @@ -718,7 +718,7 @@ 您可能已经保存过这个搜索了 被排期推文 垃圾场 - 搜索 + 搜索 搜索推文或用户 搜索用户 搜索推文 diff --git a/twidere/src/main/res-localized/values-zh-rHK/strings.xml b/twidere/src/main/res-localized/values-zh-rHK/strings.xml index a93b7e4cc..14b10c7f0 100644 --- a/twidere/src/main/res-localized/values-zh-rHK/strings.xml +++ b/twidere/src/main/res-localized/values-zh-rHK/strings.xml @@ -714,7 +714,7 @@ 可能您已經保存了這個搜尋 被排期推文 垃圾場 - 搜尋 + 搜尋 搜尋推文或使用者 搜尋使用者 搜尋推文 diff --git a/twidere/src/main/res-localized/values-zh/strings.xml b/twidere/src/main/res-localized/values-zh/strings.xml index a93b7e4cc..14b10c7f0 100644 --- a/twidere/src/main/res-localized/values-zh/strings.xml +++ b/twidere/src/main/res-localized/values-zh/strings.xml @@ -714,7 +714,7 @@ 可能您已經保存了這個搜尋 被排期推文 垃圾場 - 搜尋 + 搜尋 搜尋推文或使用者 搜尋使用者 搜尋推文 diff --git a/twidere/src/main/res/layout/activity_user_selector.xml b/twidere/src/main/res/layout/activity_user_selector.xml index 7f9a4eb7f..15e40b68f 100644 --- a/twidere/src/main/res/layout/activity_user_selector.xml +++ b/twidere/src/main/res/layout/activity_user_selector.xml @@ -53,7 +53,7 @@ android:layout_weight="0" android:background="?selectableItemBackground" android:color="?menuIconColor" - android:contentDescription="@string/search" + android:contentDescription="@string/action_search" android:src="@drawable/ic_action_search" tools:tint="?menuIconColor"/> diff --git a/twidere/src/main/res/layout/fragment_messages_conversation.xml b/twidere/src/main/res/layout/fragment_messages_conversation.xml index 19c6d6713..45b9ad1d3 100644 --- a/twidere/src/main/res/layout/fragment_messages_conversation.xml +++ b/twidere/src/main/res/layout/fragment_messages_conversation.xml @@ -32,7 +32,8 @@ layout="@layout/fragment_content_recyclerview" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/inputPanel"/> + android:layout_above="@+id/inputPanel" + android:layout_below="@+id/toolbar"/> + + + + \ No newline at end of file diff --git a/twidere/src/main/res/layout/layout_actionbar_message_user_picker.xml b/twidere/src/main/res/layout/layout_actionbar_message_user_picker.xml index 1fd8069c8..10d115bac 100644 --- a/twidere/src/main/res/layout/layout_actionbar_message_user_picker.xml +++ b/twidere/src/main/res/layout/layout_actionbar_message_user_picker.xml @@ -61,7 +61,7 @@ android:layout_width="@dimen/element_size_normal" android:layout_height="@dimen/element_size_normal" android:layout_gravity="end|center_vertical" - android:contentDescription="@string/search" + android:contentDescription="@string/action_search" android:scaleType="centerInside" android:src="@drawable/ic_action_search" app:backgroundTintMode="src_atop"/> diff --git a/twidere/src/main/res/menu/menu_account_dashboard.xml b/twidere/src/main/res/menu/menu_account_dashboard.xml index cee12469b..7351fdfe8 100644 --- a/twidere/src/main/res/menu/menu_account_dashboard.xml +++ b/twidere/src/main/res/menu/menu_account_dashboard.xml @@ -6,7 +6,7 @@ + android:title="@string/action_search"/> + android:title="@string/action_conversation_info"/> + \ No newline at end of file diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml index fdd8fe8a0..b18fef53e 100644 --- a/twidere/src/main/res/values/strings.xml +++ b/twidere/src/main/res/values/strings.xml @@ -90,6 +90,7 @@ Save saving search + Search Select all Select none Select user @@ -942,7 +943,6 @@ Scrapyard - Search Search tweets or users Search users Search Tweets @@ -1115,6 +1115,7 @@ Nicknames Open source license Twidere ∞ + Search Select users Set nickname Tweet diff --git a/twidere/src/main/res/xml/preferences_keyboard_shortcuts.xml b/twidere/src/main/res/xml/preferences_keyboard_shortcuts.xml index dc3886e3c..404524b11 100644 --- a/twidere/src/main/res/xml/preferences_keyboard_shortcuts.xml +++ b/twidere/src/main/res/xml/preferences_keyboard_shortcuts.xml @@ -11,7 +11,7 @@ android:title="@string/action_compose"/> + android:title="@string/action_search"/>