diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt index 23bdcbd..51e877b 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt @@ -55,7 +55,7 @@ class PreferenceHelper @Inject constructor(@ApplicationContext context: Context) set(value) = prefs.edit().putInt(Constants.APP_COLOR, value).apply() var showAppIcon: Boolean - get() = prefs.getBoolean(Constants.SHOW_APP_ICON, true) + get() = prefs.getBoolean(Constants.SHOW_APP_ICON, false) set(value) = prefs.edit().putBoolean(Constants.SHOW_APP_ICON, value).apply() var automaticKeyboard: Boolean diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeViewHolder.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeViewHolder.kt index e52d468..1f77163 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeViewHolder.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeViewHolder.kt @@ -1,7 +1,7 @@ package com.github.droidworksstudio.launcher.ui.home -import android.content.Context import android.util.Log +import android.view.Gravity import android.view.View import androidx.appcompat.widget.LinearLayoutCompat import androidx.recyclerview.widget.RecyclerView @@ -35,11 +35,24 @@ class HomeViewHolder @Inject constructor( appHomeName.textSize = preferenceHelper.appTextSize Log.d("Tag", "Home Adapter Color: ${preferenceHelper.appColor}") - val appIcon = binding.root.context.packageManager.getApplicationIcon(appInfo.packageName) - appHomeIcon.setImageDrawable(appIcon) - appHomeIcon.layoutParams.width = preferenceHelper.appTextSize.toInt() * 3 - appHomeIcon.layoutParams.height = preferenceHelper.appTextSize.toInt() * 3 - appHomeIcon.visibility = View.GONE + if (preferenceHelper.showAppIcon) { + val appIcon = binding.root.context.packageManager.getApplicationIcon(appInfo.packageName) + when (preferenceHelper.homeAppAlignment) { + Gravity.START -> { + appHomeLeftIcon.setImageDrawable(appIcon) + appHomeLeftIcon.layoutParams.width = preferenceHelper.appTextSize.toInt() * 3 + appHomeLeftIcon.layoutParams.height = preferenceHelper.appTextSize.toInt() * 3 + appHomeLeftIcon.visibility = View.VISIBLE + } + Gravity.END -> { + appHomeRightIcon.setImageDrawable(appIcon) + appHomeRightIcon.layoutParams.width = preferenceHelper.appTextSize.toInt() * 3 + appHomeRightIcon.layoutParams.height = preferenceHelper.appTextSize.toInt() * 3 + appHomeRightIcon.visibility = View.VISIBLE + } + } + + } } itemView.setOnClickListener { onAppClickedListener.onAppClicked(appInfo) } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt index 40c3ea9..62d33ef 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt @@ -76,6 +76,7 @@ class SettingsFragment : Fragment(), ScrollEventListener { binding.dateSwitchCompat.isChecked = preferenceHelper.showDate binding.batterySwitchCompat.isChecked = preferenceHelper.showBattery binding.dailyWordSwitchCompat.isChecked = preferenceHelper.showDailyWord + binding.appIconsSwitchCompat.isChecked = preferenceHelper.showAppIcon binding.gesturesLockSwitchCompat.isChecked = preferenceHelper.tapLockScreen binding.gesturesNotificationSwitchCompat.isChecked = preferenceHelper.swipeNotification binding.gesturesSearchSwitchCompat.isChecked = preferenceHelper.swipeSearch @@ -156,6 +157,10 @@ class SettingsFragment : Fragment(), ScrollEventListener { preferenceViewModel.setShowDailyWord(isChecked) } + binding.appIconsSwitchCompat.setOnCheckedChangeListener { _, isChecked -> + preferenceViewModel.setShowAppIcons(isChecked) + } + binding.gesturesLockSwitchCompat.setOnCheckedChangeListener { _, isChecked -> appHelper.enableAppAsAccessibilityService(requireContext(), preferenceHelper.tapLockScreen) preferenceViewModel.setDoubleTapLock(isChecked) diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt b/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt index 87c3a35..a91e48b 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt @@ -17,6 +17,7 @@ class PreferenceViewModel @Inject constructor( val showDateLiveData: MutableLiveData = MutableLiveData() val showDailyWordLiveData: MutableLiveData = MutableLiveData() val showBatteryLiveData: MutableLiveData = MutableLiveData() + val showAppIconLiveData: MutableLiveData = MutableLiveData() val homeAppAlignmentLiveData: MutableLiveData = MutableLiveData() val homeDateAlignmentLiveData: MutableLiveData = MutableLiveData() val homeTimeAlignmentLiveData: MutableLiveData = MutableLiveData() @@ -65,6 +66,11 @@ class PreferenceViewModel @Inject constructor( showDailyWordLiveData.postValue(preferenceHelper.showDailyWord) } + fun setShowAppIcons(showAppIcons: Boolean) { + preferenceHelper.showAppIcon = showAppIcons + showAppIconLiveData.postValue(preferenceHelper.showAppIcon) + } + fun setDailyWordColor(dailyWordColor: Int) { preferenceHelper.dailyWordColor = dailyWordColor dailyWordColorLiveData.postValue(preferenceHelper.dailyWordColor) diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index a1e0eab..d3c1781 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="left|center" - android:text="@string/settings_appearance_statue_bar" + android:text="@string/settings_appearance_status_bar" android:textSize="@dimen/text_large" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -227,6 +227,38 @@ tools:ignore="TouchTargetSizeCheck" /> + + + + + + + + + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:visibility="visible" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/linear_layout"/> + + - - - \ No newline at end of file + diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index e6f267e..87091ef 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -27,7 +27,7 @@ App Manage Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7c1a29..90fa43b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,11 +31,12 @@ Gestures Others - Show Statue Bar + Show Status Bar Show Date Show Time Show Battery Show Daily Word + Show App Icons Size Color