Commit b3324d55 authored by wanglei's avatar wanglei

...

parent ebfd84a5
...@@ -37,7 +37,12 @@ ...@@ -37,7 +37,12 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".activity.photomanager.PhotoManagerActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity <activity
android:name=".activity.guide.GuideActivity" android:name=".activity.guide.GuideActivity"
android:exported="false" android:exported="false"
......
package com.base.filerecoveryrecyclebin.activity.photomanager
import android.graphics.Color
import androidx.core.view.updatePadding
import com.base.filerecoveryrecyclebin.databinding.ActivityPhotoManagerBinding
import com.base.filerecoveryrecyclebin.help.BaseActivity
import com.base.filerecoveryrecyclebin.utils.BarUtils
class PhotoManagerActivity : BaseActivity<ActivityPhotoManagerBinding>() {
override val binding: ActivityPhotoManagerBinding by lazy {
ActivityPhotoManagerBinding.inflate(layoutInflater)
}
override fun initView() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.WHITE)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
}
}
\ No newline at end of file
...@@ -4,6 +4,7 @@ import android.animation.ValueAnimator ...@@ -4,6 +4,7 @@ import android.animation.ValueAnimator
import android.content.Intent import android.content.Intent
import com.base.filerecoveryrecyclebin.activity.SettingActivity import com.base.filerecoveryrecyclebin.activity.SettingActivity
import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity
import com.base.filerecoveryrecyclebin.activity.photomanager.PhotoManagerActivity
import com.base.filerecoveryrecyclebin.activity.recovery.FileScanResultActivity import com.base.filerecoveryrecyclebin.activity.recovery.FileScanResultActivity
import com.base.filerecoveryrecyclebin.activity.repeat.RepeatAnimationActivity import com.base.filerecoveryrecyclebin.activity.repeat.RepeatAnimationActivity
import com.base.filerecoveryrecyclebin.activity.screenshot.ScreenShotAnimationActivity import com.base.filerecoveryrecyclebin.activity.screenshot.ScreenShotAnimationActivity
...@@ -50,13 +51,10 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() { ...@@ -50,13 +51,10 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() {
putExtra("ScanType", SCAN_AUDIOS) putExtra("ScanType", SCAN_AUDIOS)
}) })
} }
binding.cardPhotoManager.setOnClickListener {
binding.cardScreenshot.setOnClickListener { startActivity(Intent(requireContext(), PhotoManagerActivity::class.java))
startActivity(Intent(requireContext(), ScreenShotAnimationActivity::class.java))
}
binding.cardRepeatPhotos.setOnClickListener {
startActivity(Intent(requireContext(), RepeatAnimationActivity::class.java))
} }
binding.cardWhatsapp.setOnClickListener { binding.cardWhatsapp.setOnClickListener {
startActivity(Intent(requireContext(), WhatsAppCleanerAnimationActivity::class.java)) startActivity(Intent(requireContext(), WhatsAppCleanerAnimationActivity::class.java))
} }
...@@ -68,13 +66,13 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() { ...@@ -68,13 +66,13 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() {
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
binding.lottie.cancelAnimation() binding.lottie.pauseAnimation()
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
binding.lottie.playAnimation() binding.lottie.resumeAnimation()
} }
} }
\ No newline at end of file
...@@ -12,6 +12,7 @@ import android.view.Gravity ...@@ -12,6 +12,7 @@ import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.WindowManager import android.view.WindowManager
import androidx.core.content.ContextCompat
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import com.base.filerecoveryrecyclebin.R import com.base.filerecoveryrecyclebin.R
import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity
...@@ -325,22 +326,16 @@ object DialogViews { ...@@ -325,22 +326,16 @@ object DialogViews {
dialog.setCancelable(false) dialog.setCancelable(false)
dialog.show() dialog.show()
// dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
// dialog.window?.findViewById<View?>(com.google.android.material.R.id.design_bottom_sheet)
// ?.setBackgroundResource(android.R.color.transparent)
// (binding.root.parent as ViewGroup).background =
// ColorDrawable(Color.TRANSPARENT)
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent) dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
val lp: WindowManager.LayoutParams? = dialog.window?.attributes val lp: WindowManager.LayoutParams? = dialog.window?.attributes
lp?.alpha = 0f lp?.alpha = 1f
lp?.dimAmount = 0.0f lp?.dimAmount = 0.0f
window.setAttributes(lp) dialog.window?.setAttributes(lp)
binding.root.setBackgroundColor(ContextCompat.getColor(this, android.R.color.transparent))
// val parentView = binding.root.parent as View val parentView = binding.root.parent as View
// BottomSheetBehavior.from(parentView).state = BottomSheetBehavior.STATE_EXPANDED BottomSheetBehavior.from(parentView).state = BottomSheetBehavior.STATE_EXPANDED
binding.tvY.setOnClickListener { binding.tvY.setOnClickListener {
startActivity(Intent(this, ScanJunkActivity::class.java)) startActivity(Intent(this, ScanJunkActivity::class.java))
} }
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F3F7"
android:orientation="vertical"
tools:context=".activity.photomanager.PhotoManagerActivity">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
tools:ignore="UselessParent">
<FrameLayout
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="15dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:src="@mipmap/fanhui"
android:tint="@color/black"
tools:ignore="ContentDescription,UseAppTint" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Photo Manager"
android:textColor="@color/black"
android:textSize="19sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</FrameLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:src="@mipmap/screenshot_m"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:text="Screenshot Cleaner"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp"
android:textColor="#FF2323"
tools:text="19.5MB" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:src="@mipmap/jiantou"
tools:ignore="ContentDescription" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:src="@mipmap/duplicate_m"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:text="Duplicate Photos"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp"
android:textColor="#FF2323"
tools:text="19.5MB" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:src="@mipmap/jiantou"
tools:ignore="ContentDescription" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
\ No newline at end of file
...@@ -362,79 +362,6 @@ ...@@ -362,79 +362,6 @@
android:textStyle="bold" android:textStyle="bold"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp"
android:orientation="horizontal"
tools:ignore="DisableBaselineAlignment">
<androidx.cardview.widget.CardView
android:id="@+id/card_screenshot"
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_margin="8dp"
android:layout_weight="1"
android:background="@mipmap/photo"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="10dp"
app:cardElevation="0dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:text="Screenshot\nCleaner"
android:textColor="@color/black"
android:textSize="16sp"
tools:ignore="HardcodedText" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="8dp"
android:src="@mipmap/h_screenshot"
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/card_repeat_photos"
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_margin="8dp"
android:layout_weight="1"
android:background="@mipmap/videos"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="10dp"
app:cardElevation="0dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:text="Duplicate\nPhotos"
android:textColor="@color/black"
android:textSize="16sp"
tools:ignore="HardcodedText" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="8dp"
android:src="@mipmap/h_similar"
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout <LinearLayout
...@@ -475,14 +402,13 @@ ...@@ -475,14 +402,13 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card_photo_manager"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_margin="8dp" android:layout_margin="8dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@mipmap/videos" android:background="@mipmap/videos"
android:visibility="invisible"
app:cardBackgroundColor="@color/white" app:cardBackgroundColor="@color/white"
app:cardCornerRadius="10dp" app:cardCornerRadius="10dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
...@@ -492,7 +418,7 @@ ...@@ -492,7 +418,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:text="Duplicate\nPhotos" android:text="Photo\nManager"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
...@@ -502,7 +428,7 @@ ...@@ -502,7 +428,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@mipmap/h_similar" android:src="@mipmap/h_management"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
......
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