diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/adapter/font/FontAdapter.kt b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/font/FontAdapter.kt index b315610..37204a7 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/adapter/font/FontAdapter.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/font/FontAdapter.kt @@ -32,15 +32,18 @@ class FontAdapter( private fun getCustomTypefaceForItem(context: Context, item: Constants.Fonts): Typeface? { return when (item) { - Constants.Fonts.Roboto -> ResourcesCompat.getFont(context, R.font.roboto) - Constants.Fonts.OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans) + Constants.Fonts.Bitter -> ResourcesCompat.getFont(context, R.font.bitter) + Constants.Fonts.DroidSans -> ResourcesCompat.getFont(context, R.font.open_sans) Constants.Fonts.Lato -> ResourcesCompat.getFont(context, R.font.lato) + Constants.Fonts.Lobster -> ResourcesCompat.getFont(context, R.font.lobster) + Constants.Fonts.Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather) Constants.Fonts.Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat) - Constants.Fonts.Merriweather -> ResourcesCompat.getFont(context, R.font.montserrat) - Constants.Fonts.DroidSans -> ResourcesCompat.getFont(context, R.font.droid_sans) - Constants.Fonts.Raleway -> ResourcesCompat.getFont(context, R.font.open_sans) - Constants.Fonts.SourceCodePro -> 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.Quicksand -> ResourcesCompat.getFont(context, R.font.quicksand) + Constants.Fonts.Raleway -> ResourcesCompat.getFont(context, R.font.raleway) + Constants.Fonts.Roboto -> ResourcesCompat.getFont(context, R.font.roboto) + Constants.Fonts.SourceCodePro -> ResourcesCompat.getFont(context, R.font.source_code_pro) // Add other fonts as needed else -> Typeface.DEFAULT } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt b/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt index 042c53c..e71da68 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt @@ -165,43 +165,52 @@ object Constants { enum class Fonts { System, - Roboto, - OpenSans, - Lato, - Montserrat, - Merriweather, + Bitter, DroidSans, + Lato, + Lobster, + Merriweather, + Montserrat, + OpenSans, + Pacifico, + Quicksand, Raleway, - SourceCodePro, - Quicksand; + Roboto, + SourceCodePro; fun getFont(context: Context): Typeface? { return when (this) { System -> Typeface.DEFAULT - Roboto -> ResourcesCompat.getFont(context, R.font.roboto) - OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans) - Lato -> ResourcesCompat.getFont(context, R.font.lato) - Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat) - Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather) + Bitter -> ResourcesCompat.getFont(context, R.font.bitter) DroidSans -> ResourcesCompat.getFont(context, R.font.open_sans) - Raleway -> ResourcesCompat.getFont(context, R.font.raleway) - SourceCodePro -> ResourcesCompat.getFont(context, R.font.source_code_pro) + Lato -> ResourcesCompat.getFont(context, R.font.lato) + Lobster -> ResourcesCompat.getFont(context, R.font.lobster) + Merriweather -> ResourcesCompat.getFont(context, R.font.merriweather) + Montserrat -> ResourcesCompat.getFont(context, R.font.montserrat) + OpenSans -> ResourcesCompat.getFont(context, R.font.open_sans) + Pacifico -> ResourcesCompat.getFont(context, R.font.pacifico) Quicksand -> ResourcesCompat.getFont(context, R.font.quicksand) + Raleway -> ResourcesCompat.getFont(context, R.font.raleway) + Roboto -> ResourcesCompat.getFont(context, R.font.roboto) + SourceCodePro -> ResourcesCompat.getFont(context, R.font.source_code_pro) } } fun getString(context: Context): String { return when (this) { System -> context.getString(R.string.settings_font_system) - Roboto -> context.getString(R.string.settings_font_roboto) - OpenSans -> context.getString(R.string.settings_font_opensans) - Lato -> context.getString(R.string.settings_font_lato) - Montserrat -> context.getString(R.string.settings_font_montserrat) - Merriweather -> context.getString(R.string.settings_font_merriweather) + Bitter -> context.getString(R.string.settings_font_bitter) DroidSans -> context.getString(R.string.settings_font_droidsans) - Raleway -> context.getString(R.string.settings_font_raleway) - SourceCodePro -> context.getString(R.string.settings_font_sourcecodepro) + Lato -> context.getString(R.string.settings_font_lato) + Lobster -> context.getString(R.string.settings_font_lobster) + Merriweather -> context.getString(R.string.settings_font_merriweather) + Montserrat -> context.getString(R.string.settings_font_montserrat) + OpenSans -> context.getString(R.string.settings_font_opensans) + Pacifico -> context.getString(R.string.settings_font_pacifico) Quicksand -> context.getString(R.string.settings_font_quicksand) + Raleway -> context.getString(R.string.settings_font_raleway) + Roboto -> context.getString(R.string.settings_font_roboto) + SourceCodePro -> context.getString(R.string.settings_font_sourcecodepro) } } } diff --git a/app/src/main/res/font/bitter.ttf b/app/src/main/res/font/bitter.ttf new file mode 100644 index 0000000..5fff3af Binary files /dev/null and b/app/src/main/res/font/bitter.ttf differ diff --git a/app/src/main/res/font/lobster.ttf b/app/src/main/res/font/lobster.ttf new file mode 100644 index 0000000..21c0073 Binary files /dev/null and b/app/src/main/res/font/lobster.ttf differ diff --git a/app/src/main/res/font/merriweather.ttf b/app/src/main/res/font/merriweather.ttf index 3e10e02..3fecc77 100644 Binary files a/app/src/main/res/font/merriweather.ttf and b/app/src/main/res/font/merriweather.ttf differ diff --git a/app/src/main/res/font/pacifico.ttf b/app/src/main/res/font/pacifico.ttf new file mode 100644 index 0000000..e7def95 Binary files /dev/null and b/app/src/main/res/font/pacifico.ttf differ diff --git a/app/src/main/res/values/nontranslatable.xml b/app/src/main/res/values/nontranslatable.xml index 942bbe9..5a71460 100644 --- a/app/src/main/res/values/nontranslatable.xml +++ b/app/src/main/res/values/nontranslatable.xml @@ -25,13 +25,16 @@ droidworksstudio@063240.xyz - Roboto - Open Sans - Lato - Montserrat - Merriweather + Bitter Droid Sans - Raleway - Source Code Pro + Lato + Lobster + Merriweather + Montserrat + Open Sans + Pacifico Quicksand + Raleway + Roboto + Source Code Pro \ No newline at end of file