8770fbe986
* Convert ComposeActivity to Kotlin * More ComposeActivity cleanups * Move ComposeActivity to it's own package * Remove ComposeActivity.IntentBuilder * Re-do part of the media downsizing/uploading * Add sending of status to ViewModel, draft media descriptions * Allow uploading video, update description after uploading * Enable camera, enable upload cancelling * Cleanup of ComposeActivity * Extract CaptionDialog, extract ComposeActivity methods * Fix handling of redrafted media * Add initial state and media uploading out of Activity * Change ComposeOptions.mentionedUsernames to be Set rather than List We probably don't want repeated usernames when we are writing a post and Set provides such guarantee for free plus it tells it to the callers. The only disadvantage is lack of order but it shouldn't be a problem. * Add combineOptionalLiveData. Add docs. It it useful for nullable LiveData's. I think we cannot differentiate between value not being set and value being null so I just added the variant without null check. * Add poll support to Compose. * cleanup code * move more classes into compose package * cleanup code * fix button behavior * add error handling for media upload * add caching for instance data again * merge develop * fix scheduled toots * delete unused string * cleanup ComposeActivity * fix restoring media from drafts * make media upload code a little bit clearer * cleanup autocomplete search code * avoid duplicate object creation in SavedTootActivity * perf: avoid unnecessary work when initializing ComposeActivity * add license header to new files * use small toot button on bigger displays * fix ComposeActivityTest * fix bad merge * use Singles.zip instead of Single.zip
66 lines
2.7 KiB
Kotlin
66 lines
2.7 KiB
Kotlin
/* Copyright 2018 Conny Duck
|
|
*
|
|
* This file is a part of Tusky.
|
|
*
|
|
* 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.
|
|
*
|
|
* Tusky 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 Tusky; if not,
|
|
* see <http://www.gnu.org/licenses>. */
|
|
|
|
package com.keylesspalace.tusky.components.compose.view
|
|
|
|
import android.content.Context
|
|
import androidx.emoji.widget.EmojiEditTextHelper
|
|
import androidx.core.view.inputmethod.EditorInfoCompat
|
|
import androidx.core.view.inputmethod.InputConnectionCompat
|
|
import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView
|
|
import android.text.InputType
|
|
import android.text.method.KeyListener
|
|
import android.util.AttributeSet
|
|
import android.view.inputmethod.EditorInfo
|
|
import android.view.inputmethod.InputConnection
|
|
|
|
class EditTextTyped @JvmOverloads constructor(context: Context,
|
|
attributeSet: AttributeSet? = null)
|
|
: AppCompatMultiAutoCompleteTextView(context, attributeSet) {
|
|
|
|
private var onCommitContentListener: InputConnectionCompat.OnCommitContentListener? = null
|
|
private val emojiEditTextHelper: EmojiEditTextHelper = EmojiEditTextHelper(this)
|
|
|
|
init {
|
|
//fix a bug with autocomplete and some keyboards
|
|
val newInputType = inputType and (inputType xor InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
|
|
inputType = newInputType
|
|
super.setKeyListener(getEmojiEditTextHelper().getKeyListener(keyListener))
|
|
}
|
|
|
|
override fun setKeyListener(input: KeyListener) {
|
|
super.setKeyListener(getEmojiEditTextHelper().getKeyListener(input))
|
|
}
|
|
|
|
fun setOnCommitContentListener(listener: InputConnectionCompat.OnCommitContentListener) {
|
|
onCommitContentListener = listener
|
|
}
|
|
|
|
override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection {
|
|
val connection = super.onCreateInputConnection(editorInfo)
|
|
return if (onCommitContentListener != null) {
|
|
EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf("image/*"))
|
|
getEmojiEditTextHelper().onCreateInputConnection(InputConnectionCompat.createWrapper(connection, editorInfo,
|
|
onCommitContentListener!!), editorInfo)!!
|
|
} else {
|
|
connection
|
|
}
|
|
}
|
|
|
|
private fun getEmojiEditTextHelper(): EmojiEditTextHelper {
|
|
return emojiEditTextHelper
|
|
}
|
|
}
|