27eefbf65a
* do not add media urls to status text * add scrolling to content * add arrow icon and animation to replying-to toggle * remove unnecessary compose_button_colors.xml * improve toot button * improve bottom bar, add bottom sheet for compose options, dedicated cw button * fix crash on Android < API 21 * move media picking from dialog to bottom sheet * add small style tootbutton * fix colors/button background for light theme * add icons to media chose bottom sheet * improve hide media button, delete unused styles * fix crash on dev build when taking photo * consolidate drawables * consolidate strings and ids, add tooltips to buttons * allow media only toots * change error message to show max size of upload correctly * fix button color * add emoji * code cleanup * Merge branch 'master' into compose_activity_refactoring # Conflicts: # app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java * fix hidden snackbar * improve hint text color * add SendTootService * fix timeline refreshing * toot saving and error handling for sendtootservice * restructure some code * convert EditTextTyped to Kotlin * fixed pick media button disabled color * force sensitive media when content warning is shown * add db cache for emojis & fix tests * reorder buttons to match mastodon web * add possibility to cancel sending of toot * correctly delete sent toots * refresh SavedTootActivity after toot was sent * remove unused resources * correct params for toot saving in SendTootService * consolidate strings * bugfix * remove unused resources * fix notifications on old android for SendTootService * fix crash
54 lines
2.2 KiB
Kotlin
54 lines
2.2 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.view
|
|
|
|
import android.content.Context
|
|
import android.support.v13.view.inputmethod.EditorInfoCompat
|
|
import android.support.v13.view.inputmethod.InputConnectionCompat
|
|
import android.support.v7.widget.AppCompatMultiAutoCompleteTextView
|
|
import android.text.InputType
|
|
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
|
|
|
|
init {
|
|
//fix a bug with autocomplete and some keyboards
|
|
val newInputType = inputType and (inputType xor InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
|
|
inputType = newInputType
|
|
}
|
|
|
|
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/*"))
|
|
InputConnectionCompat.createWrapper(connection, editorInfo,
|
|
onCommitContentListener!!)
|
|
} else {
|
|
connection
|
|
}
|
|
}
|
|
}
|