diff --git a/app/src/main/java/com/coderGtm/yantra/activities/SettingsActivity.kt b/app/src/main/java/com/coderGtm/yantra/activities/SettingsActivity.kt index 4a9bedf5..967f2cf2 100644 --- a/app/src/main/java/com/coderGtm/yantra/activities/SettingsActivity.kt +++ b/app/src/main/java/com/coderGtm/yantra/activities/SettingsActivity.kt @@ -45,6 +45,7 @@ import com.coderGtm.yantra.misc.openLauncherSelection import com.coderGtm.yantra.misc.openNewsWebsiteSetter import com.coderGtm.yantra.misc.openOrientationSetter import com.coderGtm.yantra.misc.openPrimarySuggestionsOrderSetter +import com.coderGtm.yantra.misc.openSuggestionFontSizeSetter import com.coderGtm.yantra.misc.openSwipeLeftActionSetter import com.coderGtm.yantra.misc.openSwipeRightActionSetter import com.coderGtm.yantra.misc.openSysinfoArtSetter @@ -82,6 +83,7 @@ class SettingsActivity : AppCompatActivity() { private var initCmdLog = false private var fontSize = 16 private var arrowSize = 65 + private var suggestionFontSize = 18 private var orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT private var appSugOrderingMode = AppSortMode.A_TO_Z.value private var fontName = "Source Code Pro" @@ -155,6 +157,7 @@ class SettingsActivity : AppCompatActivity() { initCmdLog = preferenceObject.getBoolean("initCmdLog", false) fontSize = preferenceObject.getInt("fontSize",16) arrowSize = preferenceObject.getInt("arrowSize", 65) + suggestionFontSize = preferenceObject.getInt("suggestionFontSize",18) orientation = preferenceObject.getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) appSugOrderingMode = preferenceObject.getInt("appSortMode", AppSortMode.A_TO_Z.value) fontName = if (isPro(this@SettingsActivity)) { @@ -170,6 +173,7 @@ class SettingsActivity : AppCompatActivity() { binding.usernamePrefix.text = getUserNamePrefix(preferenceObject) binding.fontSizeBtn.text = fontSize.toString() binding.arrowSizeBtn.text = arrowSize.toString() + binding.suggestionFontSizeBtn.text = suggestionFontSize.toString() setOrientationTvText(this@SettingsActivity, binding, orientation) setAppSugOrderTvText(this@SettingsActivity, binding, appSugOrderingMode) binding.tvFontName.text = fontName @@ -182,6 +186,7 @@ class SettingsActivity : AppCompatActivity() { binding.newsWebsiteLayout.setOnClickListener { openNewsWebsiteSetter(this@SettingsActivity, preferenceObject, preferenceEditObject) } binding.fontSizeBtn.setOnClickListener { openFontSizeSetter(this@SettingsActivity, binding, preferenceObject, preferenceEditObject) } binding.arrowSizeBtn.setOnClickListener { openArrowSizeSetter(this@SettingsActivity, binding, preferenceObject, preferenceEditObject) } + binding.suggestionFontSizeBtn.setOnClickListener { openSuggestionFontSizeSetter(this@SettingsActivity, binding, preferenceObject, preferenceEditObject) } binding.orientationLay.setOnClickListener { openOrientationSetter(this@SettingsActivity, binding, preferenceEditObject) } binding.appSugOrderingLay.setOnClickListener { openAppSugOrderingSetter(this@SettingsActivity, binding, preferenceEditObject) } binding.sysinfoArtLayout.setOnClickListener { openSysinfoArtSetter(this@SettingsActivity, preferenceObject, preferenceEditObject) } diff --git a/app/src/main/java/com/coderGtm/yantra/misc/SettingsHelper.kt b/app/src/main/java/com/coderGtm/yantra/misc/SettingsHelper.kt index 6a39c33e..fd31bc4d 100644 --- a/app/src/main/java/com/coderGtm/yantra/misc/SettingsHelper.kt +++ b/app/src/main/java/com/coderGtm/yantra/misc/SettingsHelper.kt @@ -293,6 +293,28 @@ fun openArrowSizeSetter(activity: Activity, binding: ActivitySettingsBinding, pr ) } +fun openSuggestionFontSizeSetter(activity: Activity, binding: ActivitySettingsBinding, preferenceObject: SharedPreferences, preferenceEditObject: SharedPreferences.Editor) { + val fontSizeDialog = YantraLauncherDialog(activity) + fontSizeDialog.takeInput( + title = activity.getString(R.string.suggestion_font_size), + message = activity.getString(R.string.suggestion_font_size_description), + initialInput = preferenceObject.getInt("suggestionFontSize",18).toString(), + inputType = InputType.TYPE_CLASS_NUMBER, + positiveButton = activity.getString(R.string.save), + positiveAction = { + val size = it + if (size.toIntOrNull() == null || size.toInt() <= 0 ) { + toast(activity, activity.getString(R.string.invalid_suggestion_font_size)) + return@takeInput + } + preferenceEditObject.putInt("suggestionFontSize",size.toInt()).apply() + binding.suggestionFontSizeBtn.text = size + toast(activity, activity.getString(R.string.suggestion_font_size_updated)) + changedSettingsCallback(activity) + }, + ) +} + fun openOrientationSetter(activity: Activity, binding: ActivitySettingsBinding, preferenceEditObject: SharedPreferences.Editor) { YantraLauncherDialog(activity).selectItem( title = activity.getString(R.string.orientation), diff --git a/app/src/main/java/com/coderGtm/yantra/terminal/Helper.kt b/app/src/main/java/com/coderGtm/yantra/terminal/Helper.kt index 779c7995..64640ea1 100644 --- a/app/src/main/java/com/coderGtm/yantra/terminal/Helper.kt +++ b/app/src/main/java/com/coderGtm/yantra/terminal/Helper.kt @@ -38,6 +38,7 @@ fun showSuggestions( terminal.activity.runOnUiThread { terminal.binding.suggestionsTab.removeAllViews() } + val fontSize = terminal.preferenceObject.getInt("suggestionFontSize", 18).toFloat() val input = rawInput.trim() val suggestions = ArrayList<String>() val args = input.split(" ") @@ -584,7 +585,7 @@ fun showSuggestions( suggestion.setTextColor(terminal.theme.suggestionTextColor) suggestion.setTypeface(terminal.typeface, Typeface.BOLD) suggestion.setBackgroundColor(Color.TRANSPARENT) - suggestion.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14.5F) + suggestion.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize) suggestion.setPadding(40, 30, 40, 30) @@ -857,4 +858,4 @@ fun getAvailableCommands(activity: Activity): Map<String, Class<out BaseCommand "exit" to com.coderGtm.yantra.commands.exit.Command::class.java, ) } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 6823346f..755feebb 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -471,6 +471,31 @@ android:layout_height="1dp" android:background="?android:attr/listDivider" /> + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingVertical="8dp" + android:orientation="horizontal"> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textSize="20sp" + android:text="@string/suggestion_font_size" /> + + <Button + android:id="@+id/suggestionFontSizeBtn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="18" /> + </LinearLayout> + <LinearLayout android:id="@+id/orientationLay" android:layout_width="match_parent" diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 178e6b76..246176be 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,6 +18,7 @@ <string name="change_news_website">Cambiar sitio web de noticias</string> <string name="terminal_font_size">Tamaño de fuente de la terminal</string> <string name="arrow_keys_size">Tamaño de las teclas de flechas</string> + <string name="suggestion_font_size">"Tamaño de fuente de sugerencia"</string> <string name="orientation">Orientación de la terminal</string> <string name="app_suggestions_order">Orden de sugerencias de aplicaciones</string> <string name="terminal_font">Fuente de la terminal </string> @@ -45,6 +46,9 @@ <string name="arrow_size_description">Ingresa un tamaño para las Teclas de Flechas de la terminal:</string> <string name="invalid_arrow_size">¡Tamaño de flechas invalido!</string> <string name="arrow_size_updated">¡Tamaño de la flecha actualizado!</string> + <string name="suggestion_font_size_description">Enter a font size for suggestions:</string> + <string name="invalid_suggestion_font_size">Invalid font size!</string> + <string name="suggestion_font_size_updated">Font size updated!</string> <string name="portrait">Vertical</string> <string name="landscape">Horizontal</string> <string name="system">Sistema</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 806563de..fa82a74c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,6 +17,7 @@ <string name="change_left_swipe_command">Modifica il Comando di Swipe a Sinistra</string> <string name="change_news_website">Modifica il Sito Web delle Notizie</string> <string name="terminal_font_size">Dimensione del Font del Terminale</string> + <string name="suggestion_font_size">"Dimensione carattere suggerimento"</string> <string name="arrow_keys_size">Dimensione dei Tasti Freccia</string> <string name="orientation">Orientamento</string> <string name="app_suggestions_order">Ordine delle App Suggerite</string> @@ -45,6 +46,9 @@ <string name="arrow_size_description">Inserisci una dimensione per i Tasti Freccia del terminale:</string> <string name="invalid_arrow_size">Dimensione Tasti Freccia non valida!</string> <string name="arrow_size_updated">Dimensione Tasti Freccia aggiornata!</string> + <string name="suggestion_font_size_description">Enter a font size for suggestions:</string> + <string name="invalid_suggestion_font_size">Invalid font size!</string> + <string name="suggestion_font_size_updated">Font size updated!</string> <string name="portrait">Verticale</string> <string name="landscape">Orizzontale</string> <string name="system">Sistema</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 409c570c..fd5fbc96 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -18,6 +18,7 @@ <string name="change_news_website">Изменить новостной сайт</string> <string name="terminal_font_size">Размер шрифта в терминале</string> <string name="arrow_keys_size">Размер стрелок</string> + <string name="suggestion_font_size">"Рекомендуемый размер шрифта"</string> <string name="orientation">Ориентация терминала</string> <string name="app_suggestions_order">Порядок предложений приложений</string> <string name="terminal_font">Шрифт терминала</string> @@ -45,6 +46,9 @@ <string name="arrow_size_description">Введите размер стрелок в терминале:</string> <string name="invalid_arrow_size">Задан неправильный размер стрелок!</string> <string name="arrow_size_updated">Размер стрелок обновлён!</string> + <string name="suggestion_font_size_description">Enter a font size for suggestions:</string> + <string name="invalid_suggestion_font_size">Invalid font size!</string> + <string name="suggestion_font_size_updated">Font size updated!</string> <string name="portrait">Вертикальная</string> <string name="landscape">Горизонтальная</string> <string name="system">Системная</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 564c05a9..ecaf3ccf 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -18,6 +18,7 @@ <string name="change_news_website">Змінити сайт новин</string> <string name="terminal_font_size">Розмір шрифту терміналу</string> <string name="arrow_keys_size">Розмір клавіш зі стрілками</string> + <string name="suggestion_font_size">"Розмір шрифту пропозиції"</string> <string name="orientation">Орієнтація терміналу</string> <string name="app_suggestions_order">Пропозиції порятку додатків</string> <string name="terminal_font">Шрифт термінлу</string> @@ -45,6 +46,9 @@ <string name="arrow_size_description">Ввести розмір для клавіш стрілок на терміналі:</string> <string name="invalid_arrow_size">Розмір стрілок недійсний!</string> <string name="arrow_size_updated">Розмір стрілок оновлено!</string> + <string name="suggestion_font_size_description">Enter a font size for suggestions:</string> + <string name="invalid_suggestion_font_size">Invalid font size!</string> + <string name="suggestion_font_size_updated">Font size updated!</string> <string name="portrait">Портрет</string> <string name="landscape">Пейзаж</string> <string name="system">Система</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 692a0d50..5fcde430 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ <string name="change_news_website">Change News Website</string> <string name="terminal_font_size">Terminal Font Size</string> <string name="arrow_keys_size">Arrow Keys Size</string> + <string name="suggestion_font_size">"Suggestion Font Size"</string> <string name="orientation">Terminal Orientation</string> <string name="app_suggestions_order">App Suggestions Order</string> <string name="terminal_font">Terminal Font</string> @@ -45,6 +46,9 @@ <string name="arrow_size_description">Enter a size for the terminal Arrow Keys:</string> <string name="invalid_arrow_size">Invalid Arrow size!</string> <string name="arrow_size_updated">Arrow size updated!</string> + <string name="suggestion_font_size_description">Enter a font size for suggestions:</string> + <string name="invalid_suggestion_font_size">Invalid font size!</string> + <string name="suggestion_font_size_updated">Font size updated!</string> <string name="portrait">Portrait</string> <string name="landscape">Landscape</string> <string name="system">System</string>