リアクションボタンのサイズ調整

app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt

@@ -485,7 +485,7 @@ internal class ItemViewHolder(
 					n.time_created_at,
 					R.attr.ic_question,
 					R.string.display_name_reaction_by
-					, reaction?.drawableId
+					, reaction?.btnDrawableId
 				)
 				if(n_status != null) showStatus(activity, n_status)
 				
@@ -1471,10 +1471,9 @@ internal class ItemViewHolder(
 		val buttonHeight = ActMain.boostButtonSize
 		val marginBetween = (ActMain.boostButtonSize.toFloat() * 0.05f + 0.5f).toInt()
 		
-		val paddingH = (buttonHeight.toFloat() / 10 + 0.5f).toInt()
-		val paddingV = (buttonHeight.toFloat() / 10 + 0.5f).toInt()
-		val compoundPaddingDp =
-			ActMain.boostButtonSize.toFloat() * 0.00f / activity.resources.displayMetrics.density
+		val paddingH = (buttonHeight.toFloat() *0.1f + 0.5f).toInt()
+		val paddingV = (buttonHeight.toFloat() *0.1f + 0.5f).toInt()
+		val compoundPaddingDp = 0f // ActMain.boostButtonSize.toFloat() * 0f / activity.resources.displayMetrics.density
 		
 		val box = FlexboxLayout(activity)
 		val boxLp = LinearLayout.LayoutParams(
@@ -1517,7 +1516,7 @@ internal class ItemViewHolder(
 			)
 			b.minimumWidth = buttonHeight
 			
-			b.imageResource = mr.drawableId
+			b.imageResource = mr.btnDrawableId
 			b.scaleType = ImageView.ScaleType.FIT_CENTER
 			
 			b.layoutParams = blp

app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt

@@ -369,9 +369,9 @@ class StatusButtonsViewHolder(
 	private val buttonHeight = ActMain.boostButtonSize
 	private val marginBetween = (ActMain.boostButtonSize.toFloat() * 0.05f + 0.5f).toInt()
 
-	val paddingH = (buttonHeight.toFloat()/10 +0.5f).toInt()
-	val paddingV = (buttonHeight.toFloat()/10 +0.5f).toInt()
-	val compoundPaddingDp = ActMain.boostButtonSize.toFloat() * -0.085f / activity.resources.displayMetrics.density
+	val paddingH = (buttonHeight.toFloat()*0.1f +0.5f).toInt()
+	val paddingV = (buttonHeight.toFloat()*0.1f +0.5f).toInt()
+	val compoundPaddingDp = 0f //  ActMain.boostButtonSize.toFloat() * -0f / activity.resources.displayMetrics.density
 
 	val viewRoot : FlexboxLayout
 

app/src/main/java/jp/juggler/subwaytooter/api/entity/MisskeyReaction.kt

@@ -2,25 +2,30 @@ package jp.juggler.subwaytooter.api.entity
 
 import jp.juggler.subwaytooter.R
 
-enum class MisskeyReaction(val shortcode:String,val drawableId:Int){
-
-
-	Like("like", R.drawable.emj_1f44d),
-	Love("love",R.drawable.emj_2665),
-	Laugh("laugh",R.drawable.emj_1f606),
-	Hmm("hmm", R.drawable.emj_1f914),
-	Surprise("surprise",R.drawable.emj_1f62e),
-	Congrats("congrats",R.drawable.emj_1f389),
-	Angry("angry",R.drawable.emj_1f4a2),
-	Confused("confused",R.drawable.emj_1f625),
-	Rip("rip", R.drawable.emj_1f607),
-	Pudding("pudding", R.drawable.emj_1f36e)	;
-
+enum class MisskeyReaction(
+	val shortcode : String,
+	val drawableId : Int,
+	val btnDrawableId : Int
+) {
+	
+	Like("like", R.drawable.emj_1f44d, R.drawable.btn_reaction_angry),
+	Love("love", R.drawable.emj_2665, R.drawable.btn_reaction_confused),
+	Laugh("laugh", R.drawable.emj_1f606, R.drawable.btn_reaction_congrats),
+	Hmm("hmm", R.drawable.emj_1f914, R.drawable.btn_reaction_hmm),
+	Surprise("surprise", R.drawable.emj_1f62e, R.drawable.btn_reaction_laugh),
+	Congrats("congrats", R.drawable.emj_1f389, R.drawable.btn_reaction_like),
+	Angry("angry", R.drawable.emj_1f4a2, R.drawable.btn_reaction_love),
+	Confused("confused", R.drawable.emj_1f625, R.drawable.btn_reaction_pudding),
+	Rip("rip", R.drawable.emj_1f607, R.drawable.btn_reaction_rip),
+	Pudding("pudding", R.drawable.emj_1f36e, R.drawable.btn_reaction_surprise)
+	
+	;
+	
 	companion object {
-		val shortcodeMap: HashMap<String,MisskeyReaction> by lazy {
-			HashMap<String,MisskeyReaction>().apply {
-				for( e in MisskeyReaction.values()){
-					put( e.shortcode,e)
+		val shortcodeMap : HashMap<String, MisskeyReaction> by lazy {
+			HashMap<String, MisskeyReaction>().apply {
+				for(e in MisskeyReaction.values()) {
+					put(e.shortcode, e)
 				}
 			}
 		}

resizeLauncherIcon.pl

@@ -124,4 +124,17 @@ my $res_dir = "app/src/main/res";
 
 #resize_scales( "_ArtWork/ic_cat.png"	,$res_dir,"drawable","ic_cat",0,24);
 #resize_scales( "_ArtWork/ic_shield.png"	,$res_dir,"drawable","ic_shield",0,24);
-resize_scales( "_ArtWork/ic_mobile.png"	,$res_dir,"drawable","ic_mobile",0,24);
+#resize_scales( "_ArtWork/ic_mobile.png"	,$res_dir,"drawable","ic_mobile",0,24);
+
+
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_angry.png"			,$res_dir,"drawable","btn_reaction_angry",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_confused.png"			,$res_dir,"drawable","btn_reaction_confused",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_congrats.png"			,$res_dir,"drawable","btn_reaction_congrats",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_hmm.png"			,$res_dir,"drawable","btn_reaction_hmm",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_laugh.png"			,$res_dir,"drawable","btn_reaction_laugh",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_like.png"			,$res_dir,"drawable","btn_reaction_like",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_love.png"			,$res_dir,"drawable","btn_reaction_love",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_pudding.png"			,$res_dir,"drawable","btn_reaction_pudding",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_rip.png"			,$res_dir,"drawable","btn_reaction_rip",0,32);
+resize_scales( "_ArtWork/misskey-reaction/btn_reaction_surprise.png"			,$res_dir,"drawable","btn_reaction_surprise",0,32);
+