Commit 98e841a4 authored by songjianyu's avatar songjianyu

[调整] 首页,设置,引导页面的调整

parent b631357f
......@@ -105,19 +105,19 @@ 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.h_junkclean, R.string.result_junk_clean))
add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.h_battery, R.string.result_battery_info))
add(FeatureBean(LARGE_FILE_CLEAN, R.string.large_file_clean, R.drawable.h_lagre, R.string.result_large_file_clean))
add(FeatureBean(JUNK_CLEAN, R.string.clean_junk, R.drawable.icon_clean_clean_result, R.string.result_junk_clean))
add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.icon_battery_clean_result, R.string.result_battery_info))
add(FeatureBean(LARGE_FILE_CLEAN, R.string.large_file_clean, R.drawable.icon_file_clean_result, R.string.result_large_file_clean))
add(
FeatureBean(
PHOTO_COMPRESSION,
R.string.photo_compression,
R.drawable.h_compression,
R.string.Compress_Photos,
R.drawable.icon_compress,
R.string.result_photo_compression
)
)
add(FeatureBean(SCREENSHOT_CLEAN, R.string.screenshot_clean, R.drawable.h_screenshot, R.string.result_screenshot_clean))
add(FeatureBean(SIMILAR_PHOTOS, R.string.similar_photos, R.drawable.h_similar, R.string.result_similar_photos))
add(FeatureBean(SCREENSHOT_CLEAN, R.string.screenshot_clean, R.drawable.icon_screenshot_2, R.string.result_screenshot_clean))
add(FeatureBean(SIMILAR_PHOTOS, R.string.similar_photos, R.drawable.icon_similar_photos_clean_result, R.string.result_similar_photos))
}
val filteredList = list.filter { it.key != functionKey }
......
......@@ -74,7 +74,7 @@ class RateDialog(
}
dialog.dismiss()
}
binding.star1.callOnClick()
binding.star5.callOnClick()
}
}
\ No newline at end of file
......@@ -6,8 +6,18 @@ import android.text.Spanned
import android.text.SpannedString
import android.text.style.ForegroundColorSpan
import androidx.lifecycle.lifecycleScope
import com.base.appzxhy.R
import com.base.appzxhy.base.BaseFragment
import com.base.appzxhy.base.jumpAction
import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.LARGE_FILE_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.PHOTO_COMPRESSION
import com.base.appzxhy.bean.FeatureBean.Companion.SCREENSHOT_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.SIMILAR_PHOTOS
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.FragmentHome3Binding
import com.base.appzxhy.ui.dialog.permissionStorageJump
import com.base.appzxhy.utils.Utils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
......@@ -17,11 +27,37 @@ class Home3Fragment : BaseFragment<FragmentHome3Binding>(FragmentHome3Binding::i
override fun initView() {
super.initView()
// AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
getData()
}
override fun initListener() {
binding.ivCleanJunk.setOnClickListener {
(requireActivity() as MainActivity).permissionStorageJump(JUNK_CLEAN)
}
binding.ivBatteryInfo.setOnClickListener {
(requireActivity() as MainActivity).jumpAction(BATTERY_INFO)
}
binding.ivVideoClean.setOnClickListener {
//TODO (视频清理)
(requireActivity() as MainActivity).permissionStorageJump(JUNK_CLEAN)
}
binding.tvLargeFileClean.setOnClickListener {
(requireActivity() as MainActivity).permissionStorageJump(LARGE_FILE_CLEAN)
}
binding.tvPhotoCompress.setOnClickListener {
(requireActivity() as MainActivity).permissionStorageJump(PHOTO_COMPRESSION)
}
binding.tvScreenshotClean.setOnClickListener {
(requireActivity() as MainActivity).permissionStorageJump(SCREENSHOT_CLEAN)
}
binding.tvSimilarPhoto.setOnClickListener {
(requireActivity() as MainActivity).permissionStorageJump(SIMILAR_PHOTOS)
}
}
fun getData() {
lifecycleScope.launch(Dispatchers.IO) {
val totalStorageSize = async { Utils.getTotalStorageSize() }.await()
......
......@@ -60,6 +60,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
AdsMgr.showBanner(binding.flBanner, false)
exitDialog = ExitDialog(this)
exitDialog.init()
setStatusBarColor(getColor(R.color.colorPrimary))
}
private fun initDialogFlow() {
......@@ -100,11 +101,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
binding.viewPager2.adapter = viewPagerAdapter
binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
if (position == 0) {
setStatusBarColor(getColor(R.color.colorPrimary))
} else {
setStatusBarColor(getColor(R.color.transparent))
}
// if (position == 0) {
// setStatusBarColor(getColor(R.color.colorPrimary))
// } else {
// setStatusBarColor(getColor(R.color.transparent))
// }
val defaultTab = binding.tabLayout.getTabAt(position)
defaultTab?.select()
defaultTab?.setSelected()
......
......@@ -18,6 +18,7 @@ import com.base.appzxhy.bean.config.ConfigBean
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.ui.dialog.RateDialog
import com.base.appzxhy.utils.ClipboardUtils.copyText
import com.base.appzxhy.utils.MyAnimationUtils
import com.base.appzxhy.utils.ToastUtils.toast
import com.google.gson.GsonBuilder
......@@ -40,8 +41,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB
binding.tvCleanedUp.text = cleanedSize.toFormatSize()
binding.tvVersion.text = "v${BuildConfig.VERSION_NAME}"
// MyAnimationUtils.rotation(binding.ivBlade)
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_medium)
if (BuildConfig.DEBUG) {
binding.tvToken.visibility = View.VISIBLE
......@@ -70,9 +70,9 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB
val dialog = RateDialog(requireActivity())
dialog.showDialog(true)
}
binding.ivBack.setOnClickListener {
(requireActivity() as SettingActivity).onBackPressedDispatcher.onBackPressed()
}
// binding.ivBack.setOnClickListener {
// (requireActivity() as SettingActivity).onBackPressedDispatcher.onBackPressed()
// }
}
override fun onResume() {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#328EF6" />
<corners android:radius="@dimen/dp_50" />
<solid android:color="#F5FDFF" />
<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:angle="270"
android:endColor="#25C5F2"
android:startColor="#03EFDB" />
</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="#2394FE"
android:startColor="#74D1FF" />
<corners android:radius="4dp" />
</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/icon_select_n" android:state_selected="false" />
<item android:drawable="@drawable/icon_select_p" android:state_selected="true" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/bgColorBlackAlpha90">
<item
android:id="@android:id/mask"
android:drawable="@color/white" />
</ripple>
\ No newline at end of file
......@@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_16"
android:src="@drawable/icon_return_b" />
android:src="@drawable/icon_back" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
......
......@@ -10,7 +10,7 @@
android:id="@+id/cl_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:background="@drawable/bg_gradient_03efdb_25c5f2"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
......@@ -28,51 +28,61 @@
android:id="@+id/ivBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:foreground="@drawable/ripple_8"
android:padding="@dimen/dp_16"
android:src="@drawable/icon_return_w" />
android:src="@drawable/icon_back" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/app_name"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="58dp"
android:text="@string/clean"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
</FrameLayout>
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/idLottie"
<!-- <com.airbnb.lottie.LottieAnimationView-->
<!-- android:id="@+id/idLottie"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="-8dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/ll_title"-->
<!-- app:lottie_autoPlay="true"-->
<!-- app:lottie_fileName="ok.json" />-->
<ImageView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-8dp"
android:src="@drawable/icon_dui"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_title"
app:lottie_autoPlay="true"
app:lottie_fileName="ok.json" />
app:layout_constraintTop_toBottomOf="@+id/ll_title" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_cleaned_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-8dp"
android:layout_marginTop="20dp"
android:text="@string/cleaned_up"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/idLottie" />
app:layout_constraintTop_toBottomOf="@id/iv_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="32dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="17dp"
android:text="@string/cleaned_up_content"
android:textColor="@color/white"
android:textSize="14sp"
......
......@@ -13,8 +13,8 @@
android:layout_marginHorizontal="35dp"
android:layout_marginTop="56dp"
android:gravity="center"
android:text="Which type do you want to clean?"
android:textColor="#1A1A1A"
android:text="@string/What_type_of_file_"
android:textColor="@color/fontsBlack"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
......@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f6fbff_10"
android:background="@drawable/bg_f5fdff_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
......@@ -43,15 +43,15 @@
android:layout_height="@dimen/dp_50"
android:layout_gravity="center_vertical"
android:layout_marginVertical="12dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_photo_guide"
android:layout_marginStart="14dp"
android:src="@drawable/icon_photo"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="25dp"
android:layout_marginStart="12dp"
android:layout_weight="1"
android:text="@string/photo"
android:textColor="#111111"
......@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_select_yuan"
android:background="@drawable/bg_select_single"
tools:ignore="ContentDescription" />
</LinearLayout>
......@@ -75,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f6fbff_10"
android:background="@drawable/bg_f5fdff_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
......@@ -84,14 +84,14 @@
android:layout_height="@dimen/dp_50"
android:layout_gravity="center_vertical"
android:layout_marginVertical="12dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_video_guide" />
android:layout_marginStart="14dp"
android:src="@drawable/icon_video_2" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="25dp"
android:layout_marginStart="12dp"
android:layout_weight="1"
android:text="@string/video"
android:textColor="#111111"
......@@ -104,7 +104,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_select_yuan" />
android:background="@drawable/bg_select_single" />
</LinearLayout>
......@@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f6fbff_10"
android:background="@drawable/bg_f5fdff_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
......@@ -123,8 +123,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginVertical="12dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_audio_guide" />
android:layout_marginStart="14dp"
android:src="@drawable/icon_audio" />
<TextView
android:layout_width="0dp"
......@@ -143,7 +143,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_select_yuan" />
android:background="@drawable/bg_select_single" />
</LinearLayout>
......@@ -153,7 +153,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f6fbff_10"
android:background="@drawable/bg_f5fdff_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
......@@ -162,8 +162,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginVertical="12dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_document_guide" />
android:layout_marginStart="14dp"
android:src="@drawable/icon_document" />
<TextView
android:layout_width="0dp"
......@@ -182,7 +182,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_select_yuan" />
android:background="@drawable/bg_select_single" />
</LinearLayout>
......
......@@ -10,7 +10,7 @@
android:id="@+id/tvSkip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
android:text="Skip"
android:textColor="#B6B6B6"
......@@ -21,24 +21,14 @@
tools:ignore="HardcodedText" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivDian"
android:layout_width="@dimen/dp_118"
android:layout_height="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_60"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/dian_1" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_118"
android:layout_marginTop="83dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivDian"
app:layout_constraintTop_toBottomOf="@id/tvSkip"
app:srcCompat="@drawable/image_guide_1" />
<TextView
......@@ -46,23 +36,33 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="@string/guide_tip_1"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_16"
app:layout_constraintTop_toBottomOf="@id/iv" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivDian"
android:layout_width="76dp"
android:layout_height="12dp"
android:layout_marginTop="30dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvContent"
app:srcCompat="@drawable/dian_1" />
<TextView
android:id="@+id/tvBtn"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_55"
android:layout_width="179dp"
android:layout_height="44dp"
android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/bg_stroke_328ef6_50"
android:background="@drawable/bg_primary_r64"
android:gravity="center"
android:text="@string/next"
android:textColor="#328EF6"
android:textSize="@dimen/sp_20"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/flAd"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -94,6 +94,7 @@
android:id="@+id/iv_clean_junk"
android:layout_width="0dp"
android:layout_height="match_parent"
android:foreground="@drawable/ripple_8"
android:paddingTop="12dp"
android:paddingBottom="18dp"
android:src="@drawable/icon_clean_2"
......@@ -116,6 +117,7 @@
android:id="@+id/iv_battery_info"
android:layout_width="0dp"
android:layout_height="match_parent"
android:foreground="@drawable/ripple_8"
android:paddingTop="12dp"
android:paddingBottom="18dp"
android:src="@drawable/icon_battery_2"
......@@ -137,6 +139,7 @@
android:id="@+id/iv_video_clean"
android:layout_width="0dp"
android:layout_height="match_parent"
android:foreground="@drawable/ripple_8"
android:paddingTop="12dp"
android:paddingBottom="18dp"
android:src="@drawable/icon_video"
......@@ -164,6 +167,7 @@
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_ffffff_8"
android:foreground="@drawable/ripple_8"
android:gravity="center_vertical"
android:paddingStart="64dp"
android:text="@string/large_file_clean"
......@@ -197,6 +201,7 @@
android:layout_marginHorizontal="16dp"
android:layout_marginTop="12dp"
android:background="@drawable/bg_ffffff_8"
android:foreground="@drawable/ripple_8"
android:gravity="center_vertical"
android:paddingStart="64dp"
android:text="@string/photo_compression"
......@@ -230,6 +235,7 @@
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_ffffff_8"
android:foreground="@drawable/ripple_8"
android:gravity="center_vertical"
android:paddingStart="64dp"
android:text="@string/screenshot_clean"
......@@ -264,6 +270,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="12dp"
android:background="@drawable/bg_ffffff_8"
android:foreground="@drawable/ripple_8"
android:gravity="center_vertical"
android:paddingStart="64dp"
android:text="@string/similar_photos"
......
......@@ -13,22 +13,15 @@
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent">
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/iv_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="24dp"
android:layout_marginStart="17dp"
android:layout_marginTop="32dp"
android:text="@string/settings"
android:textColor="@color/white"
android:textSize="20sp"
android:textSize="@dimen/sp_20"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -42,6 +35,7 @@
android:text="0B"
android:textColor="@color/white"
android:textSize="36sp"
android:textStyle="normal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_settings"
tools:ignore="HardcodedText" />
......@@ -50,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="26dp"
android:layout_marginBottom="27dp"
android:text="@string/already_saved_for_you"
android:textColor="@color/white"
android:textSize="16sp"
......@@ -59,33 +53,12 @@
app:layout_constraintTop_toBottomOf="@id/tv_cleaned_up"
tools:ignore="TextContrastCheck" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
<ImageView
android:layout_width="120dp"
android:layout_height="120dp"
android:src="@drawable/img_setting_rocket"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:src="@drawable/zhuti"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ImageContrastCheck" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivBlade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/yezi"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ImageContrastCheck" />
</androidx.constraintlayout.widget.ConstraintLayout>
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -93,14 +66,14 @@
android:id="@+id/flAd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="12dp"
app:layout_constraintTop_toBottomOf="@id/cl_top">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/zhanwei1"
android:scaleType="fitXY"
android:src="@drawable/img_ad_medium_zhanwei"
tools:ignore="ContentDescription,ImageContrastCheck" />
</com.base.appzxhy.business.ads.NativeParentView>
......@@ -127,7 +100,7 @@
android:layout_height="@dimen/dp_30"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:src="@drawable/icom_persona"
android:src="@drawable/icon_privacy"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
......@@ -7,13 +7,14 @@
android:layout_marginStart="15dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="15dp"
android:background="@drawable/white_background"
android:padding="16dp">
android:background="@drawable/bg_ffffff_8"
android:paddingHorizontal="14dp"
android:paddingVertical="16dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_image"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/h_junkclean"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -22,18 +23,19 @@
android:id="@+id/ll_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginStart="12dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/iv_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_image"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="@id/iv_image">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/junk_clean"
android:textColor="@color/color_181b1f"
android:textColor="@color/fontsBlack"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -42,8 +44,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/result_junk_clean"
android:textColor="@color/color_666666"
android:textSize="16sp" />
android:textColor="@color/color_999999"
android:textSize="12sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
......@@ -51,16 +53,16 @@
android:id="@+id/tv_clean_now"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_btn_50"
android:layout_marginTop="8dp"
android:background="@drawable/bg_gradient_74d1ff_2394fe_r4"
android:gravity="center"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/clean_now"
android:text="@string/View"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/ll_content"
app:layout_constraintTop_toBottomOf="@id/iv_image"
tools:layout_editor_absoluteX="16dp" />
<com.base.appzxhy.business.ads.NativeParentView
......
<com.google.android.gms.ads.nativead.NativeAdView 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:id="@+id/nativeAdView"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="14dp"
android:paddingTop="10dp"
android:paddingBottom="15dp">
<com.google.android.gms.ads.nativead.MediaView
android:id="@+id/ad_media"
android:layout_width="match_parent"
android:layout_height="152dp"
android:layout_marginHorizontal="8dp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="15dp"
android:orientation="vertical">
<ImageView
android:id="@+id/ad_app_icon"
android:layout_width="51dp"
android:layout_height="51dp"
android:layout_gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/ad_headline"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/ad_call_to_action"
app:layout_constraintStart_toEndOf="@id/ad_app_icon"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/ad_body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="2"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintEnd_toStartOf="@id/ad_call_to_action"
app:layout_constraintStart_toEndOf="@id/ad_app_icon"
app:layout_constraintTop_toBottomOf="@id/ad_headline" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action"
android:layout_width="104dp"
android:layout_height="43dp"
android:layout_gravity="center_vertical"
android:background="@drawable/bg_btn_ad"
android:gravity="center"
android:textColor="@color/white"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@id/ad_app_icon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/ad_app_icon"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck,VisualLintButtonSize" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</com.google.android.gms.ads.nativead.NativeAdView>
\ No newline at end of file
......@@ -12,6 +12,7 @@
<color name="fontsGray66">#666666</color>
<color name="fontsGray85">#85909D</color>
<color name="bgColorBlackAlpha90">#1A000000</color>
<color name="color_66000000">#66000000</color>
<color name="color_1a1a1a">#1A1A1A</color>
<color name="color_181b1f">#181B1F</color>
......
......@@ -111,9 +111,9 @@ Please rest assured that we will handle your information in strict accordance wi
<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="screenshot_cleaner">Screenshot Cleaner</string>
<string name="guide_tip_1">Deleted precious photos or important files by accident? That’s when regret kicks in.</string>
<string name="guide_tip_2">Don’t let regret set in! Our app can accurately recover the files you’ve accidentally deleted.</string>
<string name="guide_tip_3">Release phone memory clean up junk files</string>
<string name="guide_tip_1">Clean up clutter to unlock more space and keep your phone running smoothly.</string>
<string name="guide_tip_2">Quickly clear junk files and free up valuable storage with just a few taps.</string>
<string name="guide_tip_3">Clean photos,videos,and audio files to save space and keep your phone tidy.</string>
<string name="next">Next</string>
<string name="sure">Sure</string>
......@@ -133,4 +133,7 @@ Please rest assured that we will handle your information in strict accordance wi
<string name="Exit">Exit</string>
<string name="Used_Space">Used Space</string>
<string name="Video_Clean">Video Clean</string>
<string name="Compress_Photos">Compress Photos</string>
<string name="View">View</string>
<string name="What_type_of_file_">What type of file do you want to clean?</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