王鹏鹏 před 2 roky
rodič
revize
facb6e16c6

+ 1 - 1
.idea/misc.xml

@@ -444,7 +444,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_order_list.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_service_package.xml" value="0.326671261199173" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_content_details.xml" value="0.152" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.18655967903711135" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.2742616033755274" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.16455696202531644" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/calendar_pick_view_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/dialog_course_treatment.xml" value="0.1" />

+ 5 - 0
workbenches/src/main/res/color/mental_radio_color.xml

@@ -0,0 +1,5 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:color="@android:color/white" android:state_checked="false" />
+    <!-- not selected -->
+    <item android:color="@color/color_FF2B70FF" android:state_checked="true" />
+</selector>

+ 2 - 2
workbenches/src/main/res/drawable/selector_train_radio_checked.xml

@@ -5,9 +5,9 @@
     tools:ignore="ResourceName">
     <stroke
         android:width="@dimen/divider_1px"
-        android:color="@color/color_69B8CFFF" />
+        android:color="@android:color/white" />
     <corners android:radius="@dimen/divider_12px" />
-    <solid android:color="@color/color_69B8CFFF" />
+    <solid android:color="@android:color/white" />
 </shape>
 
 

+ 9 - 5
workbenches/src/main/res/layout/activity_train_data.xml

@@ -41,28 +41,32 @@
                 android:background="@drawable/selector_train_radio"
                 android:checked="true"
                 android:drawableStart="@mipmap/icon_data_monitor"
-                android:text="@string/tab1" />
+                android:text="@string/tab1"
+                android:textColor="@color/mental_radio_color" />
 
             <RadioButton
                 android:id="@+id/radioBrainAbility"
                 style="@style/train_report_radio_button"
                 android:background="@drawable/selector_train_radio"
                 android:drawableStart="@mipmap/icon_radio_brain"
-                android:text="@string/tab2" />
+                android:text="@string/tab2"
+                android:textColor="@color/mental_radio_color" />
 
             <RadioButton
                 android:id="@+id/radioTrainContent"
                 style="@style/train_report_radio_button"
                 android:background="@drawable/selector_train_radio"
                 android:drawableStart="@mipmap/icon_train_content"
-                android:text="@string/tab3" />
+                android:text="@string/tab3"
+                android:textColor="@color/mental_radio_color" />
 
             <RadioButton
                 android:id="@+id/radioTrainReport"
                 style="@style/train_report_radio_button"
                 android:background="@drawable/selector_train_radio"
                 android:drawableStart="@mipmap/icon_train_report"
-                android:text="@string/tab4" />
+                android:text="@string/tab4"
+                android:textColor="@color/mental_radio_color" />
 
         </RadioGroup>
 
@@ -74,8 +78,8 @@
             android:background="@drawable/bg_train_right"
             app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/radioOperate"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/radioOperate"
             app:layout_constraintTop_toTopOf="parent">
 
         </androidx.cardview.widget.CardView>

binární
workbenches/src/main/res/mipmap-xxhdpi/icon_data_monitor.png


binární
workbenches/src/main/res/mipmap-xxhdpi/icon_radio_brain.png


binární
workbenches/src/main/res/mipmap-xxhdpi/icon_train_content.png


binární
workbenches/src/main/res/mipmap-xxhdpi/icon_train_report.png