jonas/EasyLauncher
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 6 Wiki Activity

Refactor: Re-Enabled 3 fonts that was not working.

Browse Source
This commit is contained in:
HeCodes2Much
2024-12-04 13:16:06 +00:00
parent 2d49a8b70a
commit 8ae80d36d6
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/droidworksstudio/launcher/adapter/font/FontAdapter.kt
View File

@@ -14,7 +14,7 @@ import com.github.droidworksstudio.launcher.utils.Constants
class FontAdapter( class FontAdapter(
context: Context, context: Context,
private val items: Array<Constants.Fonts>, private val items: Array<Constants.Fonts>,
private val itemStrings: Array<String> private val itemStrings: Array<String>,
) : ArrayAdapter<String>(context, android.R.layout.simple_list_item_1, itemStrings) { ) : ArrayAdapter<String>(context, android.R.layout.simple_list_item_1, itemStrings) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
@@ -35,13 +35,13 @@ class FontAdapter(
Constants.Fonts.Bitter -> ResourcesCompat.getFont(context, R.font.bitter) Constants.Fonts.Bitter -> ResourcesCompat.getFont(context, R.font.bitter)
Constants.Fonts.Dotness -> ResourcesCompat.getFont(context, R.font.dotness) Constants.Fonts.Dotness -> ResourcesCompat.getFont(context, R.font.dotness)
Constants.Fonts.DroidSans -> ResourcesCompat.getFont(context, R.font.open_sans) Constants.Fonts.DroidSans -> ResourcesCompat.getFont(context, R.font.open_sans)
// Constants.Fonts.GreatVibes -> ResourcesCompat.getFont(context, R.font.great_vibes) Constants.Fonts.GreatVibes -> ResourcesCompat.getFont(context, R.font.great_vibes)
Constants.Fonts.Lato -> ResourcesCompat.getFont(context, R.font.lato) Constants.Fonts.Lato -> ResourcesCompat.getFont(context, R.font.lato)
// Constants.Fonts.Lobster -> ResourcesCompat.getFont(context, R.font.lobster) Constants.Fonts.Lobster -> ResourcesCompat.getFont(context, R.font.lobster)
Constants.Fonts.Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather) Constants.Fonts.Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather)
Constants.Fonts.Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat) Constants.Fonts.Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat)
Constants.Fonts.OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans) Constants.Fonts.OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans)
// Constants.Fonts.Pacifico -> ResourcesCompat.getFont(context, R.font.pacifico) Constants.Fonts.Pacifico -> ResourcesCompat.getFont(context, R.font.pacifico)
Constants.Fonts.Quicksand -> ResourcesCompat.getFont(context, R.font.quicksand) Constants.Fonts.Quicksand -> ResourcesCompat.getFont(context, R.font.quicksand)
Constants.Fonts.Raleway -> ResourcesCompat.getFont(context, R.font.raleway) Constants.Fonts.Raleway -> ResourcesCompat.getFont(context, R.font.raleway)
Constants.Fonts.Roboto -> ResourcesCompat.getFont(context, R.font.roboto) Constants.Fonts.Roboto -> ResourcesCompat.getFont(context, R.font.roboto)

8
app/src/main/java/com/github/droidworksstudio/launcher/helper/AppReloader.kt
View File

@@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import kotlin.system.exitProcess
object AppReloader { object AppReloader {
fun restartApp(context: Context) { fun restartApp(context: Context) {
@@ -11,12 +12,13 @@ object AppReloader {
val intent = packageManager.getLaunchIntentForPackage(context.packageName) val intent = packageManager.getLaunchIntentForPackage(context.packageName)
val componentName = intent?.component val componentName = intent?.component
val mainIntent = Intent.makeRestartActivityTask(componentName) val mainIntent = Intent.makeRestartActivityTask(componentName)
mainIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
mainIntent.flags += Intent.FLAG_ACTIVITY_NEW_TASK
// Delay the restart slightly to ensure all current activities are finished // Schedule the restart
Handler(Looper.getMainLooper()).postDelayed({ Handler(Looper.getMainLooper()).postDelayed({
context.startActivity(mainIntent) context.startActivity(mainIntent)
// Kill the app process
android.os.Process.killProcess(android.os.Process.myPid())
exitProcess(0)
}, 250) }, 250)
} }
} }

6
app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsLookFeelFragment.kt
View File

@@ -4,8 +4,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@@ -247,9 +245,7 @@ class SettingsLookFeelFragment : Fragment(),
appHelper.triggerHapticFeedback(context, feedbackType) appHelper.triggerHapticFeedback(context, feedbackType)
// Delay the restart slightly to ensure preferences are saved // Delay the restart slightly to ensure preferences are saved
Handler(Looper.getMainLooper()).postDelayed({ AppReloader.restartApp(context)
AppReloader.restartApp(context)
}, 500) // Delay in milliseconds (e.g., 500ms)
} }
// Assign the created dialog to launcherFontDialog // Assign the created dialog to launcherFontDialog

