Skip to content

A
appzxhy
Commit 82ba4c2f authored by wanglei's avatar wanglei
Browse files
Options

[拆包]替换图片

parent bcdfdef8
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 69 deletions
app/src/main/java/com/base/appzxhy/business/push/notification/NotificationUiUtil.kt
View file @ 82ba4c2f
...@@ -29,8 +29,8 @@ import kotlin.random.Random ...@@ -29,8 +29,8 @@ import kotlin.random.Random
*/ */
object NotificationUiUtil { object NotificationUiUtil {
private val CHANNEL_ID = "simple cleaner Channel" private val CHANNEL_ID = "Phone cleaner pro Channel"
private val CHANNEL_NAME = "simple cleaner Channel NAME" private val CHANNEL_NAME = "Phone cleaner pro Channel NAME"
/** /**
* 这部分准备UI的代码不能放入IO * 这部分准备UI的代码不能放入IO
...@@ -69,6 +69,7 @@ object NotificationUiUtil { ...@@ -69,6 +69,7 @@ object NotificationUiUtil {
debugAction.invoke(this) debugAction.invoke(this)
} }
} }
UNINSTALL_APP -> { UNINSTALL_APP -> {
val text = testNotificationId + context.getString(R.string.notify_uninstall_app) val text = testNotificationId + context.getString(R.string.notify_uninstall_app)
sendBean.smallRemoteViews = RemoteViews(context.packageName, R.layout.notification_common_small).apply { sendBean.smallRemoteViews = RemoteViews(context.packageName, R.layout.notification_common_small).apply {
......
app/src/main/java/com/base/appzxhy/ui/dialog/RateDialog.kt
View file @ 82ba4c2f
...@@ -79,16 +79,16 @@ class RateDialog( ...@@ -79,16 +79,16 @@ class RateDialog(
} }
binding.star5.callOnClick() binding.star5.callOnClick()
val party = Party( // val party = Party(
angle = Angle.TOP, // angle = Angle.TOP,
speed = 0f, // speed = 0f,
maxSpeed = 30f, // maxSpeed = 30f,
damping = 0.9f, // damping = 0.9f,
spread = 360, // spread = 360,
colors = listOf(0xfce18a, 0xff726d, 0xf4306d, 0xb48def), // colors = listOf(0xfce18a, 0xff726d, 0xf4306d, 0xb48def),
emitter = Emitter(duration = 100, TimeUnit.MILLISECONDS).max(100), // emitter = Emitter(duration = 100, TimeUnit.MILLISECONDS).max(100),
position = Position.Relative(0.5, 0.3) // position = Position.Relative(0.5, 0.3)
) // )
binding.konfettiView.start(party) // binding.konfettiView.start(party)
} }
} }
\ No newline at end of file
app/src/main/java/com/base/appzxhy/ui/dialog/StoragePermissionDialog.kt
View file @ 82ba4c2f
...@@ -63,7 +63,7 @@ class StoragePermissionDialog( ...@@ -63,7 +63,7 @@ class StoragePermissionDialog(
val appName = activity.getString(R.string.app_name) val appName = activity.getString(R.string.app_name)
binding.tvContent.text = binding.tvContent.text =
highlightText(activity.getString(R.string.storage_permission_content, appName), appName, "#06D16C".toColorInt()) highlightText(activity.getString(R.string.storage_permission_content, appName), appName, "#46B7D6".toColorInt())
// binding.lottieAnimationView.let { // binding.lottieAnimationView.let {
// it.imageAssetsFolder = "permission_sc/images" // it.imageAssetsFolder = "permission_sc/images"
......
app/src/main/java/com/base/appzxhy/ui/splash/SplashActivity.kt
View file @ 82ba4c2f
...@@ -95,7 +95,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding ...@@ -95,7 +95,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
} }
viewModel.onTick = { s, t, p -> viewModel.onTick = { s, t, p ->
// Log.e(TAG, "onTick $s $t") // Log.e(TAG, "onTick $s $t")
binding.progressBar.setProgress(p.toDouble()) binding.progressBar.setProgress(p.toInt(), true)
} }
} }
...@@ -191,14 +191,14 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding ...@@ -191,14 +191,14 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
override fun show() { override fun show() {
super.show() super.show()
viewModel.stopCountdown() viewModel.stopCountdown()
binding.progressBar.setProgress(100.0) binding.progressBar.setProgress(100, true)
} }
override fun next() { override fun next() {
val action = { val action = {
LogEx.logDebug(TAG, "next") LogEx.logDebug(TAG, "next")
viewModel.overCountDown() viewModel.overCountDown()
binding.progressBar.setProgress(100.0) binding.progressBar.setProgress(100, true)
binding.root.postDelayed({ jumpNext() }, 250) binding.root.postDelayed({ jumpNext() }, 250)
} }
LogEx.logDebug("AdmobEvent", "inter adShowed=${adShowed}") LogEx.logDebug("AdmobEvent", "inter adShowed=${adShowed}")
......
app/src/main/res/drawable/bg_stroke_999999_50.xml → app/src/main/res/drawable/bg_stroke_cccccc_50.xml
View file @ 82ba4c2f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<stroke <stroke
android:width="@dimen/dp_1" android:width="@dimen/dp_1"
android:color="#999999" /> android:color="#CCCCCC" />
<solid android:color="@color/white" /> <solid android:color="@color/white" />
<corners android:radius="@dimen/dp_50" /> <corners android:radius="@dimen/dp_50" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/progressdrawable_splash.xml 0 → 100644
View file @ 82ba4c2f
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="#EEEFF4" />
<corners android:radius="8dp" />
</shape>
</item>
<item
android:id="@android:id/progress"
android:bottom="@dimen/dp_2"
android:end="@dimen/dp_3"
android:start="@dimen/dp_3"
android:top="@dimen/dp_2">
<clip>
<shape>
<solid android:color="@color/colorPrimary" />
<corners android:radius="8dp" />
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_guide_clean.xml
View file @ 82ba4c2f
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
android:layout_height="@dimen/dp_54" android:layout_height="@dimen/dp_54"
android:layout_marginHorizontal="@dimen/dp_70" android:layout_marginHorizontal="@dimen/dp_70"
android:layout_marginBottom="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/bg_splash_button" android:background="@drawable/bg_btn_50"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/dp_8" android:padding="@dimen/dp_8"
app:layout_constraintBottom_toTopOf="@id/flAd" app:layout_constraintBottom_toTopOf="@id/flAd"
......
app/src/main/res/layout/activity_splash.xml
View file @ 82ba4c2f
...@@ -3,51 +3,48 @@ ...@@ -3,51 +3,48 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@drawable/bg_splash">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guide_line"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.15" />
<androidx.appcompat.widget.AppCompatImageView <TextView
android:id="@+id/iv_logo" android:id="@+id/tvName"
android:layout_width="@dimen/dp_136" android:layout_width="0dp"
android:layout_height="@dimen/dp_136" android:layout_height="wrap_content"
android:src="@drawable/img_qidong" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_80"
android:text="@string/app_name"
android:textColor="@color/black"
android:textSize="@dimen/sp_45"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/guide_line" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="ImageContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tvName" android:id="@+id/iv_logo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" android:src="@drawable/bg_bg_splash"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_logo" /> app:layout_constraintTop_toBottomOf="@id/tvName"
tools:ignore="ImageContrastCheck" />
<LinearLayout <LinearLayout
android:id="@+id/llConsent" android:id="@+id/llConsent"
android:layout_width="@dimen/dp_306" android:layout_width="@dimen/dp_306"
android:layout_height="@dimen/dp_180" android:layout_height="@dimen/dp_180"
android:layout_marginHorizontal="33dp" android:layout_marginHorizontal="33dp"
android:layout_marginTop="-150dp"
android:background="@drawable/bg_f8f9fa_20" android:background="@drawable/bg_f8f9fa_20"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@id/cl_bottom_start" app:layout_constraintBottom_toTopOf="@id/cl_bottom_start"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.495" app:layout_constraintHorizontal_bias="0.495"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvName" app:layout_constraintTop_toBottomOf="@id/iv_logo"
app:layout_constraintVertical_bias="0.291"> app:layout_constraintVertical_bias="0.291">
<LinearLayout <LinearLayout
...@@ -110,11 +107,11 @@ ...@@ -110,11 +107,11 @@
android:layout_height="@dimen/dp_55" android:layout_height="@dimen/dp_55"
android:layout_marginHorizontal="@dimen/dp_35" android:layout_marginHorizontal="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:background="@drawable/bg_splash_button_bg" android:background="@drawable/bg_btn_50"
android:gravity="center" android:gravity="center"
android:text="@string/start" android:text="@string/start"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/colorPrimary" android:textColor="@color/white"
android:textSize="@dimen/sp_24" android:textSize="@dimen/sp_24"
android:textStyle="bold" /> android:textStyle="bold" />
...@@ -190,22 +187,16 @@ ...@@ -190,22 +187,16 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.base.appzxhy.ui.views.LineCentreProView <ProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_18"
android:layout_marginHorizontal="@dimen/dp_24" android:layout_marginHorizontal="@dimen/dp_24"
android:layout_marginBottom="@dimen/dp_25" android:layout_marginBottom="@dimen/dp_25"
app:box_height="@dimen/dp_20" android:max="100"
app:box_width="@dimen/dp_45" android:progressDrawable="@drawable/progressdrawable_splash"
app:progress_color="@color/white" tools:progress="50" />
app:progress_color_background="#33ffffff"
app:progress_max="100"
app:progress_size="10dp"
app:radius="@dimen/dp_25"
app:text_color="@color/colorPrimary"
app:text_size="@dimen/sp_12" />
<TextView <TextView
......
app/src/main/res/layout/dialog_app_exit.xml
View file @ 82ba4c2f
...@@ -69,11 +69,11 @@ ...@@ -69,11 +69,11 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:background="@drawable/bg_stroke_999999_50" android:background="@drawable/bg_stroke_cccccc_50"
android:paddingVertical="10dp" android:paddingVertical="10dp"
android:text="@string/exit" android:text="@string/exit"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#85909D" android:textColor="#1A1A1A"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/tvCleanNow" app:layout_constraintEnd_toStartOf="@id/tvCleanNow"
......
app/src/main/res/layout/dialog_notification2.xml
View file @ 82ba4c2f
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
android:scaleType="fitXY" android:scaleType="fitXY"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/tanchuang"> app:srcCompat="@drawable/tanchuang">
...@@ -33,7 +32,7 @@ ...@@ -33,7 +32,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icon_lingdang" /> app:srcCompat="@drawable/img_xiaoxi" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/dialog_rate_1.xml
View file @ 82ba4c2f
...@@ -118,11 +118,12 @@ ...@@ -118,11 +118,12 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/dp_42" android:layout_height="@dimen/dp_42"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_stroke_999999_50" android:background="@drawable/bg_stroke_cccccc_50"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="#999999" android:textColor="#999999"
android:textSize="@dimen/sp_18" /> android:textSize="@dimen/sp_18"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvSubmit" android:id="@+id/tvSubmit"
...@@ -132,6 +133,7 @@ ...@@ -132,6 +133,7 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_btn_50" android:background="@drawable/bg_btn_50"
android:gravity="center" android:gravity="center"
android:layout_marginBottom="@dimen/dp_16"
android:text="@string/submit" android:text="@string/submit"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_18" /> android:textSize="@dimen/sp_18" />
...@@ -145,10 +147,10 @@ ...@@ -145,10 +147,10 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/img_emoji" /> app:srcCompat="@drawable/img_emoji" />
<nl.dionsegijn.konfetti.xml.KonfettiView <!-- <nl.dionsegijn.konfetti.xml.KonfettiView-->
android:id="@+id/konfettiView" <!-- android:id="@+id/konfettiView"-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="@dimen/dp_200" <!-- android:layout_height="@dimen/dp_200"-->
app:layout_constraintTop_toTopOf="parent" /> <!-- app:layout_constraintTop_toTopOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/layout_animation.xml
View file @ 82ba4c2f
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_30"
android:text="@string/powered_by_trustlook"
android:textColor="#CEE3FF" android:textColor="#CEE3FF"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
......
app/src/main/res/values/colors.xml
View file @ 82ba4c2f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="colorPrimary">#06D16C</color> <color name="colorPrimary">#46B7D6</color>
<color name="colorDisEnable">#F0F3FA</color> <color name="colorDisEnable">#F0F3FA</color>
<color name="color_66000000">#66000000</color> <color name="color_66000000">#66000000</color>
......
app/src/main/res/values/dimens.xml
View file @ 82ba4c2f
...@@ -65,4 +65,6 @@ ...@@ -65,4 +65,6 @@
<dimen name="dp_118">118dp</dimen> <dimen name="dp_118">118dp</dimen>
<dimen name="dp_250">250dp</dimen> <dimen name="dp_250">250dp</dimen>
<dimen name="dp_72">72dp</dimen> <dimen name="dp_72">72dp</dimen>
<dimen name="sp_45">45sp</dimen>
<dimen name="dp_3">3dp</dimen>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment