Fixed italic fonts being cut off and updated version

This commit is contained in:
ottoptj 2024-09-09 07:31:35 +03:00
commit fb650bf5ee
6 changed files with 71 additions and 47 deletions

View file

@ -11,8 +11,8 @@ android {
applicationId = "eu.ottop.yamlauncher" applicationId = "eu.ottop.yamlauncher"
minSdk = 31 minSdk = 31
targetSdk = 34 targetSdk = 34
versionCode = 7 versionCode = 8
versionName = "1.3" versionName = "1.4"
} }
dependenciesInfo { dependenciesInfo {

View file

@ -266,10 +266,11 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
try { try {
// The menu opens from the top // The menu opens from the top
appRecycler.scrollToPosition(0) appRecycler.scrollToPosition(0)
if (sharedPreferenceManager.areContactsEnabled()) { if (searchSwitcher.visibility == View.VISIBLE) {
contactRecycler.scrollToPosition(0) contactRecycler.scrollToPosition(0)
searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null)) searchSwitcher.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.contacts_24px, null))
menuView.displayedChild = 0 menuView.displayedChild = 0
searchSwitcher.contentDescription = getString(R.string.switch_to_contacts)
} }
} }
catch (_: UninitializedPropertyAccessException) {} catch (_: UninitializedPropertyAccessException) {}
@ -284,7 +285,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
} }
private fun unsetShortcutSetup(textView: TextView) { private fun unsetShortcutSetup(textView: TextView) {
textView.text = getText(R.string.shortcut_default) textView.text = getString(R.string.shortcut_default)
unsetShortcutListeners(textView) unsetShortcutListeners(textView)
} }
@ -743,12 +744,23 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
searchSwitcher.setOnClickListener { searchSwitcher.setOnClickListener {
menuView.showNext() menuView.showNext()
when (menuView.displayedChild) { 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 -> { 1 -> {
lifecycleScope.launch(Dispatchers.Default) { lifecycleScope.launch(Dispatchers.Default) {
filterItems(searchView.text.toString()) 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)
}
} }
} }
} }

View file

@ -108,6 +108,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@string/switch_to_contacts"
android:padding="6dp" android:padding="6dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" android:visibility="gone"
@ -196,8 +197,9 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
@ -212,8 +214,9 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
@ -228,8 +231,9 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
@ -240,13 +244,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="0.09" android:layout_weight="0.09"
android:autoSizeMaxTextSize="32sp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
@ -261,12 +265,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -278,12 +282,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -295,12 +299,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -312,12 +316,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -329,8 +333,9 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
@ -341,13 +346,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="0.09" android:layout_weight="0.09"
android:autoSizeMaxTextSize="32sp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
@ -362,12 +367,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -379,12 +384,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -396,12 +401,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -413,12 +418,12 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -430,8 +435,9 @@
android:clickable="false" android:clickable="false"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="20dp" android:paddingHorizontal="20dp"
android:paddingRight="20dp" android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:text="@string/shortcut_default" android:text="@string/shortcut_default"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"

View file

@ -33,6 +33,8 @@
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="0dp" android:paddingBottom="0dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#FFF3F3F3" android:textColor="#FFF3F3F3"
@ -66,6 +68,8 @@
android:paddingTop="20dp" android:paddingTop="20dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="20dp" android:paddingBottom="20dp"
android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" android:textColor="#F3F3F3"
android:textSize="28sp" android:textSize="28sp"

View file

@ -44,4 +44,6 @@
<string name="region_text">%1$s%2$s</string> <string name="region_text">%1$s%2$s</string>
<string name="accessibility_service_description">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.</string> <string name="accessibility_service_description">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.</string>
<string name="switch_to_contacts">Switch to Contacts</string>
<string name="switch_to_apps">Switch to Apps</string>
</resources> </resources>