9
app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt
View File

@@ -229,10 +229,13 @@ object Constants {
Bitter, Bitter,
Dotness, Dotness,
DroidSans, DroidSans,
GreatVibes,
Lato, Lato,
Lobster,
Merriweather, Merriweather,
Montserrat, Montserrat,
OpenSans, OpenSans,
Pacifico,
Quicksand, Quicksand,
Raleway, Raleway,
Roboto, Roboto,
@@ -244,10 +247,13 @@ object Constants {
Bitter -> ResourcesCompat.getFont(context, R.font.bitter) Bitter -> ResourcesCompat.getFont(context, R.font.bitter)
Dotness -> ResourcesCompat.getFont(context, R.font.dotness) Dotness -> ResourcesCompat.getFont(context, R.font.dotness)
DroidSans -> ResourcesCompat.getFont(context, R.font.open_sans) DroidSans -> ResourcesCompat.getFont(context, R.font.open_sans)
GreatVibes -> ResourcesCompat.getFont(context, R.font.great_vibes)
Lato -> ResourcesCompat.getFont(context, R.font.lato) Lato -> ResourcesCompat.getFont(context, R.font.lato)
Lobster -> ResourcesCompat.getFont(context, R.font.lobster)
Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather) Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather)
Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat) Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat)
OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans) OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans)
Pacifico -> ResourcesCompat.getFont(context, R.font.pacifico)
Quicksand -> ResourcesCompat.getFont(context, R.font.quicksand) Quicksand -> ResourcesCompat.getFont(context, R.font.quicksand)
Raleway -> ResourcesCompat.getFont(context, R.font.raleway) Raleway -> ResourcesCompat.getFont(context, R.font.raleway)
Roboto -> ResourcesCompat.getFont(context, R.font.roboto) Roboto -> ResourcesCompat.getFont(context, R.font.roboto)
@@ -261,10 +267,13 @@ object Constants {
Bitter -> context.getString(R.string.settings_font_bitter) Bitter -> context.getString(R.string.settings_font_bitter)
Dotness -> context.getString(R.string.settings_font_dotness) Dotness -> context.getString(R.string.settings_font_dotness)
DroidSans -> context.getString(R.string.settings_font_droidsans) DroidSans -> context.getString(R.string.settings_font_droidsans)
GreatVibes -> context.getString(R.string.settings_font_great_vibes)
Lato -> context.getString(R.string.settings_font_lato) Lato -> context.getString(R.string.settings_font_lato)
Lobster -> context.getString(R.string.settings_font_lobster)
Merriweather -> context.getString(R.string.settings_font_merriweather) Merriweather -> context.getString(R.string.settings_font_merriweather)
Montserrat -> context.getString(R.string.settings_font_montserrat) Montserrat -> context.getString(R.string.settings_font_montserrat)
OpenSans -> context.getString(R.string.settings_font_opensans) OpenSans -> context.getString(R.string.settings_font_opensans)
Pacifico -> context.getString(R.string.settings_font_pacifico)
Quicksand -> context.getString(R.string.settings_font_quicksand) Quicksand -> context.getString(R.string.settings_font_quicksand)
Raleway -> context.getString(R.string.settings_font_raleway) Raleway -> context.getString(R.string.settings_font_raleway)
Roboto -> context.getString(R.string.settings_font_roboto) Roboto -> context.getString(R.string.settings_font_roboto)

2
app/src/main/res/values/nontranslatable.xml
View File

@@ -31,7 +31,7 @@
<string name="settings_font_bitter" translatable="false">Bitter</string> <string name="settings_font_bitter" translatable="false">Bitter</string>
<string name="settings_font_dotness" translatable="false">Dotness</string> <string name="settings_font_dotness" translatable="false">Dotness</string>
<string name="settings_font_droidsans" translatable="false">Droid Sans</string> <string name="settings_font_droidsans" translatable="false">Droid Sans</string>
<string name="settings_font_greatvibes" translatable="false">Great Vibes</string> <string name="settings_font_great_vibes" translatable="false">Great Vibes</string>
<string name="settings_font_lato" translatable="false">Lato</string> <string name="settings_font_lato" translatable="false">Lato</string>
<string name="settings_font_lobster" translatable="false">Lobster</string> <string name="settings_font_lobster" translatable="false">Lobster</string>
<string name="settings_font_merriweather" translatable="false">Merriweather</string> <string name="settings_font_merriweather" translatable="false">Merriweather</string>