Merge 26e421d916 into 8e140e2e69

Updated by "Cleanup translation files" add-on in Weblate.

Translation: jrpie-Launcher/Launcher
Translate-URL: https://toolate.othing.xyz/projects/jrpie-launcher/launcher/

app/build.gradle

@@ -23,8 +23,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 35
         compileSdk 35
-        versionCode 41
+        versionCode 43
-        versionName "0.1.1"
+        versionName "0.1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt

@@ -2,10 +2,10 @@ package de.jrpie.android.launcher.ui
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
+import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
@@ -56,22 +56,11 @@ class HomeActivity : UIObject, AppCompatActivity() {
         super<AppCompatActivity>.onCreate(savedInstanceState)
         super<UIObject>.onCreate()
 
-        val displayMetrics = DisplayMetrics()
-
-        @Suppress("deprecation") // required to support API < 30
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
-
-        val width = displayMetrics.widthPixels
-        val height = displayMetrics.heightPixels
-
         touchGestureDetector = TouchGestureDetector(
-            this,
+            this, 0, 0,
-            width,
-            height,
             LauncherPreferences.enabled_gestures().edgeSwipeEdgeWidth() / 100f
         )
-
+        touchGestureDetector.updateScreenSize(windowManager)
-
 
         // Initialise layout
         binding = HomeBinding.inflate(layoutInflater)
@@ -103,6 +92,11 @@ class HomeActivity : UIObject, AppCompatActivity() {
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        touchGestureDetector.updateScreenSize(windowManager)
+    }
+
     override fun onStart() {
         super<AppCompatActivity>.onStart()
 

app/src/main/java/de/jrpie/android/launcher/ui/TouchGestureDetector.kt

@@ -5,8 +5,10 @@ import android.graphics.Insets
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.util.DisplayMetrics
 import android.view.MotionEvent
 import android.view.ViewConfiguration
+import android.view.WindowManager
 import androidx.annotation.RequiresApi
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.preferences.LauncherPreferences
@@ -17,8 +19,8 @@ import kotlin.math.tan
 
 class TouchGestureDetector(
     private val context: Context,
-    val width: Int,
+    var width: Int,
-    val height: Int,
+    var height: Int,
     var edgeWidth: Float
 ) {
     private val ANGULAR_THRESHOLD = tan(Math.PI / 6)
@@ -319,6 +321,14 @@ class TouchGestureDetector(
         }
     }
 
+    fun updateScreenSize(windowManager: WindowManager) {
+        val displayMetrics = DisplayMetrics()
+        @Suppress("deprecation") // required to support API < 30
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        width = displayMetrics.widthPixels
+        height = displayMetrics.heightPixels
+    }
+
     @RequiresApi(Build.VERSION_CODES.Q)
     fun setSystemGestureInsets(insets: Insets) {
         systemGestureInsetTop = insets.top

app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt

@@ -9,8 +9,7 @@ import android.window.OnBackInvokedDispatcher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.fragment.app.FragmentPagerAdapter
-import com.google.android.material.tabs.TabLayoutMediator
 import de.jrpie.android.launcher.Application
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.actions.LauncherAction
@@ -225,13 +224,10 @@ class ListActivity : AppCompatActivity(), UIObject {
         updateTitle()
 
         val sectionsPagerAdapter = ListSectionsPagerAdapter(this)
-        binding.listViewpager.apply {
+        binding.listViewpager.let {
-            adapter = sectionsPagerAdapter
+            it.adapter = sectionsPagerAdapter
-            currentItem = 0
+            binding.listTabs.setupWithViewPager(it)
         }
-        TabLayoutMediator(binding.listTabs, binding.listViewpager) { tab, position ->
-            tab.text = sectionsPagerAdapter.getPageTitle(position)
-        }.attach()
     }
 }
 
@@ -243,11 +239,17 @@ private val TAB_TITLES = arrayOf(
 /**
  * The [ListSectionsPagerAdapter] returns the fragment,
  * which corresponds to the selected tab in [ListActivity].
+ *
+ * This should eventually be replaced by a [FragmentStateAdapter]
+ * However this keyboard does not open when using [ViewPager2]
+ * so currently [ViewPager] is used here.
+ * https://github.com/jrpie/launcher/issues/130
  */
+@Suppress("deprecation")
 class ListSectionsPagerAdapter(private val activity: ListActivity) :
-    FragmentStateAdapter(activity) {
+    FragmentPagerAdapter(activity.supportFragmentManager) {
 
-    override fun createFragment(position: Int): Fragment {
+    override fun getItem(position: Int): Fragment {
         return when (position) {
             0 -> ListFragmentApps()
             1 -> ListFragmentOther()
@@ -255,11 +257,11 @@ class ListSectionsPagerAdapter(private val activity: ListActivity) :
         }
     }
 
-    fun getPageTitle(position: Int): CharSequence {
+    override fun getPageTitle(position: Int): CharSequence {
         return activity.resources.getString(TAB_TITLES[position])
     }
 
-    override fun getItemCount(): Int {
+    override fun getCount(): Int {
         return when (activity.intention) {
             ListActivity.ListActivityIntention.VIEW -> 1
             else -> 2

app/src/main/java/de/jrpie/android/launcher/ui/settings/SettingsActivity.kt

@@ -109,7 +109,7 @@ class SettingsActivity : AppCompatActivity(), UIObject {
 }
 
 private val TAB_TITLES = arrayOf(
-    R.string.settings_tab_app,
+    R.string.settings_tab_actions,
     R.string.settings_tab_launcher,
     R.string.settings_tab_meta
 )

app/src/main/res/layout/list.xml

@@ -95,7 +95,12 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager2.widget.ViewPager2
+    <!--
+    Should be replaced by androidx.viewpager2.widget.ViewPager2
+    but there is an issue with opening the keyboard:
+    https://github.com/jrpie/launcher/issues/130
+    -->
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/list_viewpager"
         android:layout_width="0dp"
         android:layout_height="0dp"

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

@@ -14,7 +14,7 @@
       -
       -->
     <string name="settings_title">Einstellungen</string>
-    <string name="settings_tab_app">Apps</string>
+    <string name="settings_tab_actions">Aktionen</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--
@@ -54,9 +54,9 @@
     <string name="settings_gesture_description_down_left_edge">An der linken Kante nach unten wischen</string>
     <string name="settings_gesture_down_right_edge">Abwärts (rechts)</string>
     <string name="settings_gesture_description_down_right_edge">An der rechten Kanten nach unten wischen</string>
-    <string name="settings_gesture_vol_up">Lautstärke +</string>
+    <string name="settings_gesture_vol_up">Lauter-Taste</string>
     <string name="settings_gesture_description_vol_up">Die Taste \"Lauter\" drücken</string>
-    <string name="settings_gesture_vol_down">Lautstärke -</string>
+    <string name="settings_gesture_vol_down">Leiser-Taste</string>
     <string name="settings_gesture_description_vol_down">Die Taste \"Leiser\" drücken</string>
     <string name="settings_gesture_double_click">Doppelklick</string>
     <string name="settings_gesture_description_double_click">In einem leeren Bereich doppelt klicken</string>

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

@@ -23,7 +23,6 @@
       -
       -->
     <string name="settings_title">Configuración</string>
-    <string name="settings_tab_app">Aplicaciones</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--

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

@@ -14,7 +14,6 @@
       -
       -->
     <string name="settings_title">Réglages</string>
-    <string name="settings_tab_app">Applications</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--

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

@@ -38,7 +38,6 @@
     <string name="alert_cant_open_message">Desideri modificare le impostazioni?</string>
     <string name="toast_cant_open_message">Apri le impostazioni per abbinare un\'azione a questo gesto</string>
     <string name="settings_title">Impostazioni</string>
-    <string name="settings_tab_app">Applicazioni</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <string name="settings_gesture_description_double_down">Scorri verso il basso con due dita</string>

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

@@ -3,7 +3,6 @@
     <string name="alert_cant_open_title">アプリを開けません</string>
     <string name="alert_cant_open_message">設定を変更しますか？</string>
     <string name="settings_title">設定</string>
-    <string name="settings_tab_app">アプリ</string>
     <string name="settings_tab_launcher">ランチャー</string>
     <string name="settings_tab_meta">その他</string>
     <string name="toast_cant_open_message">このジェスチャのアクションを選択するには設定を開きます</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -14,7 +14,6 @@
       -
       -->
     <string name="settings_title">Configurações</string>
-    <string name="settings_tab_app">Apps</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--

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

@@ -52,7 +52,6 @@
     <string name="alert_cant_open_message">Ayarlarını değiştirmek ister misiniz?</string>
     <string name="toast_cant_open_message">Bu harekete bir eylem atamak için ayarları açın</string>
     <string name="settings_title">Ayarlar</string>
-    <string name="settings_tab_app">Uygulamalar</string>
     <string name="settings_tab_launcher">Başlatıcı</string>
     <string name="settings_tab_meta">Daha Fazlası</string>
     <string name="settings_gesture_up">Yukarı</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -13,7 +13,6 @@
     <string name="alert_cant_open_title">无法打开应用</string>
     <string name="alert_cant_open_message">要更改其设置吗？</string>
     <string name="toast_cant_open_message">打开设置，为该手势绑定一个应用程序</string>
-    <string name="settings_tab_app">应用程序</string>
     <string name="settings_tab_launcher">启动器</string>
     <string name="settings_tab_meta">杂项</string>
     <string name="settings_gesture_left">左</string>

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

@@ -16,7 +16,7 @@
       -->
     <string name="settings_title">Settings</string>
 
-    <string name="settings_tab_app">Apps</string>
+    <string name="settings_tab_actions">Actions</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
 
@@ -85,9 +85,9 @@
     <string name="settings_gesture_swipe_lambda_reverse">Λ (Reverse)</string>
     <string name="settings_gesture_description_swipe_lambda_reverse">Bottom right -> top mid -> bottom left</string>
 
-    <string name="settings_gesture_vol_up">Volume Up</string>
+    <string name="settings_gesture_vol_up">Volume Up Key</string>
     <string name="settings_gesture_description_vol_up">Press the volume up button</string>
-    <string name="settings_gesture_vol_down">Volume Down</string>
+    <string name="settings_gesture_vol_down">Volume Down Key</string>
     <string name="settings_gesture_description_vol_down">Press the volume down button</string>
     <string name="settings_gesture_double_click">Double Click</string>
     <string name="settings_gesture_description_double_click">Double click an empty area</string>

fastlane/metadata/android/en-US/changelogs/42.txt

@@ -0,0 +1 @@
+* Fixed bug where keyboard does not open automatically

fastlane/metadata/android/en-US/changelogs/43.txt

@@ -0,0 +1 @@
+* Fixed gesture detection in landscape orientation