|
|
@@ -106,7 +106,7 @@ |
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
android:id="@+id/layout3" |
|
|
|
android:id="@+id/layout6" |
|
|
|
android:layout_width="0dp" |
|
|
|
android:layout_height="@dimen/dp_36" |
|
|
|
android:layout_weight="1" |
|
|
@@ -114,15 +114,17 @@ |
|
|
|
android:paddingHorizontal="@dimen/dp_4"> |
|
|
|
|
|
|
|
<Button |
|
|
|
android:id="@+id/btnBlack" |
|
|
|
android:id="@+id/btnGreen" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="30dp" |
|
|
|
android:background="@drawable/plate3" |
|
|
|
android:text="黑牌" |
|
|
|
android:background="@drawable/plate6" |
|
|
|
android:text="渐变绿牌" |
|
|
|
android:textColor="@color/white" |
|
|
|
android:textSize="13sp" |
|
|
|
tools:ignore="ButtonStyle" /> |
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
<LinearLayout |
|
|
@@ -152,7 +154,7 @@ |
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
android:id="@+id/layout5" |
|
|
|
android:id="@+id/layout3" |
|
|
|
android:layout_width="0dp" |
|
|
|
android:layout_height="@dimen/dp_36" |
|
|
|
android:layout_weight="1" |
|
|
@@ -160,18 +162,18 @@ |
|
|
|
android:paddingHorizontal="@dimen/dp_4"> |
|
|
|
|
|
|
|
<Button |
|
|
|
android:id="@+id/btnYellowGreen" |
|
|
|
android:id="@+id/btnBlack" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="30dp" |
|
|
|
android:background="@drawable/plate5" |
|
|
|
android:text="黄绿双拼" |
|
|
|
android:background="@drawable/plate3" |
|
|
|
android:text="黑牌" |
|
|
|
android:textColor="@color/white" |
|
|
|
android:textSize="13sp" |
|
|
|
tools:ignore="ButtonStyle" /> |
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
<LinearLayout |
|
|
|
android:id="@+id/layout6" |
|
|
|
android:id="@+id/layout5" |
|
|
|
android:layout_width="0dp" |
|
|
|
android:layout_height="@dimen/dp_36" |
|
|
|
android:layout_weight="1" |
|
|
@@ -179,15 +181,16 @@ |
|
|
|
android:paddingHorizontal="@dimen/dp_4"> |
|
|
|
|
|
|
|
<Button |
|
|
|
android:id="@+id/btnGreen" |
|
|
|
android:id="@+id/btnYellowGreen" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="30dp" |
|
|
|
android:background="@drawable/plate6" |
|
|
|
android:text="渐变绿牌" |
|
|
|
android:background="@drawable/plate5" |
|
|
|
android:text="黄绿双拼" |
|
|
|
android:textColor="@color/white" |
|
|
|
android:textSize="13sp" |
|
|
|
tools:ignore="ButtonStyle" /> |
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
</LinearLayout> |
|
|
|
</LinearLayout> |
|
|
|
</LinearLayout> |