From c23e582a336d548b6ddb9b09ca1c8c5a54767284 Mon Sep 17 00:00:00 2001 From: tateisu Date: Wed, 12 Feb 2020 02:01:15 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B=E3=81=AE?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E8=83=8C=E6=99=AF=E3=82=92?= =?UTF-8?q?=E8=A7=92=E4=B8=B8=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/ActAbout.kt | 2 +- .../java/jp/juggler/subwaytooter/ActMain.kt | 18 ++- .../java/jp/juggler/subwaytooter/ActPost.kt | 7 +- .../jp/juggler/subwaytooter/AppSettingItem.kt | 4 +- .../juggler/subwaytooter/ColumnViewHolder.kt | 76 ++++++---- .../jp/juggler/subwaytooter/DlgContextMenu.kt | 2 +- .../jp/juggler/subwaytooter/ItemViewHolder.kt | 38 ++--- .../jp/juggler/subwaytooter/StatusButtons.kt | 22 +-- .../subwaytooter/action/Action_User.kt | 2 +- .../subwaytooter/dialog/AccountPicker.kt | 7 +- .../subwaytooter/dialog/DlgListMember.kt | 4 +- app/src/main/java/jp/juggler/util/UiUtils.kt | 55 +++++-- .../main/java/jp/juggler/util/ViewUtils.kt | 8 -- .../main/res/drawable/btn_bg_transparent.xml | 10 -- app/src/main/res/layout/act_about.xml | 14 +- .../main/res/layout/act_account_setting.xml | 8 +- app/src/main/res/layout/act_app_setting.xml | 2 +- app/src/main/res/layout/act_post.xml | 32 ++--- .../main/res/layout/dlg_account_picker.xml | 2 +- app/src/main/res/layout/dlg_context_menu.xml | 136 +++++++++--------- app/src/main/res/layout/dlg_qr_code.xml | 2 +- .../main/res/layout/lv_header_instance.xml | 2 +- app/src/main/res/layout/lv_header_profile.xml | 18 +-- .../main/res/layout/lv_language_filter.xml | 2 +- app/src/main/res/layout/lv_sidemenu_item.xml | 2 +- .../main/res/layout/lv_spinner_dropdown.xml | 2 +- app/src/main/res/values/styles.xml | 5 +- 27 files changed, 259 insertions(+), 223 deletions(-) delete mode 100644 app/src/main/res/drawable/btn_bg_transparent.xml diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt index fc3ff13e..d218740a 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt @@ -120,7 +120,7 @@ class ActAbout : AppCompatActivity() { if(ll.childCount != 0) topMargin = margin_top } // - setBackgroundResource(R.drawable.btn_bg_transparent) + setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) setPadding(padding, padding, padding, padding) isAllCaps = false diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt index c5e66f87..9194d80b 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt @@ -20,6 +20,7 @@ import android.view.inputmethod.EditorInfo import android.widget.* import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -1598,9 +1599,12 @@ class ActMain : AppCompatActivity() scrollToColumn(idx) } viewRoot.contentDescription = column.getColumnName(true) - // - - column.setHeaderBackground(viewRoot) + + viewRoot.backgroundDrawable = getAdaptiveRippleDrawableRound( + this, + column.getHeaderBackgroundColor(), + column.getHeaderNameColor() + ) ivIcon.setImageResource(column.getIconId()) ivIcon.imageTintList = ColorStateList.valueOf(column.getHeaderNameColor()) @@ -2519,10 +2523,10 @@ class ActMain : AppCompatActivity() ) val colorRipple = footer_button_fg_color.notZero() ?: getAttributeColor(this, R.attr.colorRippleEffect) - btnMenu.backgroundDrawable = getAdaptiveRippleDrawable(colorBg, colorRipple) - btnToot.backgroundDrawable = getAdaptiveRippleDrawable(colorBg, colorRipple) - btnQuickToot.backgroundDrawable = getAdaptiveRippleDrawable(colorBg, colorRipple) - btnQuickTootMenu.backgroundDrawable = getAdaptiveRippleDrawable(colorBg, colorRipple) + btnMenu.backgroundDrawable = getAdaptiveRippleDrawableRound(this,colorBg, colorRipple) + btnToot.backgroundDrawable = getAdaptiveRippleDrawableRound(this,colorBg, colorRipple) + btnQuickToot.backgroundDrawable = getAdaptiveRippleDrawableRound(this,colorBg, colorRipple) + btnQuickTootMenu.backgroundDrawable = getAdaptiveRippleDrawableRound(this,colorBg, colorRipple) val csl = ColorStateList.valueOf( footer_button_fg_color.notZero() diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt index 93beda6e..3ea3914f 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt @@ -1453,7 +1453,7 @@ class ActPost : AppCompatActivity(), post_helper.setInstance(null, false) btnAccount.text = getString(R.string.not_selected) btnAccount.setTextColor(getAttributeColor(this, android.R.attr.textColorPrimary)) - btnAccount.setBackgroundResource(R.drawable.btn_bg_transparent) + btnAccount.setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) } else { post_helper.setInstance(a.host, a.isMisskey) @@ -1466,9 +1466,10 @@ class ActPost : AppCompatActivity(), btnAccount.text = ac.nickname if(AcctColor.hasColorBackground(ac)) { - btnAccount.setBackgroundColor(ac.color_bg) + btnAccount.background = + getAdaptiveRippleDrawableRound(this,ac.color_bg,ac.color_fg) } else { - btnAccount.setBackgroundResource(R.drawable.btn_bg_transparent) + btnAccount.setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) } btnAccount.textColor = ac.color_fg.notZero() diff --git a/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt b/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt index 9476d0fa..1115aa18 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/AppSettingItem.kt @@ -829,8 +829,8 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett activity, R.attr.colorRippleEffect ) - ivFooterToot.background = getAdaptiveRippleDrawable(colorBg, colorRipple) - ivFooterMenu.background = getAdaptiveRippleDrawable(colorBg, colorRipple) + ivFooterToot.background = getAdaptiveRippleDrawableRound(activity,colorBg, colorRipple) + ivFooterMenu.background = getAdaptiveRippleDrawableRound(activity,colorBg, colorRipple) val csl = ColorStateList.valueOf( footer_button_fg_color.notZero() diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt index 0dfb668f..04184fb5 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt @@ -1537,15 +1537,15 @@ class ColumnViewHolder( val colorFg = getAttributeColor(activity, R.attr.colorContentText) val colorBgSelected = colorFg.applyAlphaMultiplier(0.25f) val colorFgList = ColorStateList.valueOf(colorFg) + val colorBg = getAttributeColor(activity, R.attr.colorColumnSettingBackground) showQuickFilterButton = { btn, iconId, selected -> - btn.backgroundDrawable = if(selected) { - getAdaptiveRippleDrawable( - colorBgSelected, - colorFg + btn.backgroundDrawable = + getAdaptiveRippleDrawableRound( + activity, + if(selected) colorBgSelected else colorBg, + colorFg, + roundNormal = true ) - } else { - ContextCompat.getDrawable(activity, R.drawable.btn_bg_transparent) - } when(btn) { is TextView -> btn.textColor = colorFg @@ -1569,7 +1569,8 @@ class ColumnViewHolder( showQuickFilterButton = { btn, iconId, selected -> - btn.backgroundDrawable = getAdaptiveRippleDrawable( + btn.backgroundDrawable = getAdaptiveRippleDrawableRound( + activity, if(selected) colorBgSelected else colorBg, colorFg ) @@ -1719,7 +1720,10 @@ class ColumnViewHolder( btnAnnouncements = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable( + context, + R.drawable.btn_bg_transparent_round6dp + ) contentDescription = context.getString(R.string.announcements) setImageResource(R.drawable.ic_info_outline) padding = dip(8) @@ -1769,7 +1773,10 @@ class ColumnViewHolder( btnColumnSetting = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable( + context, + R.drawable.btn_bg_transparent_round6dp + ) contentDescription = context.getString(R.string.setting) setImageResource(R.drawable.ic_tune) padding = dip(8) @@ -1804,7 +1811,10 @@ class ColumnViewHolder( btnColumnReload = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable( + context, + R.drawable.btn_bg_transparent_round6dp + ) contentDescription = context.getString(R.string.reload) setImageResource(R.drawable.ic_refresh) padding = dip(8) @@ -1818,7 +1828,10 @@ class ColumnViewHolder( btnColumnClose = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable( + context, + R.drawable.btn_bg_transparent_round6dp + ) contentDescription = context.getString(R.string.close_column) setImageResource(R.drawable.ic_close) padding = dip(8) @@ -2149,7 +2162,7 @@ class ColumnViewHolder( } btnSearchClear = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.clear) imageResource = R.drawable.ic_close imageTintList = ColorStateList.valueOf( @@ -2163,7 +2176,7 @@ class ColumnViewHolder( } btnSearch = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.search) imageResource = R.drawable.ic_search imageTintList = ColorStateList.valueOf( @@ -2205,7 +2218,7 @@ class ColumnViewHolder( } btnListAdd = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.add) imageResource = R.drawable.ic_add imageTintList = ColorStateList.valueOf( @@ -2226,7 +2239,7 @@ class ColumnViewHolder( lparams(matchParent, dip(40)) btnQuickFilterAll = button { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp minWidthCompat = dip(40) startPadding = dip(4) endPadding = dip(4) @@ -2238,35 +2251,35 @@ class ColumnViewHolder( } btnQuickFilterMention = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.mention2) }.lparams(dip(40), matchParent) { margin = 0 } btnQuickFilterFavourite = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.favourite) }.lparams(dip(40), matchParent) { margin = 0 } btnQuickFilterBoost = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.boost) }.lparams(dip(40), matchParent) { margin = 0 } btnQuickFilterFollow = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.follow) }.lparams(dip(40), matchParent) { margin = 0 } btnQuickFilterReaction = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.reaction) }.lparams(dip(40), matchParent) { margin = 0 @@ -2274,7 +2287,7 @@ class ColumnViewHolder( btnQuickFilterVote = imageButton { - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp contentDescription = context.getString(R.string.vote_polls) }.lparams(dip(40), matchParent) { margin = 0 @@ -2561,7 +2574,7 @@ class ColumnViewHolder( b.layoutParams = blp b.background = ContextCompat.getDrawable( activity, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) b.contentDescription = activity.getString(R.string.reaction_add) @@ -2617,14 +2630,15 @@ class ColumnViewHolder( btn.allCaps = false btn.tag = reaction - btn.background = ContextCompat.getDrawable( - actMain, - if(reaction.me == true) { - R.drawable.bg_button_cw - } else { - R.drawable.btn_bg_transparent - } - ) + btn.background = if(reaction.me == true) { + getAdaptiveRippleDrawableRound( + actMain, + getAttributeColor(actMain, R.attr.colorButtonBgCw), + getAttributeColor(actMain, R.attr.colorRippleEffect) + ) + } else { + ContextCompat.getDrawable(actMain, R.drawable.btn_bg_transparent_round6dp) + } btn.setTextColor(content_color) diff --git a/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt b/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt index 9e1043a8..7be8af1f 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt @@ -272,7 +272,7 @@ internal class DlgContextMenu( ) b.layoutParams = lp b.backgroundDrawable = - ContextCompat.getDrawable(activity, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(activity, R.drawable.btn_bg_transparent_round6dp) b.gravity = Gravity.START or Gravity.CENTER_VERTICAL b.minHeight = (activity.density * 32f + 0.5f).toInt() b.minimumHeight = (activity.density * 32f + 0.5f).toInt() diff --git a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt index 3598fca3..84f91897 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt @@ -2357,7 +2357,7 @@ internal class ItemViewHolder( b.layoutParams = blp b.background = ContextCompat.getDrawable( activity, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) val hasMyReaction = status.myReaction?.isNotEmpty() == true @@ -2421,8 +2421,10 @@ internal class ItemViewHolder( minWidthCompat = buttonHeight background = ContextCompat.getDrawable( this@ItemViewHolder.activity, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) + // TODO 自分がリアクションしたやつは背景を変える + setTextColor(content_color) setPadding(paddingH, paddingV, paddingH, paddingV) setOnClickListener { @@ -2453,8 +2455,10 @@ internal class ItemViewHolder( minWidthCompat = buttonHeight background = ContextCompat.getDrawable( this@ItemViewHolder.activity, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) + // TODO 自分がリアクションしたやつは背景を変える + setTextColor(content_color) setPadding(paddingH, paddingV, paddingH, paddingV) @@ -3115,7 +3119,7 @@ internal class ItemViewHolder( lparams(matchParent, wrapContent) { bottomMargin = dip(6) } - backgroundResource = R.drawable.btn_bg_transparent + backgroundResource = R.drawable.btn_bg_transparent_round6dp gravity = Gravity.CENTER_VERTICAL ivBoosted = imageView { @@ -3164,7 +3168,7 @@ internal class ItemViewHolder( llFollow = linearLayout { lparams(matchParent, wrapContent) - background = ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + background = ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) gravity = Gravity.CENTER_VERTICAL ivFollow = myNetworkImageView { @@ -3204,7 +3208,7 @@ internal class ItemViewHolder( btnFollow = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) contentDescription = context.getString(R.string.follow) scaleType = ImageView.ScaleType.CENTER // tools:src="?attr/ic_follow_plus" @@ -3251,7 +3255,7 @@ internal class ItemViewHolder( ivThumbnail = myNetworkImageView { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) contentDescription = context.getString(R.string.thumbnail) scaleType = ImageView.ScaleType.CENTER_CROP }.lparams(dip(48), dip(48)) { @@ -3293,7 +3297,7 @@ internal class ItemViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) gravity = Gravity.CENTER_VERTICAL @@ -3375,7 +3379,7 @@ internal class ItemViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) contentDescription = context.getString(R.string.hide) imageResource = R.drawable.ic_close @@ -3529,7 +3533,7 @@ internal class ItemViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) contentDescription = context.getString(R.string.hide) imageResource = R.drawable.ic_close @@ -3596,7 +3600,7 @@ internal class ItemViewHolder( btnCardImageHide = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) contentDescription = context.getString(R.string.hide) imageResource = R.drawable.ic_close @@ -3698,7 +3702,7 @@ internal class ItemViewHolder( btnSearchTag = button { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) allCaps = false }.lparams(matchParent, wrapContent) } @@ -3707,7 +3711,7 @@ internal class ItemViewHolder( lparams(matchParent, wrapContent) gravity = Gravity.CENTER_VERTICAL - background = ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + background = ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) verticalLayout { lparams(0, wrapContent) { @@ -3742,7 +3746,7 @@ internal class ItemViewHolder( btnListTL = button { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) allCaps = false }.lparams(0, wrapContent) { weight = 1f @@ -3751,7 +3755,7 @@ internal class ItemViewHolder( btnListMore = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) imageResource = R.drawable.ic_more contentDescription = context.getString(R.string.more) }.lparams(dip(40), matchParent) { @@ -3771,7 +3775,7 @@ internal class ItemViewHolder( btnFollowRequestAccept = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) contentDescription = context.getString(R.string.follow_accept) imageResource = R.drawable.ic_check setPadding(0, 0, 0, 0) @@ -3779,7 +3783,7 @@ internal class ItemViewHolder( btnFollowRequestDeny = imageButton { background = - ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent) + ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent_round6dp) contentDescription = context.getString(R.string.follow_deny) imageResource = R.drawable.ic_close setPadding(0, 0, 0, 0) diff --git a/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt b/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt index d9bf7119..2bcb38c1 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt @@ -728,7 +728,7 @@ class StatusButtonsViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) contentDescription = context.getString(R.string.conversation_view) @@ -741,7 +741,7 @@ class StatusButtonsViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -754,7 +754,7 @@ class StatusButtonsViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -766,7 +766,7 @@ class StatusButtonsViewHolder( btnFavourite = customView { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -779,7 +779,7 @@ class StatusButtonsViewHolder( btnBookmark = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -798,7 +798,7 @@ class StatusButtonsViewHolder( background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -820,7 +820,7 @@ class StatusButtonsViewHolder( btnMore = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -836,7 +836,7 @@ class StatusButtonsViewHolder( btnTranslate = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -848,7 +848,7 @@ class StatusButtonsViewHolder( btnCustomShare1 = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -860,7 +860,7 @@ class StatusButtonsViewHolder( btnCustomShare2 = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER @@ -872,7 +872,7 @@ class StatusButtonsViewHolder( btnCustomShare3 = imageButton { background = ContextCompat.getDrawable( context, - R.drawable.btn_bg_transparent + R.drawable.btn_bg_transparent_round6dp ) setPadding(paddingH, paddingV, paddingH, paddingV) scaleType = ImageView.ScaleType.FIT_CENTER diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_User.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_User.kt index dcbdbf2e..e4867287 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_User.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_User.kt @@ -502,7 +502,7 @@ object Action_User { b.layoutParams = lp b.minHeight = (0.5f + 32f * activity.density).toInt() b.text = activity.getString(R.string.open_in_browser) - b.setBackgroundResource(R.drawable.btn_bg_transparent) + b.setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) b.setOnClickListener { App1.openCustomTab(activity, original_url) diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/AccountPicker.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/AccountPicker.kt index be8f04ab..ebb8f624 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/dialog/AccountPicker.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/AccountPicker.kt @@ -11,12 +11,15 @@ import android.view.View import android.widget.Button import android.widget.LinearLayout import android.widget.TextView +import androidx.core.content.ContextCompat import jp.juggler.subwaytooter.R import jp.juggler.subwaytooter.table.AcctColor import jp.juggler.subwaytooter.table.SavedAccount import jp.juggler.subwaytooter.util.DialogInterfaceCallback import jp.juggler.subwaytooter.util.SavedAccountCallback import jp.juggler.util.dismissSafe +import jp.juggler.util.getAdaptiveRippleDrawable +import jp.juggler.util.getAdaptiveRippleDrawableRound import jp.juggler.util.showToast import org.jetbrains.anko.textColor import java.util.* @@ -132,9 +135,9 @@ object AccountPicker { val b = Button(activity) if(AcctColor.hasColorBackground(ac)) { - b.setBackgroundColor(ac.color_bg) + b.background = getAdaptiveRippleDrawableRound(activity,ac.color_bg,ac.color_fg) } else { - b.setBackgroundResource(R.drawable.btn_bg_transparent) + b.setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) } if(AcctColor.hasColorForeground(ac)) { b.textColor = ac.color_fg diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgListMember.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgListMember.kt index 46288463..8cadd101 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgListMember.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgListMember.kt @@ -135,7 +135,7 @@ class DlgListMember( if(a == null) { btnListOwner.setText(R.string.not_selected) btnListOwner.setTextColor(getAttributeColor(activity, android.R.attr.textColorPrimary)) - btnListOwner.setBackgroundResource(R.drawable.btn_bg_transparent) + btnListOwner.setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) // } else { @@ -145,7 +145,7 @@ class DlgListMember( if(AcctColor.hasColorBackground(ac)) { btnListOwner.setBackgroundColor(ac.color_bg) } else { - btnListOwner.setBackgroundResource(R.drawable.btn_bg_transparent) + btnListOwner.setBackgroundResource(R.drawable.btn_bg_transparent_round6dp) } btnListOwner.textColor = ac.color_fg.notZero() ?: getAttributeColor(activity, android.R.attr.textColorPrimary) diff --git a/app/src/main/java/jp/juggler/util/UiUtils.kt b/app/src/main/java/jp/juggler/util/UiUtils.kt index ccfcbde8..301817ec 100644 --- a/app/src/main/java/jp/juggler/util/UiUtils.kt +++ b/app/src/main/java/jp/juggler/util/UiUtils.kt @@ -22,7 +22,7 @@ import androidx.core.content.ContextCompat import jp.juggler.subwaytooter.R import java.util.* -object UiUtils{ +object UiUtils { val log = LogCategory("UiUtils") } @@ -37,7 +37,6 @@ fun Int.applyAlphaMultiplier(alphaMultiplier : Float? = null) : Int { } } - fun getAttributeColor(context : Context, attrId : Int) : Int { val theme = context.theme val a = theme.obtainStyledAttributes(intArrayOf(attrId)) @@ -46,7 +45,6 @@ fun getAttributeColor(context : Context, attrId : Int) : Int { return color } - fun getAttributeDrawable(context : Context, attrId : Int) : Drawable { fun getAttributeResourceId(context : Context, attrId : Int) : Int { @@ -96,14 +94,46 @@ private fun getRectShape(color : Int) : Drawable { return shapeDrawable } +// 色を指定して角丸Drawableを作成する +fun createRoundDrawable( + radius : Float, + fillColor : Int? = null, + strokeColor : Int? = null, + strokeWidth : Int = 4 +) = + GradientDrawable().apply { + cornerRadius = radius + if(fillColor != null) setColor(fillColor) + if(strokeColor != null) setStroke(strokeWidth, strokeColor) + } + // 色を指定してRippleDrawableを生成する fun getAdaptiveRippleDrawable(normalColor : Int, pressedColor : Int) : Drawable { - return if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + return RippleDrawable(ColorStateList.valueOf(pressedColor), getRectShape(normalColor), null) +} + +// 色を指定してRippleDrawableを生成する +fun getAdaptiveRippleDrawableRound( + context : Context, + normalColor : Int, + pressedColor : Int, + roundNormal : Boolean = false +) : Drawable { + val dp6 = context.resources.displayMetrics.density * 6f + return if(roundNormal) { + // 押してない時に通常色を塗る範囲も角丸にする RippleDrawable( - ColorStateList.valueOf(pressedColor), getRectShape(normalColor), null + ColorStateList.valueOf(pressedColor), + createRoundDrawable(dp6, fillColor = normalColor), + null ) } else { - getStateListDrawable(normalColor, pressedColor) + // 押してない時に通常色を塗る範囲は四角だが、リップルエフェクトは角丸 + return RippleDrawable( + ColorStateList.valueOf(pressedColor), + getRectShape(normalColor), + createRoundDrawable(dp6,Color.WHITE) + ) } } @@ -180,7 +210,7 @@ fun createColoredDrawable( alphaMultiplier : Float ) : Drawable { val rgb = (color and 0xffffff) or Color.BLACK - val alpha = if(alphaMultiplier >= 1f ) { + val alpha = if(alphaMultiplier >= 1f) { (color ushr 24) } else { clipRange(0, 255, ((color ushr 24).toFloat() * alphaMultiplier + 0.5f).toInt()) @@ -255,7 +285,7 @@ fun setIconDrawableId( // ) //} -fun CharSequence.copyToClipboard(context:Context) { +fun CharSequence.copyToClipboard(context : Context) { try { // Gets a handle to the clipboard service. val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager @@ -276,8 +306,7 @@ fun CharSequence.copyToClipboard(context:Context) { } - -fun DialogInterface.dismissSafe(){ +fun DialogInterface.dismissSafe() { try { dismiss() } catch(ignored : Throwable) { @@ -286,7 +315,7 @@ fun DialogInterface.dismissSafe(){ } class CustomTextWatcher( - val callback: ()->Unit + val callback : () -> Unit ) : TextWatcher { override fun beforeTextChanged( @@ -305,14 +334,14 @@ class CustomTextWatcher( } // ImageButton のForeground colorで有効/無効を表現する -fun ImageButton.setEnabledColor(context:Context, iconId: Int,color:Int, enabled: Boolean) { +fun ImageButton.setEnabledColor(context : Context, iconId : Int, color : Int, enabled : Boolean) { isEnabled = enabled setImageDrawable( createColoredDrawable( context = context, drawableId = iconId, color = color, - alphaMultiplier = when (enabled) { + alphaMultiplier = when(enabled) { true -> 1f else -> 0.5f } diff --git a/app/src/main/java/jp/juggler/util/ViewUtils.kt b/app/src/main/java/jp/juggler/util/ViewUtils.kt index 98c6cfb5..dca9dd0f 100644 --- a/app/src/main/java/jp/juggler/util/ViewUtils.kt +++ b/app/src/main/java/jp/juggler/util/ViewUtils.kt @@ -87,11 +87,3 @@ var CompoundButton.isCheckedNoAnime : Boolean isChecked = value jumpDrawablesToCurrentState() } - - -fun createRoundDrawable(radius:Float,fillColor:Int?=null, strokeColor:Int?=null, strokeWidth:Int = 4) = - GradientDrawable().apply{ - setCornerRadius(radius) - if(fillColor!=null) setColor(fillColor) - if( strokeColor!=null) setStroke(strokeWidth,strokeColor) - } diff --git a/app/src/main/res/drawable/btn_bg_transparent.xml b/app/src/main/res/drawable/btn_bg_transparent.xml deleted file mode 100644 index 4f32da9d..00000000 --- a/app/src/main/res/drawable/btn_bg_transparent.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/act_about.xml b/app/src/main/res/layout/act_about.xml index 9cd1d67f..67acb9b0 100644 --- a/app/src/main/res/layout/act_about.xml +++ b/app/src/main/res/layout/act_about.xml @@ -60,7 +60,7 @@ android:id="@+id/btnRate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:padding="8dp" android:textAllCaps="false" tools:text="rate_on_store" @@ -84,7 +84,7 @@ android:id="@+id/btnReleaseNote" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:padding="8dp" android:textAllCaps="false" tools:text="https://github.com/tateisu/SubwayTooter/releases" @@ -108,7 +108,7 @@ android:id="@+id/btnOfficialAccount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:padding="8dp" android:textAllCaps="false" tools:text="SubwayTooter@mastodon.juggler.jp" @@ -132,7 +132,7 @@ android:id="@+id/btnDeveloper" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:padding="8dp" android:textAllCaps="false" tools:text="tateisu@mastodon.juggler.jp" @@ -157,7 +157,7 @@ android:id="@+id/btnIconDesign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:padding="8dp" android:textAllCaps="false" android:layout_marginStart="32dp" @@ -180,7 +180,7 @@ - + @@ -216,7 +216,7 @@ android:id="@+id/btnWeblate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:padding="8dp" android:textAllCaps="false" android:layout_marginStart="32dp" diff --git a/app/src/main/res/layout/act_account_setting.xml b/app/src/main/res/layout/act_account_setting.xml index 1a23936a..ed4dc592 100644 --- a/app/src/main/res/layout/act_account_setting.xml +++ b/app/src/main/res/layout/act_account_setting.xml @@ -65,7 +65,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/edit" android:src="@drawable/ic_edit" android:tint="?attr/colorVectorDrawable" /> @@ -155,7 +155,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/post" android:src="@drawable/ic_send" android:tint="?attr/colorVectorDrawable" /> @@ -181,7 +181,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/post" android:src="@drawable/ic_send" android:tint="?attr/colorVectorDrawable" /> @@ -319,7 +319,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/post" android:src="@drawable/ic_send" android:tint="?attr/colorVectorDrawable" /> diff --git a/app/src/main/res/layout/act_app_setting.xml b/app/src/main/res/layout/act_app_setting.xml index 819aa50d..7bfc793a 100644 --- a/app/src/main/res/layout/act_app_setting.xml +++ b/app/src/main/res/layout/act_app_setting.xml @@ -27,7 +27,7 @@ @@ -483,7 +483,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/visibility" android:minWidth="48dp" android:minHeight="48dp" @@ -495,7 +495,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/plugin" android:src="@drawable/ic_extension" android:tint="?attr/colorVectorDrawable" /> @@ -505,7 +505,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="4dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/more" android:src="@drawable/ic_more" android:tint="?attr/colorVectorDrawable" @@ -532,7 +532,7 @@ android:id="@+id/btnPost" android:layout_width="48dp" android:layout_height="48dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/toot" android:src="@drawable/ic_send" android:tint="?attr/colorVectorDrawable" diff --git a/app/src/main/res/layout/dlg_account_picker.xml b/app/src/main/res/layout/dlg_account_picker.xml index efd93b9f..2d83cefc 100644 --- a/app/src/main/res/layout/dlg_account_picker.xml +++ b/app/src/main/res/layout/dlg_account_picker.xml @@ -45,7 +45,7 @@ android:id="@+id/btnCancel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:text="@string/cancel" android:textAllCaps="false" /> diff --git a/app/src/main/res/layout/dlg_context_menu.xml b/app/src/main/res/layout/dlg_context_menu.xml index 320b8425..88450e32 100644 --- a/app/src/main/res/layout/dlg_context_menu.xml +++ b/app/src/main/res/layout/dlg_context_menu.xml @@ -53,7 +53,7 @@ android:id="@+id/btnStatusWebPage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -67,7 +67,7 @@ android:id="@+id/btnText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -81,7 +81,7 @@ android:id="@+id/btnTranslate" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -95,7 +95,7 @@ android:id="@+id/btnQuoteUrlStatus" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -109,7 +109,7 @@ android:id="@+id/btnShareUrlStatus" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -125,7 +125,7 @@ android:id="@+id/btnCrossAccountActionsForStatus" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -151,7 +151,7 @@ android:id="@+id/btnConversationAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -165,7 +165,7 @@ android:id="@+id/btnReplyAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -179,7 +179,7 @@ android:id="@+id/btnBoostAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -193,7 +193,7 @@ android:id="@+id/btnFavouriteAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -207,7 +207,7 @@ android:id="@+id/btnBookmarkAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -221,7 +221,7 @@ android:id="@+id/btnReactionAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -237,7 +237,7 @@ android:id="@+id/btnAroundThisToot" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -262,7 +262,7 @@ android:id="@+id/btnAroundAccountTL" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -276,7 +276,7 @@ android:id="@+id/btnAroundLTL" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -290,7 +290,7 @@ android:id="@+id/btnAroundFTL" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -307,7 +307,7 @@ android:id="@+id/btnYourToot" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -333,7 +333,7 @@ android:id="@+id/btnRedraft" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -347,7 +347,7 @@ android:id="@+id/btnProfilePin" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -361,7 +361,7 @@ android:id="@+id/btnProfileUnpin" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -375,7 +375,7 @@ android:id="@+id/btnDelete" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -395,7 +395,7 @@ android:id="@+id/btnStatusExtraAction" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -421,7 +421,7 @@ android:id="@+id/btnBoostedBy" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -435,7 +435,7 @@ android:id="@+id/btnFavouritedBy" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -450,7 +450,7 @@ android:id="@+id/btnBoostWithVisibility" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -464,7 +464,7 @@ android:id="@+id/btnQuotedRenote" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -479,7 +479,7 @@ android:id="@+id/btnMuteApp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -495,7 +495,7 @@ android:id="@+id/btnConversationMute" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -509,7 +509,7 @@ android:id="@+id/btnReportStatus" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -549,7 +549,7 @@ android:id="@+id/btnNotificationDelete" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -596,7 +596,7 @@ android:id="@+id/btnFollow" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/follow" android:scaleType="center" tools:src="@drawable/ic_follow_plus" /> @@ -620,7 +620,7 @@ android:id="@+id/btnMute" android:layout_width="40dp" android:layout_height="40dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/mute" android:src="@drawable/ic_volume_off" /> @@ -628,7 +628,7 @@ android:id="@+id/btnBlock" android:layout_width="40dp" android:layout_height="40dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/block" android:src="@drawable/ic_block" /> @@ -639,7 +639,7 @@ android:id="@+id/btnProfile" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -653,7 +653,7 @@ android:id="@+id/btnAccountWebPage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -667,7 +667,7 @@ android:id="@+id/btnAccountText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -681,7 +681,7 @@ android:id="@+id/btnSendMessage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -696,7 +696,7 @@ android:id="@+id/btnQuoteUrlAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -710,7 +710,7 @@ android:id="@+id/btnShareUrlAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -724,7 +724,7 @@ android:id="@+id/btnQuoteName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -738,7 +738,7 @@ android:id="@+id/btnFollowRequestOK" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -753,7 +753,7 @@ android:id="@+id/btnFollowRequestNG" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -768,7 +768,7 @@ android:id="@+id/btnListMemberAddRemove" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -783,7 +783,7 @@ android:id="@+id/btnReportUser" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -799,7 +799,7 @@ android:id="@+id/btnCrossAccountActionsForAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -826,7 +826,7 @@ android:id="@+id/btnOpenProfileFromAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -840,7 +840,7 @@ android:id="@+id/btnFollowFromAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -854,7 +854,7 @@ android:id="@+id/btnSendMessageFromAnotherAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -869,7 +869,7 @@ android:id="@+id/btnAccountExtraAction" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -895,7 +895,7 @@ android:id="@+id/btnNickname" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -909,7 +909,7 @@ android:id="@+id/btnAvatarImage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -923,7 +923,7 @@ android:id="@+id/btnAccountQrCode" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -938,7 +938,7 @@ android:id="@+id/btnNotificationFrom" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -953,7 +953,7 @@ android:id="@+id/btnEndorse" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -967,7 +967,7 @@ android:id="@+id/btnHideBoost" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -981,7 +981,7 @@ android:id="@+id/btnShowBoost" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -995,7 +995,7 @@ android:id="@+id/btnHideFavourite" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1009,7 +1009,7 @@ android:id="@+id/btnShowFavourite" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1024,7 +1024,7 @@ android:id="@+id/btnDeleteSuggestion" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:drawablePadding="4dp" android:gravity="start|center_vertical" android:minHeight="32dp" @@ -1039,7 +1039,7 @@ android:id="@+id/btnCopyAccountId" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1053,7 +1053,7 @@ android:id="@+id/btnOpenAccountInAdminWebUi" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1096,7 +1096,7 @@ android:id="@+id/btnOpenTimeline" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1111,7 +1111,7 @@ android:id="@+id/btnInstanceInformation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1126,7 +1126,7 @@ android:id="@+id/btnProfileDirectory" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1142,7 +1142,7 @@ android:id="@+id/btnDomainBlock" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1157,7 +1157,7 @@ android:id="@+id/btnOpenInstanceInAdminWebUi" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1171,7 +1171,7 @@ android:id="@+id/btnDomainTimeline" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="start|center_vertical" android:minHeight="32dp" android:paddingStart="8dp" @@ -1196,7 +1196,7 @@ android:id="@+id/btnCancel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:text="@string/cancel" android:textAllCaps="false" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dlg_qr_code.xml b/app/src/main/res/layout/dlg_qr_code.xml index a534ef82..2b84e7af 100644 --- a/app/src/main/res/layout/dlg_qr_code.xml +++ b/app/src/main/res/layout/dlg_qr_code.xml @@ -47,7 +47,7 @@ android:id="@+id/btnCancel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:text="@string/close" android:textAllCaps="false" /> diff --git a/app/src/main/res/layout/lv_header_instance.xml b/app/src/main/res/layout/lv_header_instance.xml index 20886352..b965d0e7 100644 --- a/app/src/main/res/layout/lv_header_instance.xml +++ b/app/src/main/res/layout/lv_header_instance.xml @@ -94,7 +94,7 @@ diff --git a/app/src/main/res/layout/lv_header_profile.xml b/app/src/main/res/layout/lv_header_profile.xml index 4db1607f..26ac16d2 100644 --- a/app/src/main/res/layout/lv_header_profile.xml +++ b/app/src/main/res/layout/lv_header_profile.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="12dp" android:layout_marginStart="12dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:gravity="center_vertical" android:orientation="horizontal" > @@ -81,7 +81,7 @@ android:id="@+id/btnMoved" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/follow" android:scaleType="center" tools:src="@drawable/ic_follow_plus" @@ -133,7 +133,7 @@ android:layout_width="128dp" android:layout_height="128dp" android:layout_marginTop="20dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" /> @@ -251,7 +251,7 @@ android:id="@+id/btnFollowing" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" tools:text="following\n9999" /> @@ -259,7 +259,7 @@ android:id="@+id/btnFollowers" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" tools:text="followers\n9999" /> @@ -267,7 +267,7 @@ android:id="@+id/btnMore" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:contentDescription="@string/more" android:minWidth="48dp" android:paddingEnd="4dp" diff --git a/app/src/main/res/layout/lv_language_filter.xml b/app/src/main/res/layout/lv_language_filter.xml index 1bb89ebb..3f1ee9f7 100644 --- a/app/src/main/res/layout/lv_language_filter.xml +++ b/app/src/main/res/layout/lv_language_filter.xml @@ -6,5 +6,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="48dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/lv_sidemenu_item.xml b/app/src/main/res/layout/lv_sidemenu_item.xml index de643d43..7a06517e 100644 --- a/app/src/main/res/layout/lv_sidemenu_item.xml +++ b/app/src/main/res/layout/lv_sidemenu_item.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" android:textColor="?attr/colorContentText" android:gravity="center_vertical|start" android:drawablePadding="12dp" diff --git a/app/src/main/res/layout/lv_spinner_dropdown.xml b/app/src/main/res/layout/lv_spinner_dropdown.xml index 5923ffc6..69e18f08 100644 --- a/app/src/main/res/layout/lv_spinner_dropdown.xml +++ b/app/src/main/res/layout/lv_spinner_dropdown.xml @@ -6,5 +6,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="48dp" - android:background="@drawable/btn_bg_transparent" + android:background="@drawable/btn_bg_transparent_round6dp" /> \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f34bef49..87dd5241 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -145,11 +145,10 @@ 0dp 36dp 0dp - @drawable/btn_bg_transparent + @drawable/btn_bg_transparent_round6dp start|center_vertical false 12dp -