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

アプリ設定に「色/イベント背景色」を追加

This commit is contained in:
tateisu 2019-02-04 01:58:37 +09:00
parent 0ff0472744
commit 1932209e2d
7 changed files with 525 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt
View File

@ -74,6 +74,16 @@ class ActAppSettingChild : AppCompatActivity()
internal const val COLOR_DIALOG_ID_COLUMN_ACCT = 15
internal const val COLOR_DIALOG_ID_COLUMN_TEXT = 16
internal const val COLOR_DIALOG_ID_EVENT_BG_BOOST = 17
internal const val COLOR_DIALOG_ID_EVENT_BG_FAVOURITE = 18
internal const val COLOR_DIALOG_ID_EVENT_BG_FOLLOW = 19
internal const val COLOR_DIALOG_ID_EVENT_BG_MENTION = 20
internal const val COLOR_DIALOG_ID_EVENT_BG_UNFOLLOW = 21
internal const val COLOR_DIALOG_ID_EVENT_BG_REACTION = 22
internal const val COLOR_DIALOG_ID_EVENT_BG_QUOTE = 23
internal const val COLOR_DIALOG_ID_EVENT_BG_VOTE = 24
internal const val COLOR_DIALOG_ID_EVENT_BG_FOLLOWREQUEST = 25
internal const val REQUEST_CODE_TIMELINE_FONT = 1
internal const val REQUEST_CODE_TIMELINE_FONT_BOLD = 2
@ -112,6 +122,16 @@ class ActAppSettingChild : AppCompatActivity()
private var toot_color_direct_me : Int = 0
private var link_color : Int = 0
private var event_bg_color_boost : Int = 0
private var event_bg_color_favourite : Int = 0
private var event_bg_color_follow : Int = 0
private var event_bg_color_mention : Int = 0
private var event_bg_color_unfollow : Int = 0
private var event_bg_color_reaction : Int = 0
private var event_bg_color_quote : Int = 0
private var event_bg_color_vote : Int = 0
private var event_bg_color_follow_request : Int = 0
private var color_column_header_bg : Int = 0
private var color_column_header_fg : Int = 0
private var color_column_bg : Int = 0
@ -340,6 +360,24 @@ class ActAppSettingChild : AppCompatActivity()
, R.id.btnCcdContentTextEdit
, R.id.btnCcdContentTextReset
, R.id.btnInstanceTickerCopyright
, R.id.btnBackgroundColorBoostEdit
, R.id.btnBackgroundColorBoostReset
, R.id.btnBackgroundColorFavouritesEdit
, R.id.btnBackgroundColorFavouritesReset
, R.id.btnBackgroundColorFollowEdit
, R.id.btnBackgroundColorFollowReset
, R.id.btnBackgroundColorMentionEdit
, R.id.btnBackgroundColorMentionReset
, R.id.btnBackgroundColorUnfollowEdit
, R.id.btnBackgroundColorUnfollowReset
, R.id.btnBackgroundColorReactionEdit
, R.id.btnBackgroundColorReactionReset
, R.id.btnBackgroundColorQuotedEdit
, R.id.btnBackgroundColorQuotedReset
, R.id.btnBackgroundColorVotedEdit
, R.id.btnBackgroundColorVotedReset
, R.id.btnBackgroundColorFollowRequestedEdit
, R.id.btnBackgroundColorFollowRequestedReset
).forEach {
findViewById<View>(it)?.setOnClickListener(this)
}
@ -512,6 +550,16 @@ class ActAppSettingChild : AppCompatActivity()
toot_color_direct_me = Pref.ipTootColorDirectMe(pref)
link_color = Pref.ipLinkColor(pref)
event_bg_color_boost = Pref.ipEventBgColorBoost(pref)
event_bg_color_favourite = Pref.ipEventBgColorFavourite(pref)
event_bg_color_follow = Pref.ipEventBgColorFollow(pref)
event_bg_color_mention = Pref.ipEventBgColorMention(pref)
event_bg_color_unfollow = Pref.ipEventBgColorUnfollow(pref)
event_bg_color_reaction = Pref.ipEventBgColorReaction(pref)
event_bg_color_quote = Pref.ipEventBgColorQuote(pref)
event_bg_color_vote = Pref.ipEventBgColorVote(pref)
event_bg_color_follow_request = Pref.ipEventBgColorFollowRequest(pref)
color_column_header_bg = Pref.ipCcdHeaderBg(pref)
color_column_header_fg = Pref.ipCcdHeaderFg(pref)
color_column_bg = Pref.ipCcdContentBg(pref)
@ -652,6 +700,8 @@ class ActAppSettingChild : AppCompatActivity()
e.put(sp, value)
}
fun put(sp : IntPref, value : Int) = e.put(sp, value)
putIf(hasFooterColorUi, Pref.ipFooterButtonBgColor, footer_button_bg_color)
putIf(hasFooterColorUi, Pref.ipFooterButtonFgColor, footer_button_fg_color)
putIf(hasFooterColorUi, Pref.ipFooterTabBgColor, footer_tab_bg_color)
@ -660,10 +710,24 @@ class ActAppSettingChild : AppCompatActivity()
putIf(hasListDividerColorUi, Pref.ipListDividerColor, list_divider_color)
putIf(hasTootBackgroundColorUi, Pref.ipTootColorUnlisted, toot_color_unlisted)
putIf(hasTootBackgroundColorUi, Pref.ipTootColorFollower, toot_color_follower)
putIf(hasTootBackgroundColorUi, Pref.ipTootColorDirectUser, toot_color_direct_user)
putIf(hasTootBackgroundColorUi, Pref.ipTootColorDirectMe, toot_color_direct_me)
if(hasTootBackgroundColorUi) {
put(Pref.ipTootColorUnlisted, toot_color_unlisted)
put(Pref.ipTootColorFollower, toot_color_follower)
put(Pref.ipTootColorDirectUser, toot_color_direct_user)
put(Pref.ipTootColorDirectMe, toot_color_direct_me)
put(Pref.ipEventBgColorBoost, event_bg_color_boost)
put(Pref.ipEventBgColorFavourite, event_bg_color_favourite)
put(Pref.ipEventBgColorFollow, event_bg_color_follow)
put(Pref.ipEventBgColorMention, event_bg_color_mention)
put(Pref.ipEventBgColorUnfollow, event_bg_color_unfollow)
put(Pref.ipEventBgColorReaction, event_bg_color_reaction)
put(Pref.ipEventBgColorQuote, event_bg_color_quote)
put(Pref.ipEventBgColorVote, event_bg_color_vote)
put(Pref.ipEventBgColorFollowRequest, event_bg_color_follow_request)
}
putIf(hasLinkColorUi, Pref.ipLinkColor, link_color)
@ -950,6 +1014,106 @@ class ActAppSettingChild : AppCompatActivity()
this@ActAppSettingChild,
"https://wee.jp/mastodon/"
)
R.id.btnBackgroundColorBoostEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_BOOST,
event_bg_color_boost,
true
)
R.id.btnBackgroundColorBoostReset -> {
event_bg_color_boost = 0
saveUIToData()
}
R.id.btnBackgroundColorFavouritesEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_FAVOURITE,
event_bg_color_favourite,
true
)
R.id.btnBackgroundColorFavouritesReset -> {
event_bg_color_favourite = 0
saveUIToData()
}
R.id.btnBackgroundColorFollowEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_FOLLOW,
event_bg_color_follow,
true
)
R.id.btnBackgroundColorFollowReset -> {
event_bg_color_follow = 0
saveUIToData()
}
R.id.btnBackgroundColorMentionEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_MENTION,
event_bg_color_mention,
true
)
R.id.btnBackgroundColorMentionReset -> {
event_bg_color_mention = 0
saveUIToData()
}
R.id.btnBackgroundColorUnfollowEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_UNFOLLOW,
event_bg_color_unfollow,
true
)
R.id.btnBackgroundColorUnfollowReset -> {
event_bg_color_unfollow = 0
saveUIToData()
}
R.id.btnBackgroundColorReactionEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_REACTION,
event_bg_color_reaction,
true
)
R.id.btnBackgroundColorReactionReset -> {
event_bg_color_reaction = 0
saveUIToData()
}
R.id.btnBackgroundColorQuotedEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_QUOTE,
event_bg_color_quote,
true
)
R.id.btnBackgroundColorQuotedReset -> {
event_bg_color_quote = 0
saveUIToData()
}
R.id.btnBackgroundColorVotedEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_VOTE,
event_bg_color_vote,
true
)
R.id.btnBackgroundColorVotedReset -> {
event_bg_color_vote = 0
saveUIToData()
}
R.id.btnBackgroundColorFollowRequestedEdit -> openColorPicker(
COLOR_DIALOG_ID_EVENT_BG_FOLLOWREQUEST,
event_bg_color_follow_request,
true
)
R.id.btnBackgroundColorFollowRequestedReset -> {
event_bg_color_follow_request = 0
saveUIToData()
}
}
}
@ -1083,6 +1247,52 @@ class ActAppSettingChild : AppCompatActivity()
saveUIToData()
showColumnSample()
}
COLOR_DIALOG_ID_EVENT_BG_BOOST -> {
event_bg_color_boost = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_FAVOURITE -> {
event_bg_color_favourite = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_FOLLOW -> {
event_bg_color_follow = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_MENTION -> {
event_bg_color_mention = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_UNFOLLOW -> {
event_bg_color_unfollow = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_REACTION -> {
event_bg_color_reaction = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_QUOTE -> {
event_bg_color_quote = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_VOTE -> {
event_bg_color_vote = colorAlpha
saveUIToData()
}
COLOR_DIALOG_ID_EVENT_BG_FOLLOWREQUEST -> {
event_bg_color_follow_request = colorAlpha
saveUIToData()
}
}
}
@ -1351,16 +1561,16 @@ class ActAppSettingChild : AppCompatActivity()
// GMT数字を指定するタイプのタイムゾーンは無視する。ただしGMT-12:00の１項目だけは残す
// 3文字のIDは曖昧な場合があるので非推奨
// '/' を含まないIDは列挙しない
if(! when{
! tz.id.contains('/') -> false
tz.id == "Etc/GMT+12" -> true
tz.id.startsWith("Etc/") -> false
else-> true
}) continue
if(! when {
! tz.id.contains('/') -> false
tz.id == "Etc/GMT+12" -> true
tz.id.startsWith("Etc/") -> false
else -> true
}) continue
var offset = tz.rawOffset.toLong()
val caption = when(offset) {
0L -> String.format("(UTC\u00B100:00) %s %s",tz.id, tz.displayName)
0L -> String.format("(UTC\u00B100:00) %s %s", tz.id, tz.displayName)
else -> {
@ -1377,18 +1587,18 @@ class ActAppSettingChild : AppCompatActivity()
String.format(format, hours, minutes,tz.id, tz.displayName)
String.format(format, hours, minutes, tz.id, tz.displayName)
}
}
if( null == list.find{ it.caption == caption } ){
if(null == list.find { it.caption == caption }) {
list.add(Item(id, caption, tz.rawOffset))
}
}
list.sortWith(Comparator { a, b ->
(a.offset - b.offset).notZero() ?: a.caption.compareTo( b.caption)
(a.offset - b.offset).notZero() ?: a.caption.compareTo(b.caption)
})
list.add(0, Item("", getString(R.string.device_timezone), 0))
}

49
app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
View File

@ -5,7 +5,6 @@ import android.content.res.ColorStateList
import android.graphics.Typeface
import android.os.SystemClock
import android.support.v4.content.ContextCompat
import android.support.v4.view.ViewCompat
import android.support.v7.app.AlertDialog
import android.support.v7.widget.RecyclerView
import android.text.Spannable
@ -475,7 +474,8 @@ internal class ItemViewHolder(
item.accountRef,
item.time_created_at,
R.drawable.ic_repeat,
R.string.display_name_boosted_by
R.string.display_name_boosted_by,
colorBg = Pref.ipEventBgColorBoost(activity.pref)
)
showStatusOrReply(item.reblog)
}
@ -773,7 +773,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
if(access_info.isNicoru(n_account)) R.drawable.ic_nicoru else R.drawable.ic_star,
R.string.display_name_favourited_by
R.string.display_name_favourited_by,
colorBg = Pref.ipEventBgColorFavourite(activity.pref)
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -785,7 +786,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_repeat,
R.string.display_name_boosted_by
R.string.display_name_boosted_by,
colorBg = Pref.ipEventBgColorBoost(activity.pref)
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -799,7 +801,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_repeat,
R.string.display_name_boosted_by
R.string.display_name_boosted_by,
colorBg = Pref.ipEventBgColorBoost(activity.pref)
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -812,7 +815,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_follow_plus,
R.string.display_name_followed_by
R.string.display_name_followed_by,
colorBg = Pref.ipEventBgColorFollow(activity.pref)
)
showAccount(n_accountRef)
}
@ -824,7 +828,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_follow_cross,
R.string.display_name_unfollowed_by
R.string.display_name_unfollowed_by,
colorBg = Pref.ipEventBgColorUnfollow(activity.pref)
)
showAccount(n_accountRef)
}
@ -845,7 +850,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_reply,
R.string.display_name_mentioned_by
R.string.display_name_mentioned_by,
colorBg = Pref.ipEventBgColorMention(activity.pref)
)
}
}
@ -861,8 +867,9 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_question, // not used
R.string.display_name_reaction_by
, reactionDrawableId = reaction?.btnDrawableId
R.string.display_name_reaction_by,
colorBg = Pref.ipEventBgColorReaction(activity.pref),
reactionDrawableId = reaction?.btnDrawableId
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -874,7 +881,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_repeat,
R.string.display_name_quoted_by
R.string.display_name_quoted_by,
colorBg = Pref.ipEventBgColorQuote(activity.pref)
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -886,7 +894,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_vote,
R.string.display_name_voted_by
R.string.display_name_voted_by,
colorBg = Pref.ipEventBgColorVote(activity.pref)
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -898,7 +907,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_follow_wait,
R.string.display_name_follow_request_by
R.string.display_name_follow_request_by,
colorBg = Pref.ipEventBgColorFollowRequest(activity.pref)
)
boostedAction = {
activity.addColumn(
@ -914,7 +924,8 @@ internal class ItemViewHolder(
n_accountRef,
n.time_created_at,
R.drawable.ic_question,
R.string.unknown_notification_from
R.string.unknown_notification_from,
colorBg = 0
)
if(n_status != null) {
showNotificationStatus(n_status)
@ -1041,6 +1052,7 @@ internal class ItemViewHolder(
time : Long,
iconId : Int,
string_id : Int,
colorBg : Int,
reactionDrawableId : Int? = null
) {
boost_account = whoRef
@ -1066,6 +1078,12 @@ internal class ItemViewHolder(
)
}
if( colorBg == 0) {
llBoosted.backgroundResource = R.drawable.btn_bg_transparent
}else{
llBoosted.backgroundDrawable = getAdaptiveRippleDrawable(normalColor = colorBg, pressedColor = content_color)
}
boost_time = time
llBoosted.visibility = View.VISIBLE
showStatusTime(activity, tvBoostedTime, who, time = time)
@ -2597,8 +2615,7 @@ internal class ItemViewHolder(
lparams(matchParent, wrapContent) {
bottomMargin = dip(6)
}
background = ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent)
backgroundResource = R.drawable.btn_bg_transparent
gravity = Gravity.CENTER_VERTICAL
ivBoosted = imageView {

10
app/src/main/java/jp/juggler/subwaytooter/Pref.kt
View File

@ -420,6 +420,16 @@ object Pref {
val ipTootColorDirectUser = IntPref("ipTootColorDirectUser", 0)
val ipTootColorDirectMe = IntPref("ipTootColorDirectMe", 0)
val ipEventBgColorBoost = IntPref("EventBgColorBoost", 0)
val ipEventBgColorFavourite = IntPref("EventBgColorFavourite", 0)
val ipEventBgColorFollow = IntPref("EventBgColorFollow", 0)
val ipEventBgColorMention = IntPref("EventBgColorMention", 0)
val ipEventBgColorUnfollow = IntPref("EventBgColorUnfollow", 0)
val ipEventBgColorReaction = IntPref("EventBgColorReaction", 0)
val ipEventBgColorQuote = IntPref("EventBgColorQuote", 0)
val ipEventBgColorVote = IntPref("EventBgColorVote", 0)
val ipEventBgColorFollowRequest = IntPref("EventBgColorFollowRequest", 0)
val ipCcdHeaderBg = IntPref("ipCcdHeaderBg", 0)
val ipCcdHeaderFg = IntPref("ipCcdHeaderFg", 0)
val ipCcdContentBg = IntPref("ipCcdContentBg", 0)

257
app/src/main/res/layout/act_app_setting_color.xml
View File

@ -11,8 +11,8 @@
android:clipToPadding="false"
android:fillViewport="true"
android:paddingBottom="128dp"
android:paddingTop="12dp"
android:paddingBottom="128dp"
android:scrollbarStyle="outsideOverlay"
tools:ignore="TooManyViews,UseCompoundDrawables,UselessParent,Autofill"
@ -154,7 +154,6 @@
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/direct_with_user_visibility"
@ -205,6 +204,241 @@
</LinearLayout>
<!-- #################################################### -->
<View style="@style/setting_divider"/>
<TextView
style="@style/setting_row_label"
android:text="@string/event_background_color"
/>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/boost"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorBoostEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorBoostReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/favourites"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorFavouritesEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorFavouritesReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/mention_not_reply"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorMentionEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorMentionReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/follow"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorFollowEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorFollowReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/unfollow_misskey"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorUnfollowEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorUnfollowReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/follow_request_misskey"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorFollowRequestedEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorFollowRequestedReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/reaction"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorReactionEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorReactionReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/quote_renote"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorQuotedEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorQuotedReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/vote"
/>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnBackgroundColorVotedEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnBackgroundColorVotedReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<!-- カラム色のデフォルト ########################################################## -->
<View style="@style/setting_divider"/>
@ -214,7 +448,6 @@
android:text="@string/column_color_default"
/>
<LinearLayout style="@style/setting_row_form">
<LinearLayout
@ -224,10 +457,10 @@
android:layout_marginBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="3dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="3dp"
android:paddingEnd="12dp"
android:paddingBottom="3dp"
>
<ImageView
@ -238,6 +471,7 @@
android:importantForAccessibility="no"
tools:src="@drawable/ic_bike"
/>
<TextView
android:id="@+id/tvColumnName"
android:layout_width="0dp"
@ -311,38 +545,37 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp"
android:orientation="vertical"
android:padding="12dp"
>
<TextView
android:id="@+id/tvSampleAcct"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="start"
android:maxLines="1"
android:text="@string/acct_sample"
android:textColor="?attr/colorTimeSmall"
android:textSize="12sp"
android:text="@string/acct_sample"
android:id="@+id/tvSampleAcct"
/>
<jp.juggler.subwaytooter.view.MyTextView
android:id="@+id/tvSampleContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:lineSpacingMultiplier="1.1"
android:textColor="?attr/colorContentText"
android:gravity="start"
android:lineSpacingMultiplier="1.1"
android:text="@string/content_sample"
android:id="@+id/tvSampleContent"
android:textColor="?attr/colorContentText"
/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
<TextView
style="@style/setting_row_label_indent1"
android:text="@string/content_background_color"

6
app/src/main/res/values-ja/strings.xml
View File

@ -805,7 +805,7 @@
<string name="quick_toot_bar_background_color">簡易投稿入力の背景色</string>
<string name="dont_show_preview_card">プレビューカードを表示しない</string>
<string name="instance_does_not_support_push_api_pleroma">このサーバーはプッシュ購読APIに対応していません。多分Pleromaです。</string>
<string name="quote_renote">引用リノート… (Misskey)</string>
<string name="quote_renote">引用リノート (Misskey)</string>
<string name="blank_cw">(空欄CW)</string>
<string name="actions_for_instance">サーバーへのアクション</string>
<string name="animation">アニメーション</string>
@ -865,5 +865,9 @@
<string name="hashtag_title_none">(%1$s を除く)</string>
<string name="add">追加</string>
<string name="show_clear_button_in_search_bar">検索バーに消去ボタンを表示する (アプリ再起動が必要)</string>
<string name="event_background_color">イベント背景色</string>
<string name="mention_not_reply">メンション(返信ではない)</string>
<string name="unfollow_misskey">フォロー解除 (Misskey)</string>
<string name="follow_request_misskey">フォローリクエスト (Misskey)</string>
</resources>

2
app/src/main/res/values-ko/strings.xml
View File

@ -809,7 +809,7 @@
<string name="quick_toot_bar_background_color">즉석 툿 막대 배경색</string>
<string name="dont_show_preview_card">미리보기 카드를 보이지 않기</string>
<string name="instance_does_not_support_push_api_pleroma">푸시 구독 API는 이 서버(아마도 Pleroma)에서 지원하지 않습니다.</string>
<string name="quote_renote">인용 리노트… (Misskey)</string>
<string name="quote_renote">인용 리노트 (Misskey)</string>
<string name="blank_cw">(빈 CW)</string>
<string name="actions_for_instance">이 서버에 대한 동작</string>
<string name="animation">애니메이션</string>

6
app/src/main/res/values/strings.xml
View File

@ -821,7 +821,7 @@
<string name="quick_toot_bar_background_color">Quick toot bar background color</string>
<string name="dont_show_preview_card">Don\'t show preview card</string>
<string name="instance_does_not_support_push_api_pleroma">Push subscription API is not supported on this server (maybe Pleroma).</string>
<string name="quote_renote">Quoted renote… (Misskey)</string>
<string name="quote_renote">Quoted renote (Misskey)</string>
<string name="blank_cw">(blank CW)</string>
<string name="actions_for_instance">Actions for this server</string>
<string name="animation">Animation</string>
@ -887,5 +887,9 @@
<string name="hashtag_title_none">without %1$s</string>
<string name="add">Add</string>
<string name="show_clear_button_in_search_bar">Show clear button on search bar (app restart required)</string>
<string name="event_background_color">Event background color</string>
<string name="mention_not_reply">Mention (not reply)</string>
<string name="unfollow_misskey">Unfollow (Misskey)</string>
<string name="follow_request_misskey">Follow request (Misskey)</string>
</resources>