diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/NumberProgressBar.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/NumberProgressBar.java index 4f6a3fa4a..07d13ee25 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/NumberProgressBar.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/NumberProgressBar.java @@ -68,8 +68,8 @@ public class NumberProgressBar extends View { private String mPrefix = ""; - private final int default_text_color = Color.rgb(255, 137, 91); - private final int default_reached_color = Color.rgb(255, 137, 91); + private final int default_text_color = Color.rgb(95, 204, 228); + private final int default_reached_color = Color.rgb(95, 204, 228); private final int default_unreached_color = Color.rgb(204, 204, 204); private final float default_progress_text_offset; private final float default_text_size; diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/UpdateDialogActivity.kt b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/UpdateDialogActivity.kt index 92bb71c4c..ca4f1da02 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/UpdateDialogActivity.kt +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/view/UpdateDialogActivity.kt @@ -49,7 +49,6 @@ class UpdateDialogActivity : AppCompatActivity(), View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) overridePendingTransition(0, 0) - title = "" setContentView(R.layout.dialog_update) init() } @@ -70,9 +69,7 @@ class UpdateDialogActivity : AppCompatActivity(), View.OnClickListener { private fun initView() { val ibClose = findViewById(R.id.ib_close) - val vLine = findViewById(R.id.line) val ivBg = findViewById(R.id.iv_bg) - val tvTitle = findViewById(R.id.tv_title) val tvSize = findViewById(R.id.tv_size) val tvDescription = findViewById(R.id.tv_description) progressBar = findViewById(R.id.np_bar) @@ -103,13 +100,8 @@ class UpdateDialogActivity : AppCompatActivity(), View.OnClickListener { btnUpdate.background = drawable } if (manager.forcedUpgrade) { - vLine.visibility = View.GONE ibClose.visibility = View.GONE } - if (manager.apkVersionName.isNotEmpty()) { - tvTitle.text = - String.format(resources.getString(R.string.dialog_new), manager.apkVersionName) - } if (manager.apkSize.isNotEmpty()) { tvSize.text = String.format(resources.getString(R.string.dialog_new_size), manager.apkSize) diff --git a/app/src/module_upgrade_app/res/drawable/ic_dialog_default.png b/app/src/module_upgrade_app/res/drawable/ic_dialog_default.png index 2b036c811..d238d921b 100644 Binary files a/app/src/module_upgrade_app/res/drawable/ic_dialog_default.png and b/app/src/module_upgrade_app/res/drawable/ic_dialog_default.png differ diff --git a/app/src/module_upgrade_app/res/layout/dialog_update.xml b/app/src/module_upgrade_app/res/layout/dialog_update.xml index 013d30c29..7eca3c4f8 100644 --- a/app/src/module_upgrade_app/res/layout/dialog_update.xml +++ b/app/src/module_upgrade_app/res/layout/dialog_update.xml @@ -3,37 +3,21 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/transparent" android:orientation="vertical"> - - - - @@ -53,9 +37,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:lineSpacingMultiplier="1.1" - android:textColor="#757575" - android:textSize="14sp" + android:textColor="#161958" + android:textSize="12sp" tools:text="" /> + -