From df7abdb7fa7e92bb094c3b9f5f1de694471ed2a4 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Tue, 27 Dec 2016 00:26:09 +0800 Subject: [PATCH] updated strings --- twidere/src/main/AndroidManifest.xml | 2 +- ...xportImportTypeSelectorDialogFragment.java | 2 +- .../FavoriteTimelineTabConfiguration.java | 4 +- .../impl/UserTimelineTabConfiguration.java | 2 +- .../KeyboardShortcutPreference.java | 2 +- .../twidere/util/AsyncTwitterWrapper.java | 4 +- .../util/KeyboardShortcutsHandler.java | 6 +- .../org/mariotaku/twidere/util/Utils.java | 2 +- .../twidere/activity/ComposeActivity.kt | 2 +- .../twidere/activity/LinkHandlerActivity.kt | 12 +- .../twidere/activity/MediaViewerActivity.kt | 4 +- .../twidere/extension/DraftExtensions.kt | 4 +- .../AbsUserMuteBlockDialogFragment.kt | 7 +- .../fragment/AccountsDashboardFragment.kt | 4 +- .../fragment/ColorPickerDialogFragment.kt | 2 +- .../fragment/CreateUserBlockDialogFragment.kt | 4 + .../fragment/CreateUserMuteDialogFragment.kt | 4 + .../twidere/fragment/CustomTabsFragment.kt | 2 +- .../fragment/RetweetQuoteDialogFragment.kt | 8 +- .../twidere/fragment/SearchFragment.kt | 4 +- .../fragment/SetUserNicknameDialogFragment.kt | 4 +- .../twidere/fragment/StatusFragment.kt | 4 +- .../twidere/fragment/UserFragment.kt | 14 +-- .../fragment/UserProfileEditorFragment.kt | 8 +- .../fragment/filter/FiltersFragment.kt | 11 +- .../org/mariotaku/twidere/util/MenuUtils.kt | 6 +- .../util/theme/TwidereAppearanceCreator.kt | 10 ++ .../activity_keyboard_shortcut_input.xml | 2 +- .../layout/activity_user_list_selector.xml | 2 +- .../res/layout/dialog_custom_tab_editor.xml | 2 +- .../layout/dialog_user_list_detail_editor.xml | 16 +-- .../layout/fragment_user_profile_editor.xml | 9 +- .../res/layout/grid_item_media_editor.xml | 4 +- .../main/res/layout/header_status_common.xml | 2 +- twidere/src/main/res/layout/header_user.xml | 2 +- .../layout/layout_action_item_favorite.xml | 2 +- ...layout_media_viewer_texture_video_view.xml | 2 +- .../src/main/res/layout/list_item_draft.xml | 2 +- .../src/main/res/layout/list_item_status.xml | 6 +- .../src/main/res/layout/list_item_user.xml | 4 +- .../main/res/menu/action_direct_message.xml | 2 +- .../main/res/menu/action_manager_account.xml | 4 +- .../res/menu/action_multi_select_contents.xml | 6 +- .../res/menu/action_multi_select_drafts.xml | 4 +- .../res/menu/action_multi_select_items.xml | 2 +- twidere/src/main/res/menu/action_status.xml | 4 +- .../src/main/res/menu/action_user_list.xml | 2 +- .../main/res/menu/action_user_list_member.xml | 2 +- .../main/res/menu/menu_account_dashboard.xml | 8 +- twidere/src/main/res/menu/menu_compose.xml | 2 +- .../src/main/res/menu/menu_detail_status.xml | 14 +-- .../src/main/res/menu/menu_media_viewer.xml | 2 +- .../src/main/res/menu/menu_profile_editor.xml | 2 +- twidere/src/main/res/menu/menu_search.xml | 2 +- twidere/src/main/res/menu/menu_user_list.xml | 4 +- .../src/main/res/menu/menu_user_profile.xml | 4 +- twidere/src/main/res/values/arrays.xml | 4 +- twidere/src/main/res/values/strings.xml | 116 ++++++++++-------- .../xml/preferences_keyboard_shortcuts.xml | 6 +- 59 files changed, 210 insertions(+), 173 deletions(-) diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml index ec6405644..8d356e4a9 100644 --- a/twidere/src/main/AndroidManifest.xml +++ b/twidere/src/main/AndroidManifest.xml @@ -292,7 +292,7 @@ result) { if (result.hasData()) { - final String message = context.getString(R.string.search_name_saved, result.getData().getQuery()); + final String message = context.getString(R.string.message_search_name_saved, result.getData().getQuery()); Utils.showOkMessage(context, message, false); } else if (result.hasException()) { final Exception exception = result.getException(); @@ -1231,7 +1231,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper { @Override protected void onPostExecute(final SingleResponse result) { if (result.hasData()) { - final String message = context.getString(R.string.search_name_deleted, result.getData().getQuery()); + final String message = context.getString(R.string.message_search_name_deleted, result.getData().getQuery()); Utils.showOkMessage(context, message, false); getBus().post(new SavedSearchDestroyedEvent(mAccountKey, mSearchId)); } else { 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 f1fd6e121..90f2fc3ed 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java @@ -44,9 +44,9 @@ public class KeyboardShortcutsHandler implements KeyboardShortcutConstants { sActionLabelMap.put(ACTION_SEARCH, R.string.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.reply); - sActionLabelMap.put(ACTION_STATUS_RETWEET, R.string.retweet); - sActionLabelMap.put(ACTION_STATUS_FAVORITE, R.string.like); + sActionLabelMap.put(ACTION_STATUS_REPLY, R.string.action_reply); + sActionLabelMap.put(ACTION_STATUS_RETWEET, R.string.action_retweet); + sActionLabelMap.put(ACTION_STATUS_FAVORITE, R.string.action_like); sActionLabelMap.put(ACTION_NAVIGATION_PREVIOUS, R.string.previous_item); sActionLabelMap.put(ACTION_NAVIGATION_NEXT, R.string.next_item); sActionLabelMap.put(ACTION_NAVIGATION_PAGE_DOWN, R.string.page_down); diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java b/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java index 449097962..918d0c73c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java @@ -1181,7 +1181,7 @@ public final class Utils implements Constants { intent.putExtra(Intent.EXTRA_SUBJECT, subject); intent.putExtra(Intent.EXTRA_TEXT, status.text_plain); intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - context.startActivity(Intent.createChooser(intent, context.getString(R.string.share))); + context.startActivity(Intent.createChooser(intent, context.getString(R.string.action_share))); } public static void stopListView(final AbsListView list) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt index c6eb0f9bd..eed4ab086 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -1793,7 +1793,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener (activity as ComposeActivity).setMediaAltText(arguments.getInt(EXTRA_POSITION), ParseUtils.parseString(editText.text)) } - builder.setNeutralButton(R.string.clear) { dialogInterface, i -> + builder.setNeutralButton(R.string.action_clear) { dialogInterface, i -> (activity as ComposeActivity).setMediaAltText(arguments.getInt(EXTRA_POSITION), null) } val dialog = builder.create() 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 6336d8fdc..2d5233c62 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt @@ -287,16 +287,16 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro setTitle(R.string.status) } LINK_ID_USER -> { - setTitle(R.string.user) + setTitle(R.string.title_user) } LINK_ID_USER_TIMELINE -> { setTitle(R.string.statuses) } LINK_ID_USER_FAVORITES -> { if (preferences.getBoolean(SharedPreferenceConstants.KEY_I_WANT_MY_STARS_BACK)) { - setTitle(R.string.favorites) + setTitle(R.string.title_favorites) } else { - setTitle(R.string.likes) + setTitle(R.string.title_likes) } } LINK_ID_USER_FOLLOWERS -> { @@ -366,16 +366,16 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro setTitle(R.string.accounts) } LINK_ID_DRAFTS -> { - setTitle(R.string.drafts) + setTitle(R.string.title_drafts) } LINK_ID_FILTERS -> { - setTitle(R.string.filters) + setTitle(R.string.title_filters) } LINK_ID_MAP -> { setTitle(R.string.view_map) } LINK_ID_PROFILE_EDITOR -> { - setTitle(R.string.edit_profile) + setTitle(R.string.title_edit_profile) } LINK_ID_SCHEDULED_STATUSES -> { title = getString(R.string.scheduled_statuses) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index 6fa1c3553..2d28385e1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -152,7 +152,7 @@ class MediaViewerActivity : BaseActivity(), IExtendedActivity, IMediaViewerActiv val intent = Intent(Intent.ACTION_SEND) intent.type = "text/plain" intent.putExtra(Intent.EXTRA_TEXT, media.url) - startActivity(Intent.createChooser(intent, getString(R.string.share))) + startActivity(Intent.createChooser(intent, getString(R.string.action_share))) } return true } @@ -373,7 +373,7 @@ class MediaViewerActivity : BaseActivity(), IExtendedActivity, IMediaViewerActiv intent.addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION) } activity.processShareIntent(intent) - startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.share)), + startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.action_share)), REQUEST_SHARE_MEDIA) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DraftExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DraftExtensions.kt index a4dbaf37e..94cbebad4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DraftExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DraftExtensions.kt @@ -108,10 +108,10 @@ fun Draft.getActionName(context: Context): String? { return context.getString(R.string.update_status) } Draft.Action.REPLY -> { - return context.getString(R.string.reply) + return context.getString(R.string.action_reply) } Draft.Action.QUOTE -> { - return context.getString(R.string.quote) + return context.getString(R.string.action_quote) } Draft.Action.SEND_DIRECT_MESSAGE, Draft.Action.SEND_DIRECT_MESSAGE_COMPAT -> { return context.getString(R.string.send_direct_message) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt index 67b0c59d7..bc5a540ff 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt @@ -48,7 +48,7 @@ abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInte val builder = AlertDialog.Builder(context) builder.setTitle(getTitle(user)) builder.setView(R.layout.dialog_block_mute_filter_user_confirm) - builder.setPositiveButton(android.R.string.ok, this) + builder.setPositiveButton(getPositiveButtonTitle(user), this) builder.setNegativeButton(android.R.string.cancel, null) val dialog = builder.create() dialog.setOnShowListener { @@ -65,6 +65,7 @@ abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInte abstract fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean) - abstract fun getTitle(user: ParcelableUser): String - abstract fun getMessage(user: ParcelableUser): String + protected abstract fun getTitle(user: ParcelableUser): String + protected abstract fun getMessage(user: ParcelableUser): String + protected open fun getPositiveButtonTitle(user: ParcelableUser): String = getString(android.R.string.ok) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt index 609cce7b8..55392cb69 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt @@ -282,9 +282,9 @@ class AccountsDashboardFragment : BaseSupportFragment(), LoaderCallbacks 0) { - navigationView.menu.findItem(R.id.drafts).title = "${getString(R.string.drafts)} (${data.draftsCount})" + navigationView.menu.findItem(R.id.drafts).title = "${getString(R.string.title_drafts)} (${data.draftsCount})" } else { - navigationView.menu.findItem(R.id.drafts).title = getString(R.string.drafts) + navigationView.menu.findItem(R.id.drafts).title = getString(R.string.title_drafts) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt index 707db3ee8..66649c041 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt @@ -70,7 +70,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL builder.setView(me.uucky.colorpicker.R.layout.cp__dialog_color_picker) builder.setPositiveButton(android.R.string.ok, this) if (args.getBoolean(EXTRA_CLEAR_BUTTON, false)) { - builder.setNeutralButton(R.string.clear, this) + builder.setNeutralButton(R.string.action_clear, this) } builder.setNegativeButton(android.R.string.cancel, this) val dialog = builder.create() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt index 038d50b91..2640f525f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt @@ -37,6 +37,10 @@ class CreateUserBlockDialogFragment : AbsUserMuteBlockDialogFragment() { return getString(R.string.block_user, displayName) } + override fun getPositiveButtonTitle(user: ParcelableUser): String { + return getString(R.string.action_block) + } + override fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean) { twitterWrapper.createBlockAsync(user.account_key, user.key, filterEverywhere) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt index d339b9ab1..3b286e7a4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt @@ -38,6 +38,10 @@ class CreateUserMuteDialogFragment : AbsUserMuteBlockDialogFragment() { return getString(R.string.mute_user, displayName) } + override fun getPositiveButtonTitle(user: ParcelableUser): String { + return getString(R.string.action_mute) + } + override fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean) { twitterWrapper.createMuteAsync(user.account_key, user.key, filterEverywhere) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt index 929354fdd..6aa788d1b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt @@ -389,7 +389,7 @@ class CustomTabsFragment : BaseSupportFragment(), LoaderCallbacks, Mult override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val builder = AlertDialog.Builder(context) builder.setView(R.layout.dialog_custom_tab_editor) - builder.setPositiveButton(R.string.save, null) + builder.setPositiveButton(R.string.action_save, null) builder.setNegativeButton(android.R.string.cancel, null) val dialog = builder.create() dialog.setOnShowListener(this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.kt index 1729c8ff1..4897f9016 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.kt @@ -67,9 +67,9 @@ class RetweetQuoteDialogFragment : BaseDialogFragment() { builder.setView(R.layout.dialog_status_quote_retweet) builder.setTitle(R.string.retweet_quote_confirm_title) - builder.setPositiveButton(R.string.retweet, null) + builder.setPositiveButton(R.string.action_retweet, null) builder.setNegativeButton(android.R.string.cancel, null) - builder.setNeutralButton(R.string.quote) { dialog, which -> + builder.setNeutralButton(R.string.action_quote) { dialog, which -> val intent = Intent(INTENT_ACTION_QUOTE) val menu = popupMenu!!.menu val quoteOriginalStatus = menu.findItem(R.id.quote_original_status) @@ -181,10 +181,10 @@ class RetweetQuoteDialogFragment : BaseDialogFragment() { positiveButton.setText(R.string.cancel_retweet) positiveButton.isEnabled = true } else if (useQuote(false, credentials)) { - positiveButton.setText(R.string.retweet) + positiveButton.setText(R.string.action_retweet) positiveButton.isEnabled = true } else { - positiveButton.setText(R.string.retweet) + positiveButton.setText(R.string.action_retweet) positiveButton.isEnabled = !status.user_is_protected } val textCountView = (dialog.findViewById(R.id.comment_text_count) as StatusTextCountView?)!! diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SearchFragment.kt index 250c69990..48185cf13 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SearchFragment.kt @@ -116,9 +116,9 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface, override fun addTabs(adapter: SupportTabsAdapter) { adapter.addTab(cls = StatusesSearchFragment::class.java, args = arguments, - name = getString(R.string.statuses), icon = DrawableHolder.resource(R.drawable.ic_action_twitter)) + name = getString(R.string.search_type_statuses), icon = DrawableHolder.resource(R.drawable.ic_action_twitter)) adapter.addTab(cls = SearchUsersFragment::class.java, args = arguments, - name = getString(R.string.users), icon = DrawableHolder.resource(R.drawable.ic_action_user)) + name = getString(R.string.search_type_users), icon = DrawableHolder.resource(R.drawable.ic_action_user)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt index fca817fe3..e930d4592 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt @@ -59,10 +59,10 @@ class SetUserNicknameDialogFragment : BaseDialogFragment(), OnClickListener { val nick: String? = args.getString(EXTRA_NAME) val context = activity val builder = AlertDialog.Builder(context) - builder.setTitle(R.string.set_nickname) + builder.setTitle(R.string.title_set_nickname) builder.setPositiveButton(android.R.string.ok, this) if (!TextUtils.isEmpty(nick)) { - builder.setNeutralButton(R.string.clear, this) + builder.setNeutralButton(R.string.action_clear, this) } builder.setNegativeButton(android.R.string.cancel, null) builder.setView(R.layout.dialog_edit_user_nickname) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt index c991dde1a..1ed30016b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt @@ -1350,10 +1350,10 @@ class StatusFragment : BaseSupportFragment(), LoaderCallbacks { - label = adapter.context.getString(R.string.retweets) + label = adapter.context.getString(R.string.count_label_retweets) } KEY_FAVORITE_COUNT -> { - label = adapter.context.getString(R.string.favorites) + label = adapter.context.getString(R.string.title_favorites) } else -> { throw UnsupportedOperationException("Unsupported type " + count.type) 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 a0615e6af..9fececd68 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -271,7 +271,7 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener return } if (user.account_key.maybeEquals(user.key)) { - followContainer.follow.setText(R.string.edit) + followContainer.follow.setText(R.string.action_edit) followContainer.follow.visibility = View.VISIBLE relationship = userRelationship return @@ -298,15 +298,15 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener pagesContent.visibility = View.VISIBLE } if (userRelationship.blocking) { - followContainer.follow.setText(R.string.unblock) + followContainer.follow.setText(R.string.action_unblock) } else if (userRelationship.blocked_by) { followContainer.follow.setText(R.string.action_block) } else if (userRelationship.following) { - followContainer.follow.setText(R.string.unfollow) + followContainer.follow.setText(R.string.action_unfollow) } else if (user.is_follow_request_sent) { followContainer.follow.setText(R.string.requested) } else { - followContainer.follow.setText(R.string.follow) + followContainer.follow.setText(R.string.action_follow) } followContainer.follow.compoundDrawablePadding = Math.round(followContainer.follow.textSize * 0.25f) followingYouIndicator.visibility = if (userRelationship.followed_by) View.VISIBLE else View.GONE @@ -806,7 +806,7 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener val blockItem = menu.findItem(R.id.block) if (blockItem != null) { ActionIconDrawable.setMenuHighlight(blockItem, TwidereMenuInfo(userRelationship.blocking)) - blockItem.setTitle(if (userRelationship.blocking) R.string.unblock else R.string.block) + blockItem.setTitle(if (userRelationship.blocking) R.string.action_unblock else R.string.action_block) } val muteItem = menu.findItem(R.id.mute_user) if (muteItem != null) { @@ -1348,10 +1348,10 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener pagerAdapter.addTab(cls = UserMediaTimelineFragment::class.java, args = tabArgs, name = getString(R.string.media), icon = DrawableHolder.resource(R.drawable.ic_action_gallery), type = TAB_TYPE_MEDIA, position = TAB_POSITION_MEDIA) if (preferences.getBoolean(KEY_I_WANT_MY_STARS_BACK)) { - pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.favorites), + pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.title_favorites), icon = DrawableHolder.resource(R.drawable.ic_action_star), type = TAB_TYPE_FAVORITES, position = TAB_POSITION_FAVORITES) } else { - pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.likes), + pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.title_likes), icon = DrawableHolder.resource(R.drawable.ic_action_heart), type = TAB_TYPE_FAVORITES, position = TAB_POSITION_FAVORITES) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt index 1b136cfd6..2b7a25cb1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -284,10 +284,12 @@ class UserProfileEditorFragment : BaseSupportFragment(), OnSizeChangedListener, mediaLoader.displayImage(profileBackground, user.profile_background_url) linkColor.color = user.link_color backgroundColor.color = user.background_color - if (USER_TYPE_FANFOU_COM == user.key.host) { - editProfileBanner.visibility = View.GONE - } else { + if (USER_TYPE_TWITTER_COM == user.key.host) { editProfileBanner.visibility = View.VISIBLE + editProfileBackground.visibility = View.GONE + } else { + editProfileBanner.visibility = View.GONE + editProfileBackground.visibility = View.VISIBLE } } else { progressContainer.visibility = View.GONE diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersFragment.kt index 92853ae45..f56d41b91 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersFragment.kt @@ -22,8 +22,7 @@ package org.mariotaku.twidere.fragment.filter import android.os.Bundle import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.SupportTabsAdapter -import org.mariotaku.twidere.fragment.* -import org.mariotaku.twidere.fragment.filter.BaseFiltersFragment.* +import org.mariotaku.twidere.fragment.AbsToolbarTabPagesFragment class FiltersFragment : AbsToolbarTabPagesFragment() { @@ -33,10 +32,10 @@ class FiltersFragment : AbsToolbarTabPagesFragment() { } override fun addTabs(adapter: SupportTabsAdapter) { - adapter.addTab(cls = FilteredUsersFragment::class.java, name = getString(R.string.users)) - adapter.addTab(cls = FilteredKeywordsFragment::class.java, name = getString(R.string.keywords)) - adapter.addTab(cls = FilteredSourcesFragment::class.java, name = getString(R.string.sources)) - adapter.addTab(cls = FilteredLinksFragment::class.java, name = getString(R.string.links)) + adapter.addTab(cls = FilteredUsersFragment::class.java, name = getString(R.string.filter_type_users)) + adapter.addTab(cls = FilteredKeywordsFragment::class.java, name = getString(R.string.filter_type_keywords)) + adapter.addTab(cls = FilteredSourcesFragment::class.java, name = getString(R.string.filter_type_sources)) + adapter.addTab(cls = FilteredLinksFragment::class.java, name = getString(R.string.filter_type_links)) adapter.addTab(cls = FilterSettingsFragment::class.java, name = getString(R.string.settings)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt index 7a0bad6b9..79b8562d4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt @@ -150,7 +150,7 @@ object MenuUtils { val retweet = menu.findItem(R.id.retweet) if (retweet != null) { ActionIconDrawable.setMenuHighlight(retweet, TwidereMenuInfo(isMyRetweet, retweetHighlight)) - retweet.setTitle(if (isMyRetweet) R.string.cancel_retweet else R.string.retweet) + retweet.setTitle(if (isMyRetweet) R.string.cancel_retweet else R.string.action_retweet) } val favorite = menu.findItem(R.id.favorite) if (favorite != null) { @@ -181,9 +181,9 @@ object MenuUtils { } } if (useStar) { - favorite.setTitle(if (isFavorite) R.string.unfavorite else R.string.favorite) + favorite.setTitle(if (isFavorite) R.string.action_unfavorite else R.string.action_favorite) } else { - favorite.setTitle(if (isFavorite) R.string.undo_like else R.string.like) + favorite.setTitle(if (isFavorite) R.string.action_undo_like else R.string.action_like) } } val translate = menu.findItem(R.id.translate) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/theme/TwidereAppearanceCreator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/theme/TwidereAppearanceCreator.kt index 960b34e53..b0283b095 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/theme/TwidereAppearanceCreator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/theme/TwidereAppearanceCreator.kt @@ -5,9 +5,11 @@ import android.support.annotation.ColorInt import android.util.AttributeSet import android.view.View import com.pnikosis.materialishprogress.ProgressWheel +import com.rengwuxian.materialedittext.MaterialEditText import org.mariotaku.chameleon.Chameleon import org.mariotaku.chameleon.ChameleonView import org.mariotaku.chameleon.view.ChameleonSwitchCompat +import org.mariotaku.chameleon.view.ChameleonTextView import org.mariotaku.multivalueswitch.library.MultiValueSwitch object TwidereAppearanceCreator : Chameleon.AppearanceCreator { @@ -19,6 +21,9 @@ object TwidereAppearanceCreator : Chameleon.AppearanceCreator { is MultiValueSwitch -> { return ChameleonSwitchCompat.Appearance.create(theme) } + is MaterialEditText -> { + return ChameleonTextView.Appearance.create(view, context, attributeSet, theme) + } } return null } @@ -33,6 +38,11 @@ object TwidereAppearanceCreator : Chameleon.AppearanceCreator { appearance as ChameleonSwitchCompat.Appearance setMultiValueSwitchTint(view, appearance.accentColor, appearance.isDark) } + is MaterialEditText -> { + appearance as ChameleonTextView.Appearance + ChameleonTextView.Appearance.apply(view, appearance) + view.setPrimaryColor(appearance.tintColor) + } } } diff --git a/twidere/src/main/res/layout/activity_keyboard_shortcut_input.xml b/twidere/src/main/res/layout/activity_keyboard_shortcut_input.xml index dd38096cb..72c7aeca8 100644 --- a/twidere/src/main/res/layout/activity_keyboard_shortcut_input.xml +++ b/twidere/src/main/res/layout/activity_keyboard_shortcut_input.xml @@ -81,7 +81,7 @@ android:layout_weight="1" android:maxLines="2" android:minHeight="@dimen/element_size_normal" - android:text="@string/clear" + android:text="@string/action_clear" android:textSize="14sp"/>