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
101 lines
3.5 KiB
Kotlin
101 lines
3.5 KiB
Kotlin
/* Copyright 2019 Tusky Contributors
|
|
*
|
|
* 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>. */
|
|
|
|
@file:JvmName("AddPollDialog")
|
|
|
|
package com.keylesspalace.tusky.components.compose.dialog
|
|
|
|
import android.content.Context
|
|
import android.view.LayoutInflater
|
|
import android.view.WindowManager
|
|
import androidx.appcompat.app.AlertDialog
|
|
import com.keylesspalace.tusky.R
|
|
import com.keylesspalace.tusky.adapter.AddPollOptionsAdapter
|
|
import com.keylesspalace.tusky.entity.NewPoll
|
|
import kotlinx.android.synthetic.main.dialog_add_poll.view.*
|
|
|
|
fun showAddPollDialog(
|
|
context: Context,
|
|
poll: NewPoll?,
|
|
maxOptionCount: Int,
|
|
maxOptionLength: Int,
|
|
onUpdatePoll: (NewPoll) -> Unit
|
|
) {
|
|
|
|
val view = LayoutInflater.from(context).inflate(R.layout.dialog_add_poll, null)
|
|
|
|
val dialog = AlertDialog.Builder(context)
|
|
.setIcon(R.drawable.ic_poll_24dp)
|
|
.setTitle(R.string.create_poll_title)
|
|
.setView(view)
|
|
.setNegativeButton(android.R.string.cancel, null)
|
|
.setPositiveButton(android.R.string.ok, null)
|
|
.create()
|
|
|
|
val adapter = AddPollOptionsAdapter(
|
|
options = poll?.options?.toMutableList() ?: mutableListOf("", ""),
|
|
maxOptionLength = maxOptionLength,
|
|
onOptionRemoved = { valid ->
|
|
view.addChoiceButton.isEnabled = true
|
|
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = valid
|
|
},
|
|
onOptionChanged = { valid ->
|
|
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = valid
|
|
}
|
|
)
|
|
|
|
view.pollChoices.adapter = adapter
|
|
|
|
view.addChoiceButton.setOnClickListener {
|
|
if (adapter.itemCount < maxOptionCount) {
|
|
adapter.addChoice()
|
|
}
|
|
if (adapter.itemCount >= maxOptionCount) {
|
|
it.isEnabled = false
|
|
}
|
|
}
|
|
|
|
val pollDurationId = context.resources.getIntArray(R.array.poll_duration_values).indexOfLast {
|
|
it <= poll?.expiresIn ?: 0
|
|
}
|
|
|
|
view.pollDurationSpinner.setSelection(pollDurationId)
|
|
|
|
view.multipleChoicesCheckBox.isChecked = poll?.multiple ?: false
|
|
|
|
dialog.setOnShowListener {
|
|
val button = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
|
|
button.setOnClickListener {
|
|
val selectedPollDurationId = view.pollDurationSpinner.selectedItemPosition
|
|
|
|
val pollDuration = context.resources
|
|
.getIntArray(R.array.poll_duration_values)[selectedPollDurationId]
|
|
|
|
onUpdatePoll(NewPoll(
|
|
options = adapter.pollOptions,
|
|
expiresIn = pollDuration,
|
|
multiple = view.multipleChoicesCheckBox.isChecked
|
|
))
|
|
|
|
dialog.dismiss()
|
|
}
|
|
}
|
|
|
|
dialog.show()
|
|
|
|
// make the dialog focusable so the keyboard does not stay behind it
|
|
dialog.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
|
|
|
|
} |