diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt index edf7c19..c84c02a 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt @@ -12,7 +12,7 @@ class DailySignDialog(context: Context) : BindingDialog( fun build(): DailySignDialog { with() setCenter() - setMaskValue(0.8f) + setMaskValue(0.9f) mBinding.run { setOnClickBatch(butLeft, butRight) { @@ -61,6 +61,8 @@ class DailySignDialog(context: Context) : BindingDialog( signItem6.setData(mDataList.get(5)) signItem7.setData(mDataList.get(6)) } + + signItem7.setLargeWidthMode() } } diff --git a/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt b/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt index c252de6..787a815 100644 --- a/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt +++ b/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt @@ -35,6 +35,11 @@ class DailySignItemView @JvmOverloads constructor( mBinding.tvDayNum.text = context.getString(R.string.day) + " "+ mData.dayIndex } + fun setLargeWidthMode() { + mBinding.ivGold.setImageResource(R.mipmap.icon_gold_x3) + mBinding.ivBg.setImageResource(R.mipmap.bg_biginner_daily_large) + } + } diff --git a/app/src/main/res/layout/daily_sign_item.xml b/app/src/main/res/layout/daily_sign_item.xml index ad4407f..5440421 100644 --- a/app/src/main/res/layout/daily_sign_item.xml +++ b/app/src/main/res/layout/daily_sign_item.xml @@ -2,7 +2,7 @@ @@ -12,27 +12,31 @@ android:layout_height="wrap_content"> + android:src="@mipmap/bg_biginner_daily"/> + android:src="@mipmap/icon_glod_small"/> - + android:layout_height="wrap_content"> + + + @@ -25,12 +28,8 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginLeft="15dp" - android:layout_marginRight="40dp" - android:layout_marginTop="120dp" - android:layout_marginBottom="20dp" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" + android:layout_marginRight="45dp" + android:layout_marginTop="60dp" android:clipChildren="false" > @@ -43,7 +42,7 @@ + android:src="@mipmap/icon_smile"/> @@ -99,12 +98,14 @@ android:id="@+id/sign_item_3" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="5dp" android:layout_weight="1" /> @@ -125,12 +126,14 @@ android:id="@+id/sign_item_6" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="5dp" android:layout_weight="1" /> @@ -146,13 +149,12 @@ @@ -160,10 +162,15 @@ + android:layout_height="42dp" + android:layout_marginStart="10dp" + android:layout_weight="1"> + + + android:src="@mipmap/task_video"/> @@ -197,18 +202,13 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_gravity="top|right" - android:layout_marginTop="-15dp" + android:layout_marginTop="-25dp" android:layout_marginRight="3dp" - android:src="@mipmap/temp"/> + android:src="@mipmap/icon_x2"/> - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/bg_biginner_daily.webp b/app/src/main/res/mipmap-xxhdpi/bg_biginner_daily.webp new file mode 100644 index 0000000..efa8c2c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_biginner_daily.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_biginner_daily_large.webp b/app/src/main/res/mipmap-xxhdpi/bg_biginner_daily_large.webp new file mode 100644 index 0000000..24f4e38 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_biginner_daily_large.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_gold_x3.webp b/app/src/main/res/mipmap-xxhdpi/icon_gold_x3.webp new file mode 100644 index 0000000..efed558 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_gold_x3.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_smile.webp b/app/src/main/res/mipmap-xxhdpi/icon_smile.webp new file mode 100644 index 0000000..c11d43c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_smile.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_x2.webp b/app/src/main/res/mipmap-xxhdpi/icon_x2.webp new file mode 100644 index 0000000..c9714c5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_x2.webp differ