Commit 6bedc53b authored by wanglei's avatar wanglei

...

parent 6c9b7028
...@@ -45,6 +45,7 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() { ...@@ -45,6 +45,7 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() {
AdmobUtils.showInterstitialAd(this) { AdmobUtils.showInterstitialAd(this) {
binding.lottie.cancelAnimation() binding.lottie.cancelAnimation()
binding.flLottie.isVisible = false binding.flLottie.isVisible = false
AdmobUtils.showNativeAd(this, binding.flAd)
initData() initData()
} }
}, Random.nextLong(4000, 6000)) }, Random.nextLong(4000, 6000))
......
...@@ -41,6 +41,9 @@ class WhatsAppCleanerActivity : BaseActivity<ActivityWhatsAppCleanerBinding>() { ...@@ -41,6 +41,9 @@ class WhatsAppCleanerActivity : BaseActivity<ActivityWhatsAppCleanerBinding>() {
finish() finish()
} }
binding.rv.adapter = adapter binding.rv.adapter = adapter
AdmobUtils.showNativeAd(this, binding.flAd)
initData() initData()
} }
......
...@@ -42,6 +42,8 @@ class WhatsAppMessageCleanActivity : BaseActivity<ActivityWhatsAppMessageCleanBi ...@@ -42,6 +42,8 @@ class WhatsAppMessageCleanActivity : BaseActivity<ActivityWhatsAppMessageCleanBi
} }
binding.rv.adapter = adapter binding.rv.adapter = adapter
adapter.setData(pathList) adapter.setData(pathList)
AdmobUtils.showNativeAd(this, binding.flAd)
} }
override fun initListener() { override fun initListener() {
...@@ -65,7 +67,6 @@ class WhatsAppMessageCleanActivity : BaseActivity<ActivityWhatsAppMessageCleanBi ...@@ -65,7 +67,6 @@ class WhatsAppMessageCleanActivity : BaseActivity<ActivityWhatsAppMessageCleanBi
runCatching { runCatching {
list.forEach { File(it).delete() } list.forEach { File(it).delete() }
} }
startActivity(Intent(this, ResultActivity::class.java).apply { startActivity(Intent(this, ResultActivity::class.java).apply {
putExtra("from", WHATSAPP_CLEANER) putExtra("from", WHATSAPP_CLEANER)
}) })
......
...@@ -29,16 +29,21 @@ class ToolsAdapter( ...@@ -29,16 +29,21 @@ class ToolsAdapter(
ToolsUI( ToolsUI(
tittle = "Popular", tools = listOf( tittle = "Popular", tools = listOf(
ToolUI(JUNK_CLEANER, context.getString(R.string.clean_junk), R.mipmap.t_cleanjunk), ToolUI(JUNK_CLEANER, context.getString(R.string.clean_junk), R.mipmap.t_cleanjunk),
ToolUI(WHATSAPP_CLEANER, context.getString(R.string.whatsapp_cleaner), R.mipmap.t_whatsapp),
ToolUI(BATTERY_INFO, context.getString(R.string.battery_info), R.mipmap.t_battery),
ToolUI(LARGE_FILE_CLEANER, context.getString(R.string.large_file_cleaner), R.mipmap.t_large), ToolUI(LARGE_FILE_CLEANER, context.getString(R.string.large_file_cleaner), R.mipmap.t_large),
ToolUI(PHOTO_COMPRESS, context.getString(R.string.photo_compress), R.mipmap.t_photo), ToolUI(PHOTO_COMPRESS, context.getString(R.string.photo_compress), R.mipmap.t_photo),
)
),
ToolsUI(isAd = true),
ToolsUI(
tittle = "More", tools = listOf(
ToolUI(APP_MANAGER, context.getString(R.string.app_manager), R.mipmap.t_appmanager),
ToolUI(SIMILAR_PHOTOS, context.getString(R.string.similar_photos), R.mipmap.t_similar), ToolUI(SIMILAR_PHOTOS, context.getString(R.string.similar_photos), R.mipmap.t_similar),
ToolUI(SCREENSHOT_CLEANER, context.getString(R.string.screenshot_cleaner), R.mipmap.screenshot), ToolUI(SCREENSHOT_CLEANER, context.getString(R.string.screenshot_cleaner), R.mipmap.screenshot),
ToolUI(BATTERY_INFO, context.getString(R.string.battery_info), R.mipmap.t_battery),
ToolUI(WHATSAPP_CLEANER, context.getString(R.string.whatsapp_cleaner), R.mipmap.t_whatsapp),
ToolUI(APP_MANAGER, context.getString(R.string.app_manager), R.mipmap.t_appmanager),
) )
), ),
// ToolsUI(isAd = true),
) )
override fun getItemViewType(position: Int): Int { override fun getItemViewType(position: Int): Int {
......
...@@ -69,20 +69,33 @@ ...@@ -69,20 +69,33 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="8dp"
android:layout_weight="1"
android:paddingVertical="8dp" android:paddingVertical="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_uninstall_app" /> tools:listitem="@layout/item_uninstall_app" />
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/fl_lottie" android:id="@+id/fl_lottie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/white"
android:visibility="gone"> android:visibility="gone">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
tools:ignore="UselessParent">
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottie" android:id="@+id/lottie"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -90,6 +103,16 @@ ...@@ -90,6 +103,16 @@
android:adjustViewBounds="true" android:adjustViewBounds="true"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" /> app:lottie_loop="true" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:text="Wait a moment..."
tools:ignore="HardcodedText" />
</LinearLayout>
</FrameLayout> </FrameLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
...@@ -101,11 +101,17 @@ ...@@ -101,11 +101,17 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_weight="1"
android:background="@color/white" android:background="@color/white"
android:paddingVertical="8dp" android:paddingVertical="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_whatsapp" /> tools:listitem="@layout/item_whatsapp" />
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -54,6 +54,12 @@ ...@@ -54,6 +54,12 @@
app:spanCount="3" app:spanCount="3"
tools:listitem="@layout/item_media_select" /> tools:listitem="@layout/item_media_select" />
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp"> android:layout_height="80dp">
......
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