Commit 3ad0db5f authored by wanglei's avatar wanglei

...

parent f26bc4b5
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
...@@ -30,7 +29,9 @@ ...@@ -30,7 +29,9 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.AppTheme" android:theme="@style/Theme.AppTheme"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".ui.TestActivity"
android:exported="false" />
<activity <activity
android:name=".ui.splash.SplashActivity" android:name=".ui.splash.SplashActivity"
android:exported="true" android:exported="true"
...@@ -120,7 +121,6 @@ ...@@ -120,7 +121,6 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" /> tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
......
...@@ -102,11 +102,12 @@ abstract class BaseActivity<VB : ViewBinding>( ...@@ -102,11 +102,12 @@ abstract class BaseActivity<VB : ViewBinding>(
var onCreateI = 0 var onCreateI = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
useDefaultImmersive() setStatusBarColor()
onCreateI++ onCreateI++
LogEx.logDebug(TAG, "lifecycle $tagNo onCreate ${javaClass.simpleName} $onCreateI") LogEx.logDebug(TAG, "lifecycle $tagNo onCreate ${javaClass.simpleName} $onCreateI")
launcher = ActivityLauncher(this) launcher = ActivityLauncher(this)
setContentView(binding.root) setContentView(binding.root)
useDefaultImmersive()
EventUtils.event("page_${javaClass.simpleName}") EventUtils.event("page_${javaClass.simpleName}")
currentLocale = Locale(appLanguageSp, appLanguageCountrySp) currentLocale = Locale(appLanguageSp, appLanguageCountrySp)
initView() initView()
...@@ -278,7 +279,6 @@ abstract class BaseActivity<VB : ViewBinding>( ...@@ -278,7 +279,6 @@ abstract class BaseActivity<VB : ViewBinding>(
} }
open fun useDefaultImmersive() { open fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
......
...@@ -143,7 +143,6 @@ class JunkCleanActivity : BaseActivity<ActivityJunkCleanBinding>(ActivityJunkCle ...@@ -143,7 +143,6 @@ class JunkCleanActivity : BaseActivity<ActivityJunkCleanBinding>(ActivityJunkCle
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -66,7 +66,6 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle ...@@ -66,7 +66,6 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -28,7 +28,6 @@ class PhotoCompressionActivity : BaseActivity<ActivityPhotoCompressionBinding>(A ...@@ -28,7 +28,6 @@ class PhotoCompressionActivity : BaseActivity<ActivityPhotoCompressionBinding>(A
private var isSelectAll = false private var isSelectAll = false
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -101,7 +101,6 @@ class PhotoCompressionDetailActivity : ...@@ -101,7 +101,6 @@ class PhotoCompressionDetailActivity :
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -67,7 +67,6 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>(ActivityF ...@@ -67,7 +67,6 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>(ActivityF
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
enableEdgeToEdge(SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT))
ViewCompat.setOnApplyWindowInsetsListener(binding.clTop) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.clTop) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
......
...@@ -139,7 +139,6 @@ class ScreenshotCleanActivity : BaseActivity<ActivityScreenshotCleanBinding>(Act ...@@ -139,7 +139,6 @@ class ScreenshotCleanActivity : BaseActivity<ActivityScreenshotCleanBinding>(Act
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -11,7 +11,6 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(ActivitySettingBind ...@@ -11,7 +11,6 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(ActivitySettingBind
var insetsCallBack: ((insets: Insets) -> Unit)? = null var insetsCallBack: ((insets: Insets) -> Unit)? = null
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -171,7 +171,6 @@ class SimilarPhotosActivity : BaseActivity<ActivitySimilarPhotosBinding>(Activit ...@@ -171,7 +171,6 @@ class SimilarPhotosActivity : BaseActivity<ActivitySimilarPhotosBinding>(Activit
} }
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
...@@ -43,8 +43,11 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding ...@@ -43,8 +43,11 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
private val viewModel: SplashViewModel by viewModels() private val viewModel: SplashViewModel by viewModels()
override fun onWindowFocusChanged(hasFocus: Boolean) {
super.onWindowFocusChanged(hasFocus)
}
override fun useDefaultImmersive() { override fun useDefaultImmersive() {
setStatusBarColor()
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
......
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