Browse Source

1.替换UI

王鹏鹏 2 years ago
parent
commit
ff66d785ad

+ 2 - 0
.idea/misc.xml

@@ -501,8 +501,10 @@
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_train_radio.xml" value="0.164" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_train_radio_checked.xml" value="0.164" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.164" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_free_train.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_service_package.xml" value="0.3953084274543875" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_train_data.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_free_training_type.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_service_package_type.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_main.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_push.xml" value="0.22239583333333332" />

+ 1 - 3
workbenches/src/main/java/com/yingyang/workbenches/adapter/FreeTrainTypeAdapter.kt

@@ -26,10 +26,8 @@ class FreeTrainTypeAdapter(override val layoutId: Int = R.layout.item_free_train
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.setTextColorResource(R.color.color_FF4A76FF)
-            binding.tvType.setBackgroundResource(R.mipmap.icon_train_selected)
+            binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_checked)
         } else {
-            binding.tvType.setTextColorResource(R.color.color_ffffff)
             binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_unchecked)
         }
         binding.tvType.setOnSingleClickListener {

+ 1 - 4
workbenches/src/main/java/com/yingyang/workbenches/adapter/LeisureBrainTypeAdapter.kt

@@ -26,12 +26,9 @@ class LeisureBrainTypeAdapter(override val layoutId: Int = R.layout.item_free_tr
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.setTextColorResource(R.color.color_FF4A76FF)
-            binding.tvType.setBackgroundResource(R.mipmap.icon_train_selected)
+            binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_checked)
         } else {
-            binding.tvType.setTextColorResource(R.color.color_ffffff)
             binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_unchecked)
-
         }
         binding.tvType.setOnSingleClickListener {
             currentPosition = position

+ 1 - 1
workbenches/src/main/res/layout/item_free_training_type.xml

@@ -22,7 +22,7 @@
             android:gravity="center"
             android:paddingBottom="@dimen/divider_5px"
             android:text="@{data.dictLabel}"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_0a374a"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 

+ 1 - 0
workbenches/src/main/res/values/colors.xml

@@ -62,4 +62,5 @@
     <color name="color_11489b" tools:ignore="ResourceName">#11489b</color>
     <color name="color_ddfbe01" tools:ignore="ResourceName">#ddfbe0</color>
     <color name="color_cdf4f7" tools:ignore="ResourceName">#cdf4f7</color>
+    <color name="color_0a374a" tools:ignore="ResourceName">#0a374a</color>
 </resources>