Skip to content

Commit 9cde31c

Browse files
HeadGlitchSoftwareHeadGlitchSoftware
committed
Added "Suggestion Font Size" setting
1 parent 87d362e commit 9cde31c

File tree

10 files changed

+76
-2
lines changed

10 files changed

+76
-2
lines changed

‎.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/coderGtm/yantra/activities/SettingsActivity.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import com.coderGtm.yantra.misc.openLauncherSelection
4545
import com.coderGtm.yantra.misc.openNewsWebsiteSetter
4646
import com.coderGtm.yantra.misc.openOrientationSetter
4747
import com.coderGtm.yantra.misc.openPrimarySuggestionsOrderSetter
48+
import com.coderGtm.yantra.misc.openSuggestionFontSizeSetter
4849
import com.coderGtm.yantra.misc.openSwipeLeftActionSetter
4950
import com.coderGtm.yantra.misc.openSwipeRightActionSetter
5051
import com.coderGtm.yantra.misc.openSysinfoArtSetter
@@ -82,6 +83,7 @@ class SettingsActivity : AppCompatActivity() {
8283
private var initCmdLog = false
8384
private var fontSize = 16
8485
private var arrowSize = 65
86+
private var suggestionFontSize = 18
8587
private var orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
8688
private var appSugOrderingMode = AppSortMode.A_TO_Z.value
8789
private var fontName = "Source Code Pro"
@@ -155,6 +157,7 @@ class SettingsActivity : AppCompatActivity() {
155157
initCmdLog = preferenceObject.getBoolean("initCmdLog", false)
156158
fontSize = preferenceObject.getInt("fontSize",16)
157159
arrowSize = preferenceObject.getInt("arrowSize", 65)
160+
suggestionFontSize = preferenceObject.getInt("suggestionFontSize",18)
158161
orientation = preferenceObject.getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
159162
appSugOrderingMode = preferenceObject.getInt("appSortMode", AppSortMode.A_TO_Z.value)
160163
fontName = if (isPro(this@SettingsActivity)) {
@@ -170,6 +173,7 @@ class SettingsActivity : AppCompatActivity() {
170173
binding.usernamePrefix.text = getUserNamePrefix(preferenceObject)
171174
binding.fontSizeBtn.text = fontSize.toString()
172175
binding.arrowSizeBtn.text = arrowSize.toString()
176+
binding.suggestionFontSizeBtn.text = suggestionFontSize.toString()
173177
setOrientationTvText(this@SettingsActivity, binding, orientation)
174178
setAppSugOrderTvText(this@SettingsActivity, binding, appSugOrderingMode)
175179
binding.tvFontName.text = fontName
@@ -182,6 +186,7 @@ class SettingsActivity : AppCompatActivity() {
182186
binding.newsWebsiteLayout.setOnClickListener { openNewsWebsiteSetter(this@SettingsActivity, preferenceObject, preferenceEditObject) }
183187
binding.fontSizeBtn.setOnClickListener { openFontSizeSetter(this@SettingsActivity, binding, preferenceObject, preferenceEditObject) }
184188
binding.arrowSizeBtn.setOnClickListener { openArrowSizeSetter(this@SettingsActivity, binding, preferenceObject, preferenceEditObject) }
189+
binding.suggestionFontSizeBtn.setOnClickListener { openSuggestionFontSizeSetter(this@SettingsActivity, binding, preferenceObject, preferenceEditObject) }
185190
binding.orientationLay.setOnClickListener { openOrientationSetter(this@SettingsActivity, binding, preferenceEditObject) }
186191
binding.appSugOrderingLay.setOnClickListener { openAppSugOrderingSetter(this@SettingsActivity, binding, preferenceEditObject) }
187192
binding.sysinfoArtLayout.setOnClickListener { openSysinfoArtSetter(this@SettingsActivity, preferenceObject, preferenceEditObject) }

‎app/src/main/java/com/coderGtm/yantra/misc/SettingsHelper.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,28 @@ fun openArrowSizeSetter(activity: Activity, binding: ActivitySettingsBinding, pr
293293
)
294294
}
295295

296+
fun openSuggestionFontSizeSetter(activity: Activity, binding: ActivitySettingsBinding, preferenceObject: SharedPreferences, preferenceEditObject: SharedPreferences.Editor) {
297+
val fontSizeDialog = YantraLauncherDialog(activity)
298+
fontSizeDialog.takeInput(
299+
title = activity.getString(R.string.suggestion_font_size),
300+
message = activity.getString(R.string.suggestion_font_size_description),
301+
initialInput = preferenceObject.getInt("suggestionFontSize",18).toString(),
302+
inputType = InputType.TYPE_CLASS_NUMBER,
303+
positiveButton = activity.getString(R.string.save),
304+
positiveAction = {
305+
val size = it
306+
if (size.toIntOrNull() == null || size.toInt() <= 0 ) {
307+
toast(activity, activity.getString(R.string.invalid_suggestion_font_size))
308+
return@takeInput
309+
}
310+
preferenceEditObject.putInt("suggestionFontSize",size.toInt()).apply()
311+
binding.suggestionFontSizeBtn.text = size
312+
toast(activity, activity.getString(R.string.suggestion_font_size_updated))
313+
changedSettingsCallback(activity)
314+
},
315+
)
316+
}
317+
296318
fun openOrientationSetter(activity: Activity, binding: ActivitySettingsBinding, preferenceEditObject: SharedPreferences.Editor) {
297319
YantraLauncherDialog(activity).selectItem(
298320
title = activity.getString(R.string.orientation),

‎app/src/main/java/com/coderGtm/yantra/terminal/Helper.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ fun showSuggestions(
3232
rawInput: String,
3333
getPrimarySuggestions: Boolean,
3434
getSecondarySuggestions: Boolean,
35-
terminal: Terminal
35+
terminal: Terminal,
3636
) {
3737
Thread {
3838
terminal.activity.runOnUiThread {
3939
terminal.binding.suggestionsTab.removeAllViews()
4040
}
41+
val fontSize = terminal.preferenceObject.getInt("suggestionFontSize", 18).toFloat()
4142
val input = rawInput.trim()
4243
val suggestions = ArrayList<String>()
4344
val args = input.split(" ")
@@ -584,7 +585,7 @@ fun showSuggestions(
584585
suggestion.setTextColor(terminal.theme.suggestionTextColor)
585586
suggestion.setTypeface(terminal.typeface, Typeface.BOLD)
586587
suggestion.setBackgroundColor(Color.TRANSPARENT)
587-
suggestion.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14.5F)
588+
suggestion.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize)
588589
suggestion.setPadding(40, 30, 40, 30)
589590

590591

‎app/src/main/res/layout/activity_settings.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,31 @@
471471
android:layout_height="1dp"
472472
android:background="?android:attr/listDivider" />
473473

474+
<View
475+
android:layout_width="match_parent"
476+
android:layout_height="1dp"
477+
android:background="?android:attr/listDivider" />
478+
479+
<LinearLayout
480+
android:layout_width="match_parent"
481+
android:layout_height="match_parent"
482+
android:paddingVertical="8dp"
483+
android:orientation="horizontal">
484+
485+
<TextView
486+
android:layout_width="0dp"
487+
android:layout_height="wrap_content"
488+
android:layout_weight="1"
489+
android:textSize="20sp"
490+
android:text="@string/suggestion_font_size" />
491+
492+
<Button
493+
android:id="@+id/suggestionFontSizeBtn"
494+
android:layout_width="wrap_content"
495+
android:layout_height="wrap_content"
496+
android:text="18" />
497+
</LinearLayout>
498+
474499
<LinearLayout
475500
android:id="@+id/orientationLay"
476501
android:layout_width="match_parent"

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<string name="change_news_website">Cambiar sitio web de noticias</string>
1919
<string name="terminal_font_size">Tamaño de fuente de la terminal</string>
2020
<string name="arrow_keys_size">Tamaño de las teclas de flechas</string>
21+
<string name="suggestion_font_size">"Tamaño de fuente de sugerencia"</string>
2122
<string name="orientation">Orientación de la terminal</string>
2223
<string name="app_suggestions_order">Orden de sugerencias de aplicaciones</string>
2324
<string name="terminal_font">Fuente de la terminal </string>
@@ -45,6 +46,9 @@
4546
<string name="arrow_size_description">Ingresa un tamaño para las Teclas de Flechas de la terminal:</string>
4647
<string name="invalid_arrow_size">¡Tamaño de flechas invalido!</string>
4748
<string name="arrow_size_updated">¡Tamaño de la flecha actualizado!</string>
49+
<string name="suggestion_font_size_description">Enter a font size for suggestions:</string>
50+
<string name="invalid_suggestion_font_size">Invalid font size!</string>
51+
<string name="suggestion_font_size_updated">Font size updated!</string>
4852
<string name="portrait">Vertical</string>
4953
<string name="landscape">Horizontal</string>
5054
<string name="system">Sistema</string>

‎app/src/main/res/values-it/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<string name="change_left_swipe_command">Modifica il Comando di Swipe a Sinistra</string>
1818
<string name="change_news_website">Modifica il Sito Web delle Notizie</string>
1919
<string name="terminal_font_size">Dimensione del Font del Terminale</string>
20+
<string name="suggestion_font_size">"Dimensione carattere suggerimento"</string>
2021
<string name="arrow_keys_size">Dimensione dei Tasti Freccia</string>
2122
<string name="orientation">Orientamento</string>
2223
<string name="app_suggestions_order">Ordine delle App Suggerite</string>
@@ -45,6 +46,9 @@
4546
<string name="arrow_size_description">Inserisci una dimensione per i Tasti Freccia del terminale:</string>
4647
<string name="invalid_arrow_size">Dimensione Tasti Freccia non valida!</string>
4748
<string name="arrow_size_updated">Dimensione Tasti Freccia aggiornata!</string>
49+
<string name="suggestion_font_size_description">Enter a font size for suggestions:</string>
50+
<string name="invalid_suggestion_font_size">Invalid font size!</string>
51+
<string name="suggestion_font_size_updated">Font size updated!</string>
4852
<string name="portrait">Verticale</string>
4953
<string name="landscape">Orizzontale</string>
5054
<string name="system">Sistema</string>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<string name="change_news_website">Изменить новостной сайт</string>
1919
<string name="terminal_font_size">Размер шрифта в терминале</string>
2020
<string name="arrow_keys_size">Размер стрелок</string>
21+
<string name="suggestion_font_size">"Рекомендуемый размер шрифта"</string>
2122
<string name="orientation">Ориентация терминала</string>
2223
<string name="app_suggestions_order">Порядок предложений приложений</string>
2324
<string name="terminal_font">Шрифт терминала</string>
@@ -45,6 +46,9 @@
4546
<string name="arrow_size_description">Введите размер стрелок в терминале:</string>
4647
<string name="invalid_arrow_size">Задан неправильный размер стрелок!</string>
4748
<string name="arrow_size_updated">Размер стрелок обновлён!</string>
49+
<string name="suggestion_font_size_description">Enter a font size for suggestions:</string>
50+
<string name="invalid_suggestion_font_size">Invalid font size!</string>
51+
<string name="suggestion_font_size_updated">Font size updated!</string>
4852
<string name="portrait">Вертикальная</string>
4953
<string name="landscape">Горизонтальная</string>
5054
<string name="system">Системная</string>

‎app/src/main/res/values-uk/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<string name="change_news_website">Змінити сайт новин</string>
1919
<string name="terminal_font_size">Розмір шрифту терміналу</string>
2020
<string name="arrow_keys_size">Розмір клавіш зі стрілками</string>
21+
<string name="suggestion_font_size">"Розмір шрифту пропозиції"</string>
2122
<string name="orientation">Орієнтація терміналу</string>
2223
<string name="app_suggestions_order">Пропозиції порятку додатків</string>
2324
<string name="terminal_font">Шрифт термінлу</string>
@@ -45,6 +46,9 @@
4546
<string name="arrow_size_description">Ввести розмір для клавіш стрілок на терміналі:</string>
4647
<string name="invalid_arrow_size">Розмір стрілок недійсний!</string>
4748
<string name="arrow_size_updated">Розмір стрілок оновлено!</string>
49+
<string name="suggestion_font_size_description">Enter a font size for suggestions:</string>
50+
<string name="invalid_suggestion_font_size">Invalid font size!</string>
51+
<string name="suggestion_font_size_updated">Font size updated!</string>
4852
<string name="portrait">Портрет</string>
4953
<string name="landscape">Пейзаж</string>
5054
<string name="system">Система</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<string name="change_news_website">Change News Website</string>
1919
<string name="terminal_font_size">Terminal Font Size</string>
2020
<string name="arrow_keys_size">Arrow Keys Size</string>
21+
<string name="suggestion_font_size">"Suggestion Font Size"</string>
2122
<string name="orientation">Terminal Orientation</string>
2223
<string name="app_suggestions_order">App Suggestions Order</string>
2324
<string name="terminal_font">Terminal Font</string>
@@ -45,6 +46,9 @@
4546
<string name="arrow_size_description">Enter a size for the terminal Arrow Keys:</string>
4647
<string name="invalid_arrow_size">Invalid Arrow size!</string>
4748
<string name="arrow_size_updated">Arrow size updated!</string>
49+
<string name="suggestion_font_size_description">Enter a font size for suggestions:</string>
50+
<string name="invalid_suggestion_font_size">Invalid font size!</string>
51+
<string name="suggestion_font_size_updated">Font size updated!</string>
4852
<string name="portrait">Portrait</string>
4953
<string name="landscape">Landscape</string>
5054
<string name="system">System</string>

0 commit comments

Comments
 (0)