moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升級彈窗ui修改

Browse Source
This commit is contained in:
wushaocheng
2022-11-04 11:10:58 +08:00
parent 8818a89a51
commit f683083d9a
3 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values/strings.xml
View File

@@ -4939,5 +4939,7 @@
<string name="gift_num_fail">禮物數量有誤，請重新輸入</string>
<string name="gift_give_success">轉贈成功</string>
<string name="all_pay_diamond">總支出%s鉆</string>
<string name="take_to_you_later">以後再説</string>
<string name="no_gift_now">暫時沒有禮物</string>
</resources>

BIN
app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 148 KiB

93
app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
View File

@@ -7,23 +7,23 @@
android:orientation="vertical"
tools:background="@color/black">
<View
android:id="@+id/view_background_dim"
android:layout_width="match_parent"
android:layout_height="410dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!-- <View-->
<!-- android:id="@+id/view_background_dim"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="410dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent" />-->
<View
android:id="@+id/view_background"
android:layout_width="match_parent"
android:layout_height="385dp"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_8"
android:background="@drawable/dialog_background"
android:layout_height="348dp"
android:background="@drawable/dialog_update_bg"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/view_background_dim" />
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:id="@+id/close_image"
@@ -33,38 +33,51 @@
android:src="@drawable/icon_pm_close"
android:padding="@dimen/dp_10"
android:scaleType="center"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/view_background"
app:layout_constraintTop_toTopOf="@id/view_background" />
<ImageView
android:id="@+id/iv_update_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialog_update_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:ignore="ContentDescription" />
<!-- <ImageView-->
<!-- android:id="@+id/iv_update_icon"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/dialog_update_icon"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- tools:ignore="ContentDescription" />-->
<TextView
android:id="@+id/tv_update_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_100"
android:text="@string/title_upgrade_app"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_update_icon"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="SpUsage" />
<TextView
android:id="@+id/tvVersion"
tools:text="1.2.0"
android:textSize="@dimen/sp_15"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_update_title"/>
<ScrollView
android:id="@+id/sv_container"
android:layout_width="match_parent"
android:layout_height="192dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
@@ -72,34 +85,48 @@
android:scrollbars="none"
app:layout_constraintEnd_toEndOf="@+id/view_background"
app:layout_constraintStart_toStartOf="@+id/view_background"
app:layout_constraintTop_toBottomOf="@+id/tv_update_title">
app:layout_constraintTop_toBottomOf="@+id/tvVersion"
app:layout_constraintBottom_toTopOf="@+id/iv_update_button">
<TextView
android:id="@+id/tv_update_dialog_content"
android:textColor="@color/color_666666"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_13"
android:textSize="@dimen/sp_13"
tools:text="1.youhua\n2.shouye\n3.buju" />
</ScrollView>
<TextView
android:id="@+id/iv_update_button"
android:layout_width="160dp"
android:layout_height="38dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_20"
android:layout_width="154dp"
android:layout_height="34dp"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_8"
android:scaleType="center"
android:background="@drawable/bg_common_confirm_normal"
android:text="@string/layout_dialog_erban_update_01"
android:textColor="@color/white"
android:textSize="@dimen/dp_14"
app:layout_constraintBottom_toBottomOf="parent"
android:textSize="@dimen/sp_14"
app:layout_constraintTop_toBottomOf="@+id/sv_container"
app:layout_constraintBottom_toTopOf="@+id/tvLater"
app:layout_constraintEnd_toEndOf="@+id/view_background"
app:layout_constraintStart_toStartOf="@+id/view_background"
tools:ignore="ContentDescription"
android:gravity="center"
tools:visibility="gone" />
tools:visibility="visible" />
<TextView
android:id="@+id/tvLater"
android:text="@string/take_to_you_later"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_B3B3C3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_18"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<ProgressBar
android:id="@+id/progressBar"
@@ -109,6 +136,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="54dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/view_background"
app:layout_constraintStart_toStartOf="@+id/view_background"
@@ -121,6 +149,7 @@
android:layout_height="wrap_content"
android:textSize="@dimen/dp_12"
android:textColor="@color/color_333333"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/view_background"
app:layout_constraintStart_toStartOf="@+id/view_background"
app:layout_constraintTop_toBottomOf="@+id/progressBar"