From fb650bf5ee8192f5a8bbd7a8f93155dee328767c Mon Sep 17 00:00:00 2001 From: ottoptj Date: Mon, 9 Sep 2024 07:31:35 +0300 Subject: [PATCH] Fixed italic fonts being cut off and updated version --- app/build.gradle.kts | 4 +- .../java/eu/ottop/yamlauncher/MainActivity.kt | 20 ++++- app/src/main/res/drawable/ic_empty.xml | 2 +- app/src/main/res/layout/activity_main.xml | 86 ++++++++++--------- app/src/main/res/layout/app_item_layout.xml | 4 + app/src/main/res/values/strings.xml | 2 + 6 files changed, 71 insertions(+), 47 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b236ecc..670d377 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "eu.ottop.yamlauncher" minSdk = 31 targetSdk = 34 - versionCode = 7 - versionName = "1.3" + versionCode = 8 + versionName = "1.4" } dependenciesInfo { diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index 7fc9d88..e30d9f4 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -266,10 +266,11 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh try { // The menu opens from the top appRecycler.scrollToPosition(0) - if (sharedPreferenceManager.areContactsEnabled()) { + if (searchSwitcher.visibility == View.VISIBLE) { contactRecycler.scrollToPosition(0) searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null)) menuView.displayedChild = 0 + searchSwitcher.contentDescription = getString(R.string.switch_to_contacts) } } catch (_: UninitializedPropertyAccessException) {} @@ -284,7 +285,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh } private fun unsetShortcutSetup(textView: TextView) { - textView.text = getText(R.string.shortcut_default) + textView.text = getString(R.string.shortcut_default) unsetShortcutListeners(textView) } @@ -743,12 +744,23 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh searchSwitcher.setOnClickListener { menuView.showNext() when (menuView.displayedChild) { - 0 -> searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null)) + 0 -> { + searchSwitcher.setImageDrawable( + ResourcesCompat.getDrawable( + resources, + R.drawable.contacts_24px, + null + ) + ) + searchSwitcher.contentDescription = getString(R.string.switch_to_contacts) + } 1 -> { lifecycleScope.launch(Dispatchers.Default) { filterItems(searchView.text.toString()) } - searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.apps_24px, null))} + searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.apps_24px, null)) + searchSwitcher.contentDescription = getString(R.string.switch_to_apps) + } } } } diff --git a/app/src/main/res/drawable/ic_empty.xml b/app/src/main/res/drawable/ic_empty.xml index 5a83206..15547ec 100644 --- a/app/src/main/res/drawable/ic_empty.xml +++ b/app/src/main/res/drawable/ic_empty.xml @@ -7,4 +7,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 061023e..f1d0c8a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -108,6 +108,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" + android:contentDescription="@string/switch_to_contacts" android:padding="6dp" android:scaleType="fitCenter" android:visibility="gone" @@ -196,8 +197,9 @@ android:clickable="false" android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:paddingHorizontal="20dp" + android:shadowColor="#00FFFFFF" + android:shadowRadius="10" android:text="@string/shortcut_default" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3" @@ -212,8 +214,9 @@ android:clickable="false" android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:paddingHorizontal="20dp" + android:shadowColor="#00FFFFFF" + android:shadowRadius="10" android:text="@string/shortcut_default" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3" @@ -228,8 +231,9 @@ android:clickable="false" android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:paddingHorizontal="20dp" + android:shadowColor="#00FFFFFF" + android:shadowRadius="10" android:text="@string/shortcut_default" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3" @@ -240,13 +244,13 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="0.09" - android:autoSizeMaxTextSize="32sp" android:autoSizeTextType="uniform" android:clickable="false" android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:paddingHorizontal="20dp" + android:shadowColor="#00FFFFFF" + android:shadowRadius="10" android:text="@string/shortcut_default" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3" @@ -261,12 +265,12 @@ android:clickable="false" android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:paddingHorizontal="20dp" + android:shadowColor="#00FFFFFF" + android:shadowRadius="10" android:text="@string/shortcut_default" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3" - android:textSize="28sp" android:visibility="gone" /> %1$s%2$s The permission is required for double tap to work for locking the screen.\n\nIt is only needed if you want to use the double tap to lock screen feature in YAM Launcher. + Switch to Contacts + Switch to Apps \ No newline at end of file