|
|
@@ -351,52 +351,48 @@
|
|
|
android:orientation="vertical"
|
|
|
android:visibility="gone">
|
|
|
|
|
|
- <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ <androidx.cardview.widget.CardView
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="0dp"
|
|
|
- android:layout_marginStart="@dimen/divider_37px"
|
|
|
- android:layout_marginTop="@dimen/divider_21px"
|
|
|
- android:layout_marginEnd="@dimen/divider_36px"
|
|
|
- android:layout_weight="1">
|
|
|
+ android:layout_marginStart="@dimen/divider_65px"
|
|
|
+ android:layout_marginTop="@dimen/divider_63px"
|
|
|
+ android:layout_marginEnd="@dimen/divider_65px"
|
|
|
+ android:layout_weight="1"
|
|
|
+ app:cardCornerRadius="@dimen/divider_28px">
|
|
|
|
|
|
<ImageView
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
- app:layout_constraintBottom_toBottomOf="parent"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="parent"
|
|
|
- app:loadImg="@{task.getGameImage()}"
|
|
|
- app:roundRadius="@{8}" />
|
|
|
+ android:scaleType="centerCrop"
|
|
|
+ app:loadImg="@{task.getGameImage()}" />
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatButton
|
|
|
android:layout_width="@dimen/divider_264px"
|
|
|
android:layout_height="@dimen/divider_50px"
|
|
|
android:layout_gravity="center_horizontal|bottom"
|
|
|
- android:layout_marginBottom="@dimen/divider_39px"
|
|
|
+ android:layout_marginBottom="@dimen/divider_16px"
|
|
|
android:background="@drawable/bg_home_task_progress"
|
|
|
+ android:gravity="center"
|
|
|
android:text='@{"当前游戏"+task.currentTaskNum+"/"+task.totalTaskNum}'
|
|
|
android:textColor="@android:color/white"
|
|
|
android:textSize="@dimen/divider_28px"
|
|
|
- android:textStyle="bold"
|
|
|
- app:layout_constraintBottom_toBottomOf="parent"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent" />
|
|
|
+ android:textStyle="bold" />
|
|
|
|
|
|
- </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
+ </androidx.cardview.widget.CardView>
|
|
|
|
|
|
<Button
|
|
|
android:id="@+id/btnTask"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="@dimen/divider_80px"
|
|
|
- android:layout_marginStart="@dimen/divider_57px"
|
|
|
- android:layout_marginTop="@dimen/divider_26px"
|
|
|
- android:layout_marginEnd="@dimen/divider_55px"
|
|
|
- android:layout_marginBottom="@dimen/divider_36px"
|
|
|
+ android:layout_width="@dimen/divider_315px"
|
|
|
+ android:layout_height="@dimen/divider_73px"
|
|
|
+ android:layout_marginStart="@dimen/divider_105px"
|
|
|
+ android:layout_marginTop="@dimen/divider_25px"
|
|
|
+ android:layout_marginEnd="@dimen/divider_104px"
|
|
|
+ android:layout_marginBottom="@dimen/divider_58px"
|
|
|
android:background="@drawable/bg_home_task_btn"
|
|
|
android:text="@string/start_exclusive_training"
|
|
|
android:textColor="@android:color/white"
|
|
|
- android:textSize="@dimen/divider_28px" />
|
|
|
+ android:textSize="@dimen/divider_28px"
|
|
|
+ android:textStyle="bold" />
|
|
|
|
|
|
</LinearLayout>
|
|
|
</FrameLayout>
|