王鹏鹏 пре 2 година
родитељ
комит
bbc3765868

+ 1 - 1
.idea/misc.xml

@@ -598,7 +598,7 @@
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_multiple_choice.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_recognition_image.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_choice.xml" value="0.536" />
-        <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_number.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_number.xml" value="1.2" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/drawable/selector_text_choice.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_alternating_connection.xml" value="0.49146341463414633" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_identify_picture.xml" value="0.4" />

+ 2 - 2
mmse/src/main/res/layout/item_number.xml

@@ -18,18 +18,18 @@
         android:layout_marginStart="@dimen/divider_15px"
         android:layout_marginTop="@dimen/divider_30px"
         android:layout_marginEnd="@dimen/divider_15px"
+        android:descendantFocusability="blocksDescendants"
         android:theme="@style/Theme.MaterialComponents.NoActionBar"
         app:cardBackgroundColor="@color/color_FFF6F4F4"
         app:cardCornerRadius="@dimen/divider_8px"
         app:strokeColor="@color/color_FF979797"
         app:strokeWidth="@dimen/divider_1px">
 
-        <androidx.appcompat.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvNumber"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:background="@null"
             android:gravity="center"
             android:text="@{data}"
             android:textColor="@color/color_FF222222"

+ 1 - 2
moca/src/main/res/layout/item_moca_number.xml

@@ -24,12 +24,11 @@
         app:strokeColor="@color/color_FF979797"
         app:strokeWidth="@dimen/divider_1px">
 
-        <androidx.appcompat.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvNumber"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:background="@null"
             android:gravity="center"
             android:text="@{data}"
             android:textColor="@color/color_FF222222"