Commit 28614967 authored by wanghai's avatar wanghai

【修改】 UI替换完成

parent 233efd67
......@@ -188,10 +188,10 @@
android:name=".activity.guide.CleanGuideActivity"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".activity.XzLoadingActivity"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<!-- <activity-->
<!-- android:name=".activity.XzLoadingActivity"-->
<!-- android:screenOrientation="portrait"-->
<!-- tools:ignore="DiscouragedApi,LockedOrientationActivity" />-->
<activity
android:name=".activity.guide.WhichWantGuideActivity"
android:screenOrientation="portrait"
......
......@@ -41,6 +41,7 @@ import kotlinx.coroutines.flow.last
import kotlinx.coroutines.launch
import java.io.File
import java.util.Locale
import androidx.core.graphics.toColorInt
class MainActivity : BaseActivity<ActivityMainBinding>() {
......@@ -65,7 +66,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
override fun initView() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.parseColor("#F2F3F7"))
BarUtils.setStatusBarColor(this, "#F4F5F9".toColorInt())
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
LinkPlaySdk.showView(this)
......
......@@ -4,7 +4,6 @@ import android.app.Activity
import android.content.Intent
import android.util.Log
import com.base.filerecoveryrecyclebin.activity.MainActivity
import com.base.filerecoveryrecyclebin.activity.XzLoadingActivity
import com.base.filerecoveryrecyclebin.activity.battery.BatteryInfoAnimationActivity
import com.base.filerecoveryrecyclebin.activity.guide.WhichWantGuideActivity
import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity
......@@ -19,7 +18,6 @@ import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_RECOVERY_VIDEOS
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_SCREENSHOT_CLEAN
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_SIMILAR_IMAGE
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_WHEATHER
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_XINGZUO
import com.base.filerecoveryrecyclebin.bean.ConstObject.isGuide
import com.base.filerecoveryrecyclebin.view.WeatherInterface
......@@ -62,9 +60,9 @@ object StartUtils {
ID_BATTERY_INFO -> {
context.startActivity(Intent(context, BatteryInfoAnimationActivity::class.java))
}
ID_XINGZUO->{
context.startActivity(Intent(context, XzLoadingActivity::class.java))
}
// ID_XINGZUO->{
// context.startActivity(Intent(context, XzLoadingActivity::class.java))
// }
ID_WHEATHER->{
context.startActivity(Intent(context, WeatherInterface::class.java))
}
......
......@@ -26,7 +26,6 @@ import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_RECOVERY_VIDEOS
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_SCREENSHOT_CLEAN
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_SIMILAR_IMAGE
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_WHEATHER
import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_XINGZUO
import com.base.filerecoveryrecyclebin.bean.WeatherBean
import com.base.filerecoveryrecyclebin.help.WeatherUtils
import com.base.filerecoveryrecyclebin.utils.AppPreferences
......@@ -40,7 +39,6 @@ import com.base.filerecoveryrecyclebin.utils.ScreenshotCleanupStringManager
import com.base.filerecoveryrecyclebin.utils.TimeUtils.formatATime
import com.base.filerecoveryrecyclebin.utils.TimeUtils.isDayOrNight
import com.base.filerecoveryrecyclebin.utils.VideoRecoveryStringManager
import com.base.filerecoveryrecyclebin.utils.XingzuoStringManager
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Locale
......@@ -91,7 +89,7 @@ object NotificationUtil {
}
ID_SCREENSHOT_CLEAN -> {
val icon = R.mipmap.repeatedphotos
val icon = R.mipmap.repeatedphotos_n
val desc = ScreenshotCleanupStringManager.getNextCleanupCopy()
val btn = "Remove Screenshots"
bigRemoteViews.setImageViewResource(R.id.iv_icon, icon)
......@@ -145,7 +143,7 @@ object NotificationUtil {
ID_BATTERY_INFO -> {
val icon = R.mipmap.c_battery
val icon = R.mipmap.c_battery_n
val desc = BatteryInfoStringManager.getNextDesc()
val btn = "App Manager"
bigRemoteViews.setImageViewResource(R.id.iv_icon, icon)
......@@ -157,20 +155,20 @@ object NotificationUtil {
sendCustomNotification(context, actionId, intent, bigRemoteViews, smallRemoteViews)
}
ID_XINGZUO -> {
//val icon = R.mipmap.xingzuoicon
val desc = XingzuoStringManager.getNextDesc()
val btn = XingzuoStringManager.getNextTitle()
val smallRemoteViewsVar =
RemoteViews(context.packageName, R.layout.notify_layout_xingzuo_small)
smallRemoteViewsVar.setTextViewText(R.id.tv_desc, btn)
smallRemoteViewsVar.setTextViewText(R.id.tv_btn, desc)
val bigRemoteViewsVar =
RemoteViews(context.packageName, R.layout.notify_layout_xingzuo_big)
bigRemoteViewsVar.setTextViewText(R.id.id_title, btn)
bigRemoteViewsVar.setTextViewText(R.id.tv_desc, desc)
sendCustomNotification(context, actionId, intent, bigRemoteViewsVar, smallRemoteViewsVar)
}
// ID_XINGZUO -> {
// //val icon = R.mipmap.xingzuoicon
// val desc = XingzuoStringManager.getNextDesc()
// val btn = XingzuoStringManager.getNextTitle()
// val smallRemoteViewsVar =
// RemoteViews(context.packageName, R.layout.notify_layout_xingzuo_small)
// smallRemoteViewsVar.setTextViewText(R.id.tv_desc, btn)
// smallRemoteViewsVar.setTextViewText(R.id.tv_btn, desc)
// val bigRemoteViewsVar =
// RemoteViews(context.packageName, R.layout.notify_layout_xingzuo_big)
// bigRemoteViewsVar.setTextViewText(R.id.id_title, btn)
// bigRemoteViewsVar.setTextViewText(R.id.tv_desc, desc)
// sendCustomNotification(context, actionId, intent, bigRemoteViewsVar, smallRemoteViewsVar)
// }
ID_WHEATHER -> {
val weatherBean: WeatherBean = WeatherUtils.getWeatherEntity() ?: return
......@@ -466,7 +464,6 @@ object NotificationUtil {
ID_RECOVERY_VIDEOS,
ID_RECOVERY_DOCUMENTS,
ID_BATTERY_INFO,
ID_WHEATHER,
ID_XINGZUO
ID_WHEATHER
)
}
\ No newline at end of file
......@@ -18,12 +18,12 @@ import androidx.lifecycle.lifecycleScope
import com.base.filerecoveryrecyclebin.R
import com.base.filerecoveryrecyclebin.activity.MainActivity
import com.base.filerecoveryrecyclebin.activity.SettingActivity
import com.base.filerecoveryrecyclebin.activity.XzLoadingActivity
import com.base.filerecoveryrecyclebin.activity.battery.BatteryInfoAnimationActivity
import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunk2Activity
import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity
import com.base.filerecoveryrecyclebin.activity.largefile.LargeFileAnimationActivity
import com.base.filerecoveryrecyclebin.activity.repeat.RepeatAnimationActivity
import com.base.filerecoveryrecyclebin.activity.screenshot.ScreenShotActivity
import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
import com.base.filerecoveryrecyclebin.bean.ConstObject
import com.base.filerecoveryrecyclebin.databinding.FragmentHome3Binding
......@@ -105,9 +105,9 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
}
}
binding.idTvXz.setOnClickListener {
startActivity(Intent(context, XzLoadingActivity::class.java))
}
// binding.idTvXz.setOnClickListener {
// startActivity(Intent(context, XzLoadingActivity::class.java))
// }
binding.cardJunkClean.setOnClickListener {
startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
}
......@@ -120,6 +120,9 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() {
binding.cardBattery.setOnClickListener {
startActivity(Intent(requireContext(), BatteryInfoAnimationActivity::class.java))
}
binding.cardScreenshot.setOnClickListener {
startActivity(Intent(requireContext(), ScreenShotActivity::class.java))
}
binding.flSetting.setOnClickListener {
startActivity(Intent(requireContext(), SettingActivity::class.java))
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#2372FC" android:state_checked="true" />
<item android:color="@color/color_primary" android:state_checked="true" />
<item android:color="#E3E6EB" android:state_checked="false" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#1a4772ff" />
<solid android:color="@color/color_light_primary" />
<corners android:radius="5dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="18dp" />
<solid android:color="#355BEA" />
<solid android:color="@color/color_primary" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#577DFD" />
<corners android:radius="22dp" />
<gradient
android:endColor="#FA193B"
android:startColor="#FD4912" />
<corners android:radius="22dp"/>
</shape>
\ No newline at end of file
......@@ -3,6 +3,6 @@
<gradient
android:angle="90"
android:endColor="#3FD3FF"
android:startColor="#587EFC" />
android:endColor="#FF6F6F"
android:startColor="#FA193B" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="@color/color_primary" />
<corners android:radius="24dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="@color/color_primary" />
<corners android:radius="50dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_577dfd_10" android:state_enabled="true" />
<item android:drawable="@drawable/bg_bebebe_10" android:state_enabled="false" />
<item android:drawable="@drawable/bg_fa193b_fd4912_24" android:state_enabled="true" />
<item android:drawable="@drawable/bg_e6e7e9_24" android:state_enabled="false" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/t_weixuan" android:state_selected="false" />
<item android:drawable="@mipmap/t_xuan" android:state_selected="true" />
<item android:drawable="@mipmap/quanxuan_n" android:state_selected="false" />
<item android:drawable="@mipmap/quanxuan_s" android:state_selected="true" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:drawable="@drawable/bg_577dfd_22"/>
<item android:state_enabled="false" android:drawable="@drawable/bg_e6e7e9_22"/>
<item android:state_enabled="true" android:drawable="@drawable/bg_fa193b_fd4912_24"/>
<item android:state_enabled="false" android:drawable="@drawable/bg_e6e7e9_24"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#e6e7e9" />
<corners android:radius="22dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#EBF3FF" />
<solid android:color="@color/color_light_primary" />
<corners android:radius="16dp" />
<stroke android:width="0.5dp" android:color="#EBEBEB"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:startColor="#F6AAB0"
android:centerColor="#FABCBE"
android:endColor="#FFFFFF"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:endColor="#FA193B"
android:startColor="#FD4912" />
<corners android:radius="10dp"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:endColor="#FA193B"
android:startColor="#FD4912" />
<corners android:radius="24dp"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/tab_recyclebin_n" android:state_selected="true" />
<item android:drawable="@mipmap/tab_recyclebin_s" android:state_selected="true" />
<item android:drawable="@mipmap/tab_recyclebin_n" android:state_selected="false" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/gouxuan_n" android:state_selected="false" />
<item android:drawable="@mipmap/gouxuan_s" android:state_selected="true" />
<item android:drawable="@mipmap/quanxuan_n" android:state_selected="false" />
<item android:drawable="@mipmap/quanxuan_s" android:state_selected="true" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#577DFD" />
android:color="@color/color_primary" />
<corners android:radius="22dp" />
</shape>
\ No newline at end of file
......@@ -5,7 +5,7 @@
<!-- <stroke-->
<!-- android:width="1px"-->
<!-- android:color="#FF3835" />-->
<solid android:color="#E5E5E5" />
<solid android:color="#D9D9D9" />
<corners android:radius="10dp" />
</shape>
</item>
......@@ -18,7 +18,7 @@
<scale android:scaleWidth="100%">
<shape>
<corners android:radius="10dp" />
<solid android:color="#577DFD" />
<solid android:color="@color/color_primary" />
</shape>
</scale>
</item>
......
......@@ -3,9 +3,9 @@
<item android:drawable="@color/white"/>
<!-- <item android:drawable="@drawable/splash_bg" />-->
<item
android:top="130dp"
android:top="80dp"
android:gravity="top|center_horizontal">
<bitmap
android:src="@mipmap/qdylogo" />
android:src="@mipmap/logo_small" />
</item>
</layer-list>
\ No newline at end of file
......@@ -60,6 +60,7 @@
android:layout_height="wrap_content"
android:textSize="28sp"
android:textStyle="bold"
android:textColor="@color/black"
tools:text="00" />
<TextView
......@@ -77,6 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
tools:text="00" />
......@@ -504,11 +506,12 @@
<TextView
android:id="@+id/tv_finish"
android:layout_width="290dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="50dp"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="20dp"
android:background="@drawable/bg_4773ff_20"
android:background="@drawable/bg_fa193b_fd4912_24"
android:gravity="center"
android:text="Finish"
android:textColor="@color/white"
......
......@@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="8dp"
android:src="@mipmap/wancheng"
android:src="@mipmap/xuanzhong"
android:visibility="gone"
tools:ignore="ContentDescription" />
......
......@@ -10,7 +10,6 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
tools:ignore="UselessParent">
<FrameLayout
......@@ -112,8 +111,9 @@
<TextView
android:id="@+id/tv_delete"
android:layout_width="289dp"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginHorizontal="50dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
......@@ -123,7 +123,6 @@
android:text="Delete"
android:textColor="@color/color_delete_selector"
android:textSize="18sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
\ No newline at end of file
......@@ -210,7 +210,7 @@
android:layout_width="165dp"
android:layout_height="45dp"
android:layout_marginStart="20dp"
android:background="@drawable/bg_577dfd_22"
android:background="@drawable/bg_fa193b_fd4912_24"
android:gravity="center"
android:text="Deep Scan"
android:textColor="@color/white"
......
......@@ -3,18 +3,42 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/splash_bp"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_f6aab0_white"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="40dp">
<ImageView
android:layout_width="130dp"
android:layout_height="130dp"
android:layout_marginTop="120dp"
android:src="@mipmap/logo_small" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/app_name"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/llConsent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="33dp"
android:layout_marginTop="350dp"
android:background="@drawable/bg_fbfbfb_20"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="18dp">
......@@ -39,7 +63,8 @@
android:layout_marginStart="8dp"
android:text="Consent Required"
android:textColor="#000000"
android:textSize="16sp"
android:textSize="13sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
......@@ -52,9 +77,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/consent"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textSize="13sp" />
</ScrollView>
......@@ -112,12 +136,26 @@
android:id="@+id/ll_start"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="40dp"
android:orientation="vertical">
<TextView
android:id="@+id/id_tv_start"
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginHorizontal="57dp"
android:layout_marginBottom="14dp"
android:background="@drawable/bg_fa193b_fd4912_10"
android:gravity="center"
android:text="START TO USE"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="visible"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:gravity="center">
<TextView
......@@ -125,7 +163,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="4dp"
android:text="By continuing you are agreeing to the"
android:textColor="#676767"
android:textColor="@color/black"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -141,26 +179,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Privacy Policy"
android:textColor="#676767"
android:textColor="@color/color_primary"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
<TextView
android:id="@+id/id_tv_start"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginHorizontal="40dp"
android:layout_marginBottom="49dp"
android:background="@drawable/bg_4772ff_10"
android:gravity="center"
android:text="START TO USE"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
android:visibility="visible"
tools:ignore="HardcodedText" />
</LinearLayout>
......
......@@ -17,6 +17,7 @@
android:text="Which type do you want to clean?"
android:textSize="24sp"
android:textStyle="bold"
android:textColor="#111111"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
......@@ -200,7 +201,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Continue"
android:textColor="#1364FF"
android:textColor="@color/color_primary"
android:textSize="17sp"
android:textStyle="bold" />
......@@ -208,7 +209,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@mipmap/jiantou" />
android:src="@mipmap/jiantou"
app:tint="@color/color_primary" />
</LinearLayout>
......
......@@ -135,19 +135,19 @@
android:includeFontPadding="false"
android:text="Click the button to clean the phone"
android:textColor="@color/white"
android:textSize="16sp" />
android:textSize="17sp" />
<TextView
android:id="@+id/tv_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:background="@drawable/bg_4773ff_22"
android:layout_marginTop="20dp"
android:background="@drawable/bg_fa193b_fd4912_24"
android:gravity="center"
android:includeFontPadding="false"
android:paddingHorizontal="24dp"
android:paddingVertical="12dp"
android:text="clean junk"
android:paddingHorizontal="48dp"
android:text="Clean Junk"
android:textColor="@color/white"
android:textSize="19sp" />
</LinearLayout>
\ No newline at end of file
......@@ -59,7 +59,7 @@
android:background="@drawable/bg_stroke_577dfd_22"
android:gravity="center"
android:text="Exit"
android:textColor="#577DFD"
android:textColor="@color/color_primary"
android:textSize="16sp"
tools:ignore="HardcodedText" />
......
......@@ -8,11 +8,11 @@
android:orientation="vertical"
app:cardCornerRadius="10dp">
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="jiazai_scan" />
<!-- <TextView-->
<!-- android:id="@+id/textView2"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="jiazai_scan" />-->
<LinearLayout
android:layout_width="match_parent"
......@@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@mipmap/jiazai_scan"
android:src="@mipmap/jiazai"
tools:ignore="ContentDescription" />
<TextView
......
......@@ -9,8 +9,8 @@
<ImageView
android:id="@+id/iv_face"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="88dp"
android:layout_height="88dp"
android:layout_marginBottom="-50dp"
android:elevation="1dp"
android:src="@mipmap/pingfenicon"
......@@ -44,6 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/guanbi_b"
app:tint="#757575"
tools:ignore="ContentDescription" />
</FrameLayout>
......@@ -61,7 +62,7 @@
android:layout_marginHorizontal="30dp"
android:layout_marginTop="60dp"
android:gravity="center"
android:textColor="@color/black"
android:textColor="#111111"
android:textSize="18sp"
android:textStyle="bold"
tools:text="Thank you for using\nFile Recovery!" />
......@@ -127,12 +128,11 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="22dp"
android:layout_marginBottom="25dp"
android:background="@drawable/bg_577dfd_22"
android:background="@drawable/bg_fa193b_fd4912_24"
android:gravity="center"
android:text="SUBMIT"
android:textColor="@color/white"
android:textSize="17sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
......
......@@ -42,6 +42,7 @@
android:layout_marginEnd="15dp"
android:src="@mipmap/xuan_bin_filter"
android:visibility="invisible"
app:tint="@color/color_primary"
tools:ignore="ContentDescription" />
</FrameLayout>
......@@ -76,6 +77,7 @@
android:layout_marginEnd="15dp"
android:src="@mipmap/xuan_bin_filter"
android:visibility="invisible"
app:tint="@color/color_primary"
tools:ignore="ContentDescription" />
</FrameLayout>
......@@ -110,6 +112,7 @@
android:layout_marginEnd="15dp"
android:src="@mipmap/xuan_bin_filter"
android:visibility="invisible"
app:tint="@color/color_primary"
tools:ignore="ContentDescription" />
</FrameLayout>
......@@ -144,6 +147,7 @@
android:layout_marginEnd="15dp"
android:src="@mipmap/xuan_bin_filter"
android:visibility="invisible"
app:tint="@color/color_primary"
tools:ignore="ContentDescription" />
</FrameLayout>
......
......@@ -20,7 +20,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="26dp"
android:text="Tittle"
android:textColor="@color/black"
android:textColor="#111111"
android:textSize="19sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
......@@ -31,6 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="8dp"
android:textColor="#111111"
android:gravity="center"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -45,11 +46,11 @@
android:id="@+id/tv_n"
android:layout_width="126dp"
android:layout_height="40dp"
android:background="@drawable/bg_efefef_20"
android:background="@drawable/bg_border_warm_24"
android:gravity="center"
android:text="End"
android:textColor="#666666"
android:textSize="17sp"
android:textColor="@color/color_primary"
android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView
......@@ -57,12 +58,11 @@
android:layout_width="126dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:background="@drawable/bg_4773ff_20"
android:background="@drawable/bg_fa193b_fd4912_24"
android:gravity="center"
android:text="Continue"
android:textColor="@color/white"
android:textSize="17sp"
android:textStyle="bold"
android:textSize="14sp"
tools:ignore="HardcodedText" />
</LinearLayout>
......
......@@ -24,11 +24,11 @@
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tv_btn"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3"
app:layout_constraintTop_toBottomOf="@+id/ivDian"
app:layout_constraintVertical_bias="0.28"
tools:ignore="ContentDescription"
tools:src="@mipmap/yindaotu1" />
......@@ -37,8 +37,8 @@
android:id="@+id/tvContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="18dp"
android:layout_marginHorizontal="40dp"
android:layout_marginTop="50dp"
android:gravity="center"
android:text="Clean up clutter to unlock more space and keep your phone running smoothly."
android:textColor="#000000"
......@@ -51,28 +51,27 @@
android:id="@+id/ivDian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:layout_marginTop="100dp"
android:src="@mipmap/dian1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvContent" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_btn"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginHorizontal="80dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="28dp"
android:background="@drawable/bg_4676ff_69"
android:layout_height="50dp"
android:layout_marginHorizontal="44dp"
android:layout_marginBottom="40dp"
android:background="@drawable/bg_border_warm_50"
android:gravity="center"
android:text="Next"
android:textColor="@color/white"
android:textSize="18sp"
android:textColor="@color/color_primary"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/flAd"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivDian"
tools:ignore="MissingConstraints" />
......
......@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="9dp"
android:layout_marginEnd="15dp"
android:src="@mipmap/duoyun"
tools:ignore="ContentDescription" />
......@@ -82,13 +82,13 @@
tools:ignore="ContentDescription" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/id_tv_xz"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="48dp"
android:src="@mipmap/horoscope" />
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/id_tv_xz"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="end|center_vertical"-->
<!-- android:layout_marginEnd="48dp"-->
<!-- android:src="@mipmap/horoscope" />-->
</FrameLayout>
......@@ -154,8 +154,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="-20dp"
android:layout_marginBottom="15dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="20dp"
android:visibility="gone"
tools:visibility="visible">
......@@ -181,11 +181,23 @@
tools:text="52.0 GB : 128 GB" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginHorizontal="50dp"
android:text="Clean Junk"
android:gravity="center"
android:textColor="@color/white"
android:textSize="17sp"
android:background="@drawable/bg_fa193b_fd4912_24"
tools:ignore="HardcodedText" />
<ImageView
android:id="@+id/iv_arrow_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:src="@mipmap/xiala_h"
tools:ignore="ContentDescription"
tools:text="Scanned junk files 29.69MB" />
......
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F4F5F9"
android:background="@color/color_page_background"
android:orientation="vertical"
tools:context=".fragment.RecoveryFragment">
......@@ -24,11 +24,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="25dp"
android:layout_marginTop="17dp"
android:layout_marginBottom="15dp"
android:text="Recover lost data from unrooted Android devices"
android:textColor="#181D2C"
android:textSize="15sp"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
......@@ -81,7 +81,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/h_photos"
tools:ignore="ContentDescription" />
......@@ -98,7 +99,7 @@
android:layout_height="wrap_content"
android:text="Photos Recovery"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
......@@ -106,7 +107,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="8dp"
android:text="Recover lost photos"
android:textColor="#999999"
android:textSize="14sp"
......@@ -117,8 +117,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginHorizontal="15dp"
android:src="@mipmap/jianotu_h"
......@@ -148,7 +148,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/h_videos"
tools:ignore="ContentDescription" />
......@@ -165,7 +166,7 @@
android:layout_height="wrap_content"
android:text="Videos Recovery"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
......@@ -173,7 +174,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="8dp"
android:text="Recover lost videos"
android:textColor="#999999"
android:textSize="14sp"
......@@ -184,8 +184,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginHorizontal="15dp"
android:src="@mipmap/jianotu_h"
......@@ -215,7 +215,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/h_audios"
tools:ignore="ContentDescription" />
......@@ -232,7 +233,7 @@
android:layout_height="wrap_content"
android:text="Audios Recovery"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
......@@ -240,7 +241,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="8dp"
android:text="Recover lost Audios"
android:textColor="#999999"
android:textSize="14sp"
......@@ -251,8 +251,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginHorizontal="15dp"
android:src="@mipmap/jianotu_h"
......@@ -282,7 +282,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/h_documents"
tools:ignore="ContentDescription" />
......@@ -299,7 +300,7 @@
android:layout_height="wrap_content"
android:text="Documents Recovery"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
......@@ -307,7 +308,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="8dp"
android:text="Recover lost Documents"
android:textColor="#999999"
android:textSize="14sp"
......@@ -318,8 +318,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginHorizontal="15dp"
android:src="@mipmap/jianotu_h"
......
......@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_page_background"
tools:context=".fragment.RecycleBinFragment">
<LinearLayout
......@@ -92,15 +93,17 @@
<LinearLayout
android:id="@+id/ll_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible"
tools:ignore="UseCompoundDrawables,UselessParent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/r_queshengtu"
tools:ignore="ContentDescription" />
......@@ -108,8 +111,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30dp"
android:layout_margin="30dp"
android:gravity="center"
android:textColor="#666666"
android:text="Mobispeedy is protecting your photos, videos, files &amp; App files from being deleted"
tools:ignore="HardcodedText" />
</LinearLayout>
......
......@@ -71,8 +71,8 @@
<ImageView
android:id="@+id/iv_selector"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/bg_circle_selector"
tools:ignore="ContentDescription" />
</FrameLayout>
......
......@@ -83,7 +83,7 @@
android:layout_marginVertical="10dp"
app:shimmer_angle="25"
app:shimmer_animation_duration="2000"
app:shimmer_auto_start="true"
app:shimmer_auto_start="false"
app:shimmer_color="#33ffffff"
app:shimmer_mask_width="0.2">
......
......@@ -79,14 +79,15 @@
android:background="@drawable/bg_1a4772ff_5"
android:gravity="center_vertical"
android:padding="12dp"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Grant permission to find more junk"
android:textColor="@color/theme_color"
android:textColor="@color/color_primary"
android:textSize="13sp"
tools:ignore="HardcodedText" />
......
......@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="Clean"
android:textColor="#666666"
android:textColor="#111111"
android:textSize="12sp"
tools:ignore="HardcodedText" />
</LinearLayout>
......@@ -68,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Photos"
android:textColor="#666666"
android:textColor="#111111"
android:textSize="12sp"
tools:ignore="HardcodedText" />
</LinearLayout>
......@@ -94,7 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Videos"
android:textColor="#666666"
android:textColor="#111111"
android:textSize="12sp"
tools:ignore="HardcodedText" />
</LinearLayout>
......@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Documents"
android:textColor="#666666"
android:textColor="#111111"
android:textSize="12sp"
tools:ignore="HardcodedText" />
</LinearLayout>
......
app/src/main/res/mipmap-xxhdpi/dian1.png

2.4 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/dian1.png

781 Bytes | W: | H:

app/src/main/res/mipmap-xxhdpi/dian1.png
app/src/main/res/mipmap-xxhdpi/dian1.png
app/src/main/res/mipmap-xxhdpi/dian1.png
app/src/main/res/mipmap-xxhdpi/dian1.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/dian2.png

2.45 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/dian2.png

816 Bytes | W: | H:

app/src/main/res/mipmap-xxhdpi/dian2.png
app/src/main/res/mipmap-xxhdpi/dian2.png
app/src/main/res/mipmap-xxhdpi/dian2.png
app/src/main/res/mipmap-xxhdpi/dian2.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/dian3.png

2.43 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/dian3.png

789 Bytes | W: | H:

app/src/main/res/mipmap-xxhdpi/dian3.png
app/src/main/res/mipmap-xxhdpi/dian3.png
app/src/main/res/mipmap-xxhdpi/dian3.png
app/src/main/res/mipmap-xxhdpi/dian3.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -4,7 +4,7 @@
<color name="white">#FFFFFFFF</color>
<color name="color_747474">#747474</color>
<color name="color_fa020b">#FA020B</color>
<color name="theme_color">#50B3FA</color>
<color name="theme_color">#FA193B</color>
<color name="color_cccccc">#cccccc</color>
<color name="color_4f86eb">#4f86eb</color>
<color name="color_primary">#FA193B</color>
......
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