Merge branch 'main' into feature/57-always-go-home

app/build.gradle

@@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.simplemobiletools.launcher"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 8
         versionName "5.0.6"
         setProperty("archivesBaseName", "launcher")

app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt

@@ -30,6 +30,7 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.PopupMenu
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.GestureDetectorCompat
+import androidx.core.view.WindowCompat
 import androidx.core.view.isVisible
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
@@ -85,9 +86,7 @@ class MainActivity : SimpleActivity(), FlingListener {
 
         mDetector = GestureDetectorCompat(this, MyGestureListener(this))
 
-        if (isRPlus()) {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
-            window.setDecorFitsSystemWindows(false)
-        }
 
         mScreenHeight = realScreenSize.y
         mAllAppsFragmentY = mScreenHeight
@@ -213,6 +212,7 @@ class MainActivity : SimpleActivity(), FlingListener {
                 val addTopPadding = main_holder.rootWindowInsets?.displayCutout != null
                 (all_apps_fragment as AllAppsFragment).setupViews(addTopPadding)
                 (widgets_fragment as WidgetsFragment).setupViews(addTopPadding)
+                updateStatusbarColor(Color.TRANSPARENT)
             }
         }
 
@@ -687,7 +687,7 @@ class MainActivity : SimpleActivity(), FlingListener {
             return super.onSingleTapUp(event)
         }
 
-        override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+        override fun onFling(event1: MotionEvent?, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
             // ignore fling events just after releasing an icon from dragging
             if (System.currentTimeMillis() - mLastUpEvent < 500L) {
                 return true

app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt

@@ -673,11 +673,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
     private fun getFakeHeight() = height - sideMargins.top - sideMargins.bottom
 
     @SuppressLint("DrawAllocation")
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
-        if (canvas == null) {
-            return
-        }
-
         super.onDraw(canvas)
         if (cellXCoords.isEmpty()) {
             fillCellSizes()

app/src/main/res/values-de/strings.xml

@@ -12,7 +12,7 @@
     <string name="hidden_icons">Ausgeblendete Symbole</string>
     <string name="hidden_icons_placeholder">Einige Apps können aufgrund von Systemeinschränkungen nicht deinstalliert werden, aber du kannst zumindest ihre Symbole ausblenden, um sie nicht zu sehen.</string>
     <string name="app_drawer_settings">App-Schublade</string>
-    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
+    <string name="close_app_drawer_on_app_open">App-Schublade beim Öffnen einer App schließen</string>
     <string name="close_app_drawer_on_home">Close app drawer when home button is used</string>
     <string name="home_screen_settings">Startbildschirm</string>
     <string name="widget_too_big">Das Widget ist zu groß für den aktuellen Startbildschirm</string>

app/src/main/res/values-pl/strings.xml

@@ -12,7 +12,7 @@
     <string name="hidden_icons">Ukryte ikony</string>
     <string name="hidden_icons_placeholder">Niektórych aplikacji nie można odinstalować ze względu na ograniczenia systemowe, ale możesz przynajmniej ukryć ich ikony, aby ich nie widzieć.</string>
     <string name="app_drawer_settings">Szuflada aplikacji</string>
-    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
+    <string name="close_app_drawer_on_app_open">Zamykaj szufladę aplikacji przy uruchomieniu aplikacji</string>
     <string name="close_app_drawer_on_home">Close app drawer when home button is used</string>
     <string name="home_screen_settings">Ekran główny</string>
     <string name="widget_too_big">Widżet jest za duży dla aktualnego rozmiaru ekranu głównego</string>

app/src/main/res/values-ru/strings.xml

@@ -12,7 +12,7 @@
     <string name="hidden_icons">Скрытые значки</string>
     <string name="hidden_icons_placeholder">Некоторые приложения нельзя удалить из-за системных ограничений, но можно скрыть их значки.</string>
     <string name="app_drawer_settings">Панель приложения</string>
-    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
+    <string name="close_app_drawer_on_app_open">Закрывать боковую панель при открытии приложения</string>
     <string name="close_app_drawer_on_home">Close app drawer when home button is used</string>
     <string name="home_screen_settings">Домашний экран</string>
     <string name="widget_too_big">Виджет слишком велик для текущего размера домашнего экрана</string>

app/src/main/res/values/styles.xml

@@ -10,6 +10,8 @@
 
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>