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

compose code cleanup

This commit is contained in:
Mariotaku Lee 2017-04-14 17:01:45 +08:00
parent 0b1ccb45ab
commit 5caa3986c3
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
4 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
twidere/src/main/kotlin/org/mariotaku/ktextension/BundleExtensions.kt
View File

@ -37,10 +37,12 @@ operator fun Bundle.set(key: String, value: Array<String>?) {
return putStringArray(key, value)
}
fun <T> Bundle.getTypedArray(key: String, creator: Parcelable.Creator<T>): Array<T> {
return getParcelableArray(key).toTypedArray(creator)
inline fun <reified T> Bundle.getTypedArray(key: String): Array<T> {
val parcelable = getParcelableArray(key)
return Array(parcelable.size) { parcelable[it] as T }
}
fun <T> Bundle.getNullableTypedArray(key: String, creator: Parcelable.Creator<T>): Array<T>? {
return getParcelableArray(key)?.toTypedArray(creator)
inline fun <reified T> Bundle.getNullableTypedArray(key: String): Array<T>? {
val parcelable = getParcelableArray(key) ?: return null
return Array(parcelable.size) { parcelable[it] as T }
}

89
twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
View File

@ -33,7 +33,6 @@ import android.graphics.Rect
import android.location.*
import android.net.Uri
import android.os.Bundle
import android.os.Parcelable
import android.support.v4.app.ActivityCompat
import android.support.v4.app.DialogFragment
import android.support.v7.app.AlertDialog
@ -274,27 +273,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
itemTouchHelper.attachToRecyclerView(attachedMediaPreview)
attachedMediaPreview.addItemDecoration(PreviewGridItemDecoration(resources.getDimensionPixelSize(R.dimen.element_spacing_small)))
if (savedInstanceState != null) {
// Restore from previous saved state
val selected = savedInstanceState.getTypedArray(EXTRA_ACCOUNT_KEYS, UserKey.CREATOR)
accountsAdapter.setSelectedAccountKeys(*selected)
possiblySensitive = savedInstanceState.getBoolean(EXTRA_IS_POSSIBLY_SENSITIVE)
val mediaList = savedInstanceState.getParcelableArrayList<ParcelableMediaUpdate>(EXTRA_MEDIA)
if (mediaList != null) {
addMedia(mediaList)
}
inReplyToStatus = savedInstanceState.getParcelable(EXTRA_STATUS)
mentionUser = savedInstanceState.getParcelable(EXTRA_USER)
draft = savedInstanceState.getParcelable(EXTRA_DRAFT)
shouldSaveAccounts = savedInstanceState.getBoolean(EXTRA_SHOULD_SAVE_ACCOUNTS)
originalText = savedInstanceState.getString(EXTRA_ORIGINAL_TEXT)
draftUniqueId = savedInstanceState.getString(EXTRA_DRAFT_UNIQUE_ID)
scheduleInfo = savedInstanceState.getParcelable(EXTRA_SCHEDULE_INFO)
showLabelAndHint(intent)
} else {
if (savedInstanceState == null) {
// The context was first created
val notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
val notificationAccount = intent.getParcelableExtra<UserKey>(EXTRA_NOTIFICATION_ACCOUNT)
val notificationAccount = intent.getParcelableExtra<UserKey?>(EXTRA_NOTIFICATION_ACCOUNT)
if (notificationId != -1) {
twitterWrapper.clearNotificationAsync(notificationId, notificationAccount)
}
@ -304,13 +286,13 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
showLabelAndHint(intent)
val selectedAccountKeys = accountsAdapter.selectedAccountKeys
if (selectedAccountKeys.isNullOrEmpty()) {
val idsInPrefs: Array<UserKey> = kPreferences[composeAccountsKey] ?: emptyArray()
val intersection: Array<UserKey> = defaultAccountKeys.intersect(listOf(*idsInPrefs)).toTypedArray()
val idsInPrefs = kPreferences[composeAccountsKey]?.asList() ?: emptyList()
val intersection = defaultAccountKeys.intersect(idsInPrefs)
if (intersection.isEmpty()) {
accountsAdapter.setSelectedAccountKeys(*defaultAccountKeys)
accountsAdapter.selectedAccountKeys = defaultAccountKeys
} else {
accountsAdapter.setSelectedAccountKeys(*intersection)
accountsAdapter.selectedAccountKeys = intersection.toTypedArray()
}
}
originalText = ParseUtils.parseString(editText.text)
@ -463,7 +445,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
override fun onSaveInstanceState(outState: Bundle) {
outState.putParcelableArray(EXTRA_ACCOUNT_KEYS, accountsAdapter.selectedAccountKeys)
outState.putParcelableArrayList(EXTRA_MEDIA, ArrayList<Parcelable>(mediaList))
outState.putParcelableArrayList(EXTRA_MEDIA, ArrayList(mediaList))
outState.putBoolean(EXTRA_IS_POSSIBLY_SENSITIVE, possiblySensitive)
outState.putParcelable(EXTRA_STATUS, inReplyToStatus)
outState.putParcelable(EXTRA_USER, mentionUser)
@ -475,6 +457,26 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
super.onSaveInstanceState(outState)
}
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
super.onRestoreInstanceState(savedInstanceState)
// Restore from previous saved state
accountsAdapter.selectedAccountKeys = savedInstanceState
.getNullableTypedArray(EXTRA_ACCOUNT_KEYS) ?: emptyArray()
possiblySensitive = savedInstanceState.getBoolean(EXTRA_IS_POSSIBLY_SENSITIVE)
val mediaList = savedInstanceState.getParcelableArrayList<ParcelableMediaUpdate>(EXTRA_MEDIA)
if (mediaList != null) {
addMedia(mediaList)
}
inReplyToStatus = savedInstanceState.getParcelable(EXTRA_STATUS)
mentionUser = savedInstanceState.getParcelable(EXTRA_USER)
draft = savedInstanceState.getParcelable(EXTRA_DRAFT)
shouldSaveAccounts = savedInstanceState.getBoolean(EXTRA_SHOULD_SAVE_ACCOUNTS)
originalText = savedInstanceState.getString(EXTRA_ORIGINAL_TEXT)
draftUniqueId = savedInstanceState.getString(EXTRA_DRAFT_UNIQUE_ID)
scheduleInfo = savedInstanceState.getParcelable(EXTRA_SCHEDULE_INFO)
showLabelAndHint(intent)
}
override fun onClick(view: View) {
when (view) {
updateStatus -> {
@ -993,7 +995,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
editText.setText(String.format("@%s ", user.screen_name))
val selection_end = editText.length()
editText.setSelection(selection_end)
accountsAdapter.setSelectedAccountKeys(user.account_key)
accountsAdapter.selectedAccountKeys = arrayOf(user.account_key)
return true
}
@ -1001,7 +1003,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
if (status == null) return false
editText.setText(Utils.getQuoteStatus(this, status))
editText.setSelection(0)
accountsAdapter.setSelectedAccountKeys(status.account_key)
accountsAdapter.selectedAccountKeys = arrayOf(status.account_key)
showQuoteLabelAndHint(status)
return true
}
@ -1051,7 +1053,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
val selectionEnd = editText.length()
editText.setSelection(selectionStart, selectionEnd)
accountsAdapter.setSelectedAccountKeys(status.account_key)
accountsAdapter.selectedAccountKeys = arrayOf(status.account_key)
showReplyLabelAndHint(status)
return true
}
@ -1062,7 +1064,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
editText.setText(draft.text)
val selectionEnd = editText.length()
editText.setSelection(selectionEnd)
accountsAdapter.setSelectedAccountKeys(*draft.account_keys ?: emptyArray())
accountsAdapter.selectedAccountKeys = draft.account_keys ?: emptyArray()
if (draft.media != null) {
addMedia(Arrays.asList(*draft.media))
}
@ -1082,11 +1084,11 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
val hasAccountKeys: Boolean
if (intent.hasExtra(EXTRA_ACCOUNT_KEYS)) {
val accountKeys = intent.getParcelableArrayExtra(EXTRA_ACCOUNT_KEYS).toTypedArray(UserKey.CREATOR)
accountsAdapter.setSelectedAccountKeys(*accountKeys)
accountsAdapter.selectedAccountKeys = accountKeys
hasAccountKeys = true
} else if (intent.hasExtra(EXTRA_ACCOUNT_KEY)) {
val accountKey = intent.getParcelableExtra<UserKey>(EXTRA_ACCOUNT_KEY)
accountsAdapter.setSelectedAccountKeys(accountKey)
accountsAdapter.selectedAccountKeys = arrayOf(accountKey)
hasAccountKeys = true
} else {
hasAccountKeys = false
@ -1207,7 +1209,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
screenNames.filterNot { it.equals(myScreenName, ignoreCase = true) }
.forEach { editText.append("@$it ") }
editText.setSelection(editText.length())
accountsAdapter.setSelectedAccountKeys(accountKey)
accountsAdapter.selectedAccountKeys = arrayOf(accountKey)
this.inReplyToStatus = inReplyToStatus
return true
}
@ -1773,25 +1775,20 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
setHasStableIds(true)
}
override fun getItemId(position: Int): Long {
return accounts!![position].hashCode().toLong()
}
val selectedAccountKeys: Array<UserKey>
var selectedAccountKeys: Array<UserKey>
get() {
val accounts = accounts ?: return emptyArray()
return accounts.filter { selection[it.key] ?: false }
.map { it.key }
.toTypedArray()
}
fun setSelectedAccountKeys(vararg accountKeys: UserKey) {
selection.clear()
for (accountKey in accountKeys) {
selection.put(accountKey, true)
set(value) {
selection.clear()
for (accountKey in value) {
selection.put(accountKey, true)
}
notifyDataSetChanged()
}
notifyDataSetChanged()
}
val selectedAccounts: Array<AccountDetails>
get() {
@ -1814,6 +1811,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
return if (accounts != null) accounts!!.size else 0
}
override fun getItemId(position: Int): Long {
return accounts!![position].hashCode().toLong()
}
fun setAccounts(accounts: Array<AccountDetails>) {
this.accounts = accounts
notifyDataSetChanged()

3
twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt
View File

@ -84,8 +84,7 @@ class TrendsLocationSelectorActivity : BaseActivity() {
}
class TrendsLocationDialogFragment : BaseDialogFragment() {
private val list: Array<LocationsMap.LocationsData> get() = arguments.getTypedArray(EXTRA_DATA,
LocationsMap.LocationsData.CREATOR)
private val list: Array<LocationsMap.LocationsData> get() = arguments.getTypedArray(EXTRA_DATA)
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val selectorBuilder = AlertDialog.Builder(context)

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt
View File

@ -188,7 +188,7 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks<List<Parc
}
if (savedInstanceState == null) {
val users = arguments.getNullableTypedArray(EXTRA_USERS, ParcelableUser.CREATOR)
val users = arguments.getNullableTypedArray<ParcelableUser>(EXTRA_USERS)
if (users != null) {
selectedRecipients = users.toList()
editParticipants.setSelection(editParticipants.length())