Skip to content

A
appzxhy
Commit 87e181cb authored by wanglei's avatar wanglei
Browse files
Options

[拆包]清理结果页

parent 536500c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 442 additions and 205 deletions
app/src/main/java/com/base/appzxhy/ui/cleanresult/CleanResultActivity.kt
View file @ 87e181cb
......@@ -123,34 +123,34 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
private fun getData(): MutableList<FeatureBean> {
val list = mutableListOf<FeatureBean>().apply {
add(FeatureBean(JUNK_CLEAN, R.string.junk_clean, R.drawable.icon_clean_r, R.string.result_junk_clean))
add(FeatureBean(ANTIVIRUS, R.string.antivirus, R.drawable.icon_antivirus_r, R.string.result_antivirus))
add(FeatureBean(JUNK_CLEAN, R.string.junk_clean, R.drawable.icon_clean_r, R.string.clean_now))
add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.icon_battery_info_r, R.string.view))
add(
FeatureBean(
SCREENSHOT_CLEAN,
R.string.screenshot_clean,
R.drawable.icon_screenshot_r,
R.string.result_screenshot_clean
LARGE_FILE_CLEAN,
R.string.large_file_clean,
R.drawable.icon_large_file_clean_r,
R.string.clean_now
)
)
add(FeatureBean(SIMILAR_PHOTOS, R.string.similar_photos, R.drawable.icon_similar_photos_r, R.string.clean_now))
add(
FeatureBean(
LARGE_FILE_CLEAN,
R.string.large_file_clean,
R.drawable.icon_large_file_clean_r,
R.string.result_large_file_clean
SCREENSHOT_CLEAN,
R.string.screenshot_clean,
R.drawable.icon_screenshot_r,
R.string.clean_now
)
)
add(FeatureBean(SIMILAR_PHOTOS, R.string.similar_photos, R.drawable.icon_similar_photos_r, R.string.result_similar_photos))
add(
FeatureBean(
PHOTO_COMPRESSION,
R.string.photo_compression,
R.drawable.icon_image_compression_r,
R.string.result_photo_compression
R.string.clean_now
)
)
add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.icon_battery_info_r, R.string.result_battery_info))
}
......
app/src/main/java/com/base/appzxhy/ui/dialog/NotificationTurnOnDialog.kt
View file @ 87e181cb
......@@ -5,9 +5,7 @@ import android.app.AlertDialog
import android.view.Gravity
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.base.appzxhy.R
import com.base.appzxhy.databinding.DialogNotificationBinding
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.base.appzxhy.databinding.DialogNotification2Binding
class NotificationTurnOnDialog(
......@@ -17,7 +15,7 @@ class NotificationTurnOnDialog(
val dialog = AlertDialog.Builder(activity).create()
// val dialog = BottomSheetDialog(activity, R.style.BottomSheetDialog)
val binding = DialogNotificationBinding.inflate(LayoutInflater.from(activity))
val binding = DialogNotification2Binding.inflate(LayoutInflater.from(activity))
var action: (() -> Unit)? = null
......@@ -38,6 +36,10 @@ class NotificationTurnOnDialog(
dialog.window?.attributes = params
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
binding.ivClose.setOnClickListener {
dialog.dismiss()
}
binding.tvTurnOn.setOnClickListener {
dialog.dismiss()
action?.invoke()
......
app/src/main/java/com/base/appzxhy/ui/dialog/RateDialog.kt
View file @ 87e181cb
......@@ -6,15 +6,15 @@ import android.view.LayoutInflater
import androidx.appcompat.app.AlertDialog
import com.base.appzxhy.R
import com.base.appzxhy.SpConstObject.scoreRate
import com.base.appzxhy.databinding.DialogRateBinding
import androidx.core.net.toUri
import com.base.appzxhy.SpConstObject.isScoreRated
import com.base.appzxhy.databinding.DialogRate2Binding
class RateDialog(
val activity: Activity
) {
val dialog = AlertDialog.Builder(activity).create()
val binding = DialogRateBinding.inflate(LayoutInflater.from(activity))
val binding = DialogRate2Binding.inflate(LayoutInflater.from(activity))
var action: (() -> Unit)? = null
......@@ -29,18 +29,19 @@ class RateDialog(
val params = dialog.window?.attributes
// params?.width = activity.resources.getDimensionPixelSize(R.dimen.dp_300)
// params?.width = FrameLayout.LayoutParams.WRAP_CONTENT
// params?.height = FrameLayout.LayoutParams.WRAP_CONTENT
// params?.width = ConstraintLayout.LayoutParams.MATCH_PARENT
// params?.horizontalMargin = activity.resources.getDimension(R.dimen.dp_16)
// params?.height = ConstraintLayout.LayoutParams.WRAP_CONTENT
// params?.gravity = Gravity.CENTER
dialog.window?.attributes = params
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
dialog.show()
// val appName = activity.getString(R.string.app_name)
// val thankTip = activity.getString(R.string.thank_you_for_using_app, appName)
// binding.tvThank.text = thankTip
binding.ivClose.setOnClickListener {
val appName = activity.getString(R.string.app_name)
val thankTip = activity.getString(R.string.thank_you_for_using_app, appName)
binding.tvThank.text = thankTip
binding.tvCancel.setOnClickListener {
dialog.dismiss()
}
......@@ -56,7 +57,7 @@ class RateDialog(
starList.forEachIndexed { index, view ->
view.setOnClickListener {
starList.forEachIndexed { index2, view2 ->
view2.setImageResource(if (index2 <= index) R.drawable.icon_star_s else R.drawable.icon_star_n)
view2.setImageResource(if (index2 <= index) R.drawable.icon_star_pressed else R.drawable.icon_star_normal)
}
score = index + 1
}
......
app/src/main/res/drawable/bg_ffffff_37.xml 0 → 100644
View file @ 87e181cb
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<corners android:radius="@dimen/dp_37" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_clean_result.xml
View file @ 87e181cb
......@@ -87,6 +87,7 @@
android:id="@+id/rvResult"
android:layout_width="match_parent"
android:layout_height="0dp"
android:overScrollMode="never"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:scrollbars="none"
......
app/src/main/res/layout/dialog_notification.xml
View file @ 87e181cb
......@@ -6,60 +6,60 @@
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_26"
android:background="@drawable/bg_ffffff_tlr24"
android:gravity="center_horizontal"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_26"-->
<!-- android:background="@drawable/bg_ffffff_tlr24"-->
<!-- android:gravity="center_horizontal"-->
<!-- android:orientation="vertical"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/don_t_miss_important_tips"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_40"-->
<!-- android:text="@string/don_t_miss_important_tips"-->
<!-- android:textColor="#1A1A1A"-->
<!-- android:textSize="@dimen/sp_24"-->
<!-- android:textStyle="bold" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:text="@string/notification_tips"
android:textColor="#A0A0A0" />
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="@dimen/dp_40"-->
<!-- android:layout_marginTop="@dimen/dp_6"-->
<!-- android:gravity="center"-->
<!-- android:text="@string/notification_tips"-->
<!-- android:textColor="#A0A0A0" />-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTurnOn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="60dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/bg_splash_button"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="@string/turn_on"
android:textColor="@color/white"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.0"
tools:layout_editor_absoluteX="60dp" />
</LinearLayout>
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/tvTurnOn"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="60dp"-->
<!-- android:layout_marginTop="20dp"-->
<!-- android:layout_marginBottom="@dimen/dp_30"-->
<!-- android:background="@drawable/bg_splash_button"-->
<!-- android:gravity="center"-->
<!-- android:paddingTop="10dp"-->
<!-- android:paddingBottom="10dp"-->
<!-- android:text="@string/turn_on"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="20sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintVertical_bias="0.0"-->
<!-- tools:layout_editor_absoluteX="60dp" />-->
<!-- </LinearLayout>-->
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_wenhao"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/icon_wenhao"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_notification2.xml 0 → 100644
View file @ 87e181cb
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
app:srcCompat="@drawable/tanchuang">
</androidx.appcompat.widget.AppCompatImageView>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivClose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:padding="@dimen/dp_8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icon_close_pop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_26"
android:gravity="center_horizontal"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/don_t_miss_important_tips"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:text="@string/notification_tips"
android:textColor="#A0A0A0" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTurnOn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="60dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/bg_btn_50"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="@string/turn_on"
android:textColor="@color/white"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.0"
tools:layout_editor_absoluteX="60dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_rate.xml
View file @ 87e181cb
This diff is collapsed.
app/src/main/res/layout/dialog_rate_2.xml 0 → 100644
View file @ 87e181cb
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_marginHorizontal="@dimen/dp_16"
android:layout_height="@dimen/dp_400"
android:background="@color/transparent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivBg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_45"
android:scaleType="fitXY"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/bg_rate" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_98"
android:background="@color/transparent"
android:gravity="center_horizontal"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tvThank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
android:text="@string/thank_you_for_using_app"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_16" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/star1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_5"
app:srcCompat="@drawable/icon_star_pressed" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/star2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_5"
app:srcCompat="@drawable/icon_star_pressed" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/star3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_5"
app:srcCompat="@drawable/icon_star_pressed" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/star4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_5"
app:srcCompat="@drawable/icon_star_pressed" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/star5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_5"
app:srcCompat="@drawable/icon_star_pressed" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center"
android:text="@string/thank_you_very_much"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_25"
android:layout_marginBottom="@dimen/dp_35"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/ivBg">
<TextView
android:id="@+id/tvCancel"
android:layout_width="0dp"
android:layout_height="@dimen/dp_42"
android:layout_weight="1"
android:background="@drawable/bg_ffffff_37"
android:gravity="center"
android:text="@string/cancel"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_18" />
<TextView
android:textSize="@dimen/sp_18"
android:id="@+id/tvSubmit"
android:layout_width="0dp"
android:layout_height="@dimen/dp_42"
android:layout_marginStart="@dimen/dp_16"
android:layout_weight="1"
android:background="@drawable/icon_anniu"
android:gravity="center"
android:text="@string/submit"
android:textColor="@color/white" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/tanchuang" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 87e181cb
......@@ -71,4 +71,8 @@
<dimen name="dp_28">28dp</dimen>
<dimen name="dp_54">54dp</dimen>
<dimen name="dp_32">32dp</dimen>
<dimen name="dp_105">105dp</dimen>
<dimen name="dp_420">420dp</dimen>
<dimen name="dp_25">25dp</dimen>
<dimen name="dp_37">37dp</dimen>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 87e181cb
......@@ -124,9 +124,9 @@ Please rest assured that we will handle your information in strict accordance wi
<string name="recycle_bin">Recycle Bin</string>
<string name="recyclebin_tip"><![CDATA[Mobispeedy is protecting your photos, videos, files & App files from being deleted]]></string>
<string name="recyclebin">Recycle Bin</string>
<string name="thank_you_for_using_app">Thank you for using %s!</string>
<string name="thank_you_for_using_app">Thank you for using\n %s!</string>
<string name="thank_you_very_much_for_taking_the_time_to_rate_us">Thank you very much for taking the time to rate us.</string>
<string name="submit">SUBMIT</string>
<string name="submit">Submit</string>
<string name="screenshot_cleaner">Screenshot Cleaner</string>
......@@ -234,6 +234,8 @@ Please rest assured that we will handle your information in strict accordance wi
<string name="issue">%1$s issue</string>
<string name="by_continuing_">By continuing you are agreeing to the\u0020</string>
<string name="video_clean">Video Clean</string>
<string name="thank_you_very_much">Thank you very much for taking the time to rate us.</string>
<string name="view">View</string>
</resources>
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