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

fixed #821

This commit is contained in:
Mariotaku Lee 2017-05-05 22:50:02 +08:00
parent 3c73938d4a
commit f0b844c102
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/SearchFragment.kt
View File

@ -67,6 +67,13 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface,
val query: String
get() = arguments.getString(EXTRA_QUERY)
val composePrefix: String
get() = when {
query.startsWith("@") || query.startsWith("\uff20") -> query
query.startsWith("#") || query.startsWith("\uff03") -> query
else -> "#$query"
}
private val accountType: String?
get() {
val am = AccountManager.get(context)
@ -126,7 +133,7 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface,
override fun onPrepareOptionsMenu(menu: Menu) {
if (isDetached || activity == null) return
val item = menu.findItem(R.id.compose)
item.title = getString(R.string.tweet_hashtag, query)
item.title = getString(R.string.action_format_search_update_status, composePrefix)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -142,11 +149,7 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface,
R.id.compose -> {
val intent = Intent(activity, ComposeActivity::class.java)
intent.action = INTENT_ACTION_COMPOSE
if (query.startsWith("@") || query.startsWith("\uff20")) {
intent.putExtra(Intent.EXTRA_TEXT, query)
} else {
intent.putExtra(Intent.EXTRA_TEXT, String.format("#%s ", query))
}
intent.putExtra(Intent.EXTRA_TEXT, "$composePrefix ")
intent.putExtra(EXTRA_ACCOUNT_KEY, accountKey)
startActivity(intent)
}

1
twidere/src/main/res/values/strings.xml
View File

@ -65,6 +65,7 @@
<string name="action_finish">Finish</string>
<string name="action_follow">Follow</string>
<string name="action_following">following</string>
<string name="action_format_search_update_status">Tweet <xliff:g id="text">%1$s</xliff:g></string>
<string name="action_getting_status">getting tweet</string>
<string name="action_getting_user_lists">getting user lists</string>
<!-- [verb] Perform import action -->