簡易入力のメニューアイコンを公開範囲の図柄にする
This commit is contained in:
parent
32b628cc02
commit
1d3a6f5311
|
@ -44,7 +44,7 @@
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|
|
@ -41,6 +41,7 @@ import jp.juggler.util.*
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import org.apache.commons.io.IOUtils
|
import org.apache.commons.io.IOUtils
|
||||||
import org.jetbrains.anko.backgroundDrawable
|
import org.jetbrains.anko.backgroundDrawable
|
||||||
|
import org.jetbrains.anko.imageResource
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileInputStream
|
import java.io.FileInputStream
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
|
@ -297,6 +298,18 @@ class ActMain : AsyncActivity()
|
||||||
).open()
|
).open()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun showQuickTootVisibility() {
|
||||||
|
btnQuickTootMenu.imageResource =
|
||||||
|
when(val resId = Styler.getVisibilityIconId(false, quickTootVisibility)) {
|
||||||
|
R.drawable.ic_question -> R.drawable.ic_description
|
||||||
|
else -> resId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun performQuickTootMenu() {
|
||||||
|
dlgQuickTootMenu.toggle()
|
||||||
|
}
|
||||||
|
|
||||||
private val dlgQuickTootMenu = DlgQuickTootMenu(this, object : DlgQuickTootMenu.Callback {
|
private val dlgQuickTootMenu = DlgQuickTootMenu(this, object : DlgQuickTootMenu.Callback {
|
||||||
|
|
||||||
override var visibility : TootVisibility
|
override var visibility : TootVisibility
|
||||||
|
@ -305,6 +318,7 @@ class ActMain : AsyncActivity()
|
||||||
if(value != quickTootVisibility) {
|
if(value != quickTootVisibility) {
|
||||||
quickTootVisibility = value
|
quickTootVisibility = value
|
||||||
pref.edit().put(Pref.spQuickTootVisibility, value.id.toString()).apply()
|
pref.edit().put(Pref.spQuickTootVisibility, value.id.toString()).apply()
|
||||||
|
showQuickTootVisibility()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -928,10 +942,6 @@ class ActMain : AsyncActivity()
|
||||||
listItemPopup = null
|
listItemPopup = null
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun performQuickTootMenu() {
|
|
||||||
dlgQuickTootMenu.toggle()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun performQuickPost(account : SavedAccount?) {
|
private fun performQuickPost(account : SavedAccount?) {
|
||||||
if(account == null) {
|
if(account == null) {
|
||||||
val a = if(tabletEnv != null && ! Pref.bpQuickTootOmitAccountSelection(pref)) {
|
val a = if(tabletEnv != null && ! Pref.bpQuickTootOmitAccountSelection(pref)) {
|
||||||
|
@ -1233,6 +1243,7 @@ class ActMain : AsyncActivity()
|
||||||
quickTootVisibility =
|
quickTootVisibility =
|
||||||
TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))
|
TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))
|
||||||
?: quickTootVisibility
|
?: quickTootVisibility
|
||||||
|
showQuickTootVisibility()
|
||||||
|
|
||||||
Column.reloadDefaultColor(this, pref)
|
Column.reloadDefaultColor(this, pref)
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ class DlgQuickTootMenu(
|
||||||
AlertDialog.Builder(activity)
|
AlertDialog.Builder(activity)
|
||||||
.setTitle(R.string.choose_visibility)
|
.setTitle(R.string.choose_visibility)
|
||||||
.setItems(caption_list) { _, which ->
|
.setItems(caption_list) { _, which ->
|
||||||
if(which in 0 until visibilityList.size) {
|
if(which in visibilityList.indices) {
|
||||||
callback.visibility = visibilityList[which]
|
callback.visibility = visibilityList[which]
|
||||||
showVisibility()
|
showVisibility()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<jp.juggler.subwaytooter.view.MyDrawerLayout
|
<jp.juggler.subwaytooter.view.MyDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/drawer_layout"
|
android:id="@+id/drawer_layout"
|
||||||
|
|
||||||
|
@ -104,16 +103,15 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:baselineAligned="false"
|
android:baselineAligned="false"
|
||||||
android:orientation="horizontal"
|
android:gravity="center_vertical"
|
||||||
android:gravity="center_vertical">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/btnQuickTootMenu"
|
android:id="@+id/btnQuickTootMenu"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:contentDescription="@string/quick_toot_menu"
|
android:contentDescription="@string/quick_toot_menu"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter" />
|
||||||
android:src="@drawable/ic_description" />
|
|
||||||
|
|
||||||
<jp.juggler.subwaytooter.view.MyEditText
|
<jp.juggler.subwaytooter.view.MyEditText
|
||||||
android:id="@+id/etQuickToot"
|
android:id="@+id/etQuickToot"
|
||||||
|
|
Loading…
Reference in New Issue