From 64cc4a0ecf6c4da0c4ed40307136b7bc2688254b Mon Sep 17 00:00:00 2001 From: ottoptj Date: Sat, 7 Sep 2024 01:44:05 +0300 Subject: [PATCH] Changed context menu icons, fixed context menu button click effect and adjusted about page scaling --- .../java/eu/ottop/yamlauncher/MainActivity.kt | 9 +++-- .../eu/ottop/yamlauncher/utils/UIUtils.kt | 2 +- ...reground.xml => app_action_background.xml} | 4 +-- app/src/main/res/layout/activity_main.xml | 3 +- app/src/main/res/layout/app_item_layout.xml | 35 ++++++++----------- app/src/main/res/layout/fragment_about.xml | 6 ++-- 6 files changed, 27 insertions(+), 32 deletions(-) rename app/src/main/res/drawable/{app_action_foreground.xml => app_action_background.xml} (74%) diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index f6ade5d..a9a9fd4 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -292,14 +292,16 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh private fun setPreferences() { uiUtils.setBackground(window) - uiUtils.setTextColors(binding.homeView) - uiUtils.setMenuItemColors(searchView) - uiUtils.setMenuItemColors(binding.menuTitle, "A9") + uiUtils.setTextFont(binding.homeView) uiUtils.setFont(searchView) uiUtils.setFont(binding.menuTitle) + uiUtils.setTextColors(binding.homeView) + + uiUtils.setMenuItemColors(binding.menuTitle, "A9") + uiUtils.setClockVisibility(clock) uiUtils.setDateVisibility(dateText) uiUtils.setSearchVisibility(searchView, binding.searchReplacement) @@ -318,6 +320,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh val handler = Handler(Looper.getMainLooper()) handler.postDelayed({ uiUtils.setStatusBar(window) + uiUtils.setMenuItemColors(searchView) }, 0) clockApp = gestureUtils.getSwipeInfo(launcherApps, "clock") diff --git a/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt b/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt index 17a4de6..bf85eb4 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt @@ -10,7 +10,6 @@ import android.view.Gravity import android.view.View import android.view.ViewGroup import android.view.ViewGroup.LayoutParams.WRAP_CONTENT -import android.view.ViewTreeObserver import android.view.Window import android.view.WindowInsets import android.view.WindowInsetsController @@ -73,6 +72,7 @@ class UIUtils(private val context: Context) { view.setHintTextColor(setAlpha(color, "A9")) view.compoundDrawables[0]?.mutate()?.colorFilter = BlendModeColorFilter(color, BlendMode.SRC_ATOP) + view.compoundDrawables[0]?.alpha = "A9".toInt(16) } fun setTextFont(view: View) { diff --git a/app/src/main/res/drawable/app_action_foreground.xml b/app/src/main/res/drawable/app_action_background.xml similarity index 74% rename from app/src/main/res/drawable/app_action_foreground.xml rename to app/src/main/res/drawable/app_action_background.xml index 5373e2e..1382fad 100644 --- a/app/src/main/res/drawable/app_action_foreground.xml +++ b/app/src/main/res/drawable/app_action_background.xml @@ -3,13 +3,13 @@ - + - + \ 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 041faab..5b9a518 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -59,7 +59,7 @@ android:layout_weight="0.1" android:background="@android:color/transparent" android:cursorVisible="true" - android:drawableStart="@android:drawable/ic_menu_search" + android:drawableStart="@drawable/search_24px" android:drawablePadding="8dp" android:editTextColor="#f3f3f3" android:hint="@string/search" @@ -99,7 +99,6 @@ android:layout_marginHorizontal="32dp" android:layout_marginTop="45dp" android:layout_marginBottom="27dp" - android:fontFamily="More Fonts..." android:format12Hour="hh:mm" android:format24Hour="HH:mm" android:textAlignment="textStart" diff --git a/app/src/main/res/layout/app_item_layout.xml b/app/src/main/res/layout/app_item_layout.xml index 6fb6d70..83cdf6e 100644 --- a/app/src/main/res/layout/app_item_layout.xml +++ b/app/src/main/res/layout/app_item_layout.xml @@ -85,75 +85,70 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="#A7000000" - android:foreground="@drawable/app_action_foreground" - android:paddingVertical="3dp" + android:background="@drawable/app_action_background" + android:paddingVertical="5dp" android:singleLine="true" android:text="@string/info" android:textAlignment="center" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3FF" - app:drawableTopCompat="@android:drawable/ic_menu_info_details" /> + app:drawableTopCompat="@drawable/info_24px" /> + app:drawableTopCompat="@drawable/delete_24px" /> + app:drawableTopCompat="@drawable/edit_24px" /> + app:drawableTopCompat="@drawable/visibility_off_24px" /> + app:drawableTopCompat="@drawable/close_24px" /> diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 8c2d25f..944ab76 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -146,15 +146,13 @@ android:id="@+id/weatherLink" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginTop="100dp" android:layout_marginBottom="20dp" - android:layout_weight="1.5" + android:layout_weight="6" android:autoSizeMinTextSize="5sp" - android:autoSizeTextType="uniform" android:gravity="bottom|center_horizontal" android:linksClickable="true" android:text="@string/weather_data_credit" android:textAlignment="center" - android:textSize="16sp" /> + android:textSize="12sp" /> \ No newline at end of file