ブーストボタンのポップアップの背景色や投稿画面の配色がおかしかったのを修正

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

@@ -108,17 +108,19 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke
 	}
 	
 	override fun onClick(v : View) {
+
 		val builder : ColorPickerDialog.Builder
+
 		when(v.id) {
 			
 			R.id.btnHeaderBackgroundEdit -> {
-				builder = ColorPickerDialog.newBuilder()
+				ColorPickerDialog.newBuilder()
 					.setDialogType(ColorPickerDialog.TYPE_CUSTOM)
 					.setAllowPresets(true)
 					.setShowAlphaSlider(false)
 					.setDialogId(COLOR_DIALOG_ID_HEADER_BACKGROUND)
-				if(column.header_bg_color != 0) builder.setColor(column.header_bg_color)
-				builder.show(this)
+					.setColor(column.getHeaderBackgroundColor(this))
+					.show(this)
 			}
 			
 			R.id.btnHeaderBackgroundReset -> {

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

@@ -215,8 +215,8 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 	
 	private lateinit var btnAccount : Button
 	private lateinit var btnVisibility : ImageButton
-	private lateinit var btnAttachment : View
-	private lateinit var btnPost : View
+	private lateinit var btnAttachment : ImageButton
+	private lateinit var btnPost : ImageButton
 	private lateinit var llAttachment : View
 	private lateinit var ivMedia : List<MyNetworkImageView>
 	internal lateinit var cbNSFW : CheckBox
@@ -895,8 +895,13 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 		btnPost.setOnClickListener(this)
 		btnRemoveReply.setOnClickListener(this)
 		
-		findViewById<View>(R.id.btnPlugin).setOnClickListener(this)
-		findViewById<View>(R.id.btnEmojiPicker).setOnClickListener(this)
+		val btnPlugin :ImageButton = findViewById(R.id.btnPlugin)
+		val btnEmojiPicker :ImageButton = findViewById(R.id.btnEmojiPicker)
+		val btnMore: ImageButton = findViewById(R.id.btnMore)
+
+		btnPlugin.setOnClickListener(this)
+		btnEmojiPicker.setOnClickListener(this)
+		btnMore.setOnClickListener(this)
 		
 		for(iv in ivMedia) {
 			iv.setOnClickListener(this)
@@ -904,6 +909,12 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 			iv.setErrorImageResId(Styler.getAttributeResourceId(this, R.attr.ic_unknown))
 		}
 		
+		setIcon(btnPost,R.drawable.btn_post)
+		setIcon(btnMore,R.drawable.btn_more)
+		setIcon(btnPlugin,R.drawable.ic_plugin)
+		setIcon(btnEmojiPicker,R.drawable.ic_face)
+		setIcon(btnAttachment,R.drawable.btn_attachment)
+		
 		cbContentWarning.setOnCheckedChangeListener { _, _ ->
 			updateContentWarning()
 		}
@@ -931,8 +942,6 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 		
 		scrollView.viewTreeObserver.addOnScrollChangedListener(scroll_listener)
 		
-		val v = findViewById<View>(R.id.btnMore)
-		v.setOnClickListener(this)
 		
 		etContent.contentMineTypeArray =
 			acceptable_mime_types.toArray(arrayOfNulls<String>(ActPost.acceptable_mime_types.size))
@@ -940,6 +949,15 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 	
 	}
 	
+	private fun setIcon(iv:ImageView,drawableId:Int) {
+		Styler.setIconDrawableId(
+			this,
+			iv,
+			drawableId,
+			Styler.getAttributeColor(this,R.attr.colorColumnHeaderName)
+		)
+	}
+	
 	private var lastInstanceTask : TootTaskRunner? = null
 	
 	private fun getMaxCharCount() : Int {
@@ -1864,13 +1882,11 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 	}
 	
 	private fun showVisibility() {
-		btnVisibility.setImageResource(
-			Styler.getVisibilityIcon(
-				this
-				, account?.isMisskey == true
-				, visibility ?: TootVisibility.Public
-			)
-		)
+		setIcon(btnVisibility,Styler.getVisibilityIcon(
+			this
+			, account?.isMisskey == true
+			, visibility ?: TootVisibility.Public
+		))
 	}
 	
 	private fun performVisibility() {

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

@@ -6838,10 +6838,7 @@ class Column(
 		val c = header_fg_color
 		return when {
 			c != 0 -> c
-			else -> Styler.getAttributeColor(
-				activity,
-				R.attr.colorColumnHeaderPageNumber
-			)
+			else -> Styler.getAttributeColor(activity,R.attr.colorColumnHeaderPageNumber)
 		}
 	}
 	
@@ -6849,24 +6846,29 @@ class Column(
 		val c = header_fg_color
 		return when {
 			c != 0 -> c
-			else -> Styler.getAttributeColor(
-				activity,
-				R.attr.colorColumnHeaderName
-			)
+			else -> Styler.getAttributeColor(activity,R.attr.colorColumnHeaderName)
+		}
+	}
+	
+	fun getHeaderBackgroundColor(activity : AppCompatActivity) : Int {
+		val c = header_bg_color
+		return when {
+			c != 0 -> c
+			else -> Styler.getAttributeColor(activity,R.attr.color_column_header)
 		}
 	}
 	
 	fun setHeaderBackground(activity : AppCompatActivity, view : View) {
-		val c = header_bg_color
-		if(c == 0) {
-			view.setBackgroundResource(R.drawable.bg_column_header)
-		} else {
-			ViewCompat.setBackground(
-				view, Styler.getAdaptiveRippleDrawable(c, getHeaderNameColor(activity))
+		ViewCompat.setBackground(
+			view,
+			Styler.getAdaptiveRippleDrawable(
+				getHeaderBackgroundColor(activity),
+				getHeaderNameColor(activity)
 			)
-		}
+		)
 	}
 	
+	
 	//	fun findListIndexByTimelineId(orderId : EntityId) : Int? {
 	//		list_data.forEachIndexed { i, v ->
 	//			if(v.getOrderId() == orderId) return i

app/src/main/res/drawable/list_item_popup_bg.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle"
     >
-    <solid android:color="?attr/color_column_header"/>
+    <solid android:color="?attr/colorButtonBg"/>
     <corners android:radius="16dp" />
     <padding android:top="8dp"
              android:bottom="8dp"

app/src/main/res/drawable/list_item_popup_triangle.xml

@@ -9,7 +9,7 @@
     <group android:name="group1">
         <path
             android:name="triangle"
-            android:fillColor="?attr/color_column_header"
+            android:fillColor="?attr/colorButtonBg"
             android:pathData="M0,32L16,0L32,24H0z"
             />
     </group>

app/src/main/res/drawable/list_item_popup_triangle_bottom.xml

@@ -9,7 +9,7 @@
     <group android:name="group1">
         <path
             android:name="triangle"
-            android:fillColor="?attr/color_column_header"
+            android:fillColor="?attr/colorButtonBg"
             android:pathData="M0,0L16,24L32,0H0z"
             />
     </group>

app/src/main/res/layout/act_post.xml

@@ -358,7 +358,7 @@
         android:id="@+id/llFooterBar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="?attr/color_column_header"
+        android:background="?attr/colorButtonBg"
         android:baselineAligned="false"
         android:orientation="horizontal"
         >
@@ -429,6 +429,7 @@
             android:background="@drawable/btn_bg_transparent"
             android:contentDescription="@string/toot"
             android:src="?attr/btn_post"
+
             />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/values/styles.xml

@@ -6,9 +6,6 @@
         <item name="android:windowBackground">@drawable/window_background_light</item>
         <item name="android:textColor">?attr/colorContentText</item>
 
-        <!-- AndroidOne S2ではナビゲーションバーが明るすぎるとアイコン図柄が判別できなくなる-->
-        <!-- <item name="android:navigationBarColor">@color/Light_color_column_header</item> -->
-
         <item name="colorPrimary">@color/Light_colorPrimary</item>
         <item name="colorPrimaryDark">@color/Light_colorPrimaryDark</item>
         <item name="colorAccent">@color/Light_colorAccent</item>