shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Setting Manrope as default font. (#379)

Browse Source 
Revert "store default if user didnt touch Font settings"

This reverts commit 9c5f9731

store default if user didnt touch Font settings

Setting translatable to false

Last changes.

Defaulting to Manrope in strings.xml

Default to Manrope in settings.

Changes in default value.

Automatic formatting.

Merge remote-tracking branch 'remotes/main/master' into manrope

# Conflicts:
#	app/src/main/java/org/mian/gitnex/activities/BaseActivity.java

Manrope just literally as default font.

Reformatting code.

Making optimizations.

Moving initialization to BaseActivity

Merge remote-tracking branch 'remotes/main/master' into manrope

Setting Manrope as default font.

Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/379
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
This commit is contained in:
opyale
2020-04-12 15:19:33 +00:00
committed by M M Arif
parent 145043a515
commit df2bc91e9f
28 changed files with 141 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/layout_settings_appearance.xml
View File

@ -73,7 +73,7 @@
android:textSize="14sp"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:text="@string/defaultCopy"
android:text="@string/settingsCustomFontDefault"
android:textColor="?attr/selectedTextColor"/>
</LinearLayout>

2
app/src/main/res/values-ar/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
<string name="settingsCustomFontHeaderText">الخط</string>
<string name="settingsCustomFontSelectorDialogTitle">اختر الخط</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">اختر سمة التطبيق</string>
<string name="themeSelectionHeaderText">الحُلّة</string>
<string name="settingsPdfModeHeaderText">الوضع الليلي لـ PDF</string>

2
app/src/main/res/values-de/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Home Screen Auswählen</string>
<string name="settingsCustomFontHeaderText">Schriftart</string>
<string name="settingsCustomFontSelectorDialogTitle">Wähle eine Schriftart</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">App-Design auswählen</string>
<string name="themeSelectionHeaderText">Design</string>
<string name="settingsPdfModeHeaderText">PDF Nachtmodus</string>

2
app/src/main/res/values-es/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-fa/strings.xml
View File

@ -209,7 +209,7 @@
<string name="settingshomeScreenSelectorDialogTitle">صفحه خانگی را انتخاب کنید</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-fi/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-fr/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Écran d’accueil</string>
<string name="settingsCustomFontHeaderText">Police</string>
<string name="settingsCustomFontSelectorDialogTitle">Choisir la police</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Sélectionnez le thème de l’application</string>
<string name="themeSelectionHeaderText">Thème</string>
<string name="settingsPdfModeHeaderText">PDF mode nuit</string>

2
app/src/main/res/values-it/strings.xml
View File

@ -207,7 +207,7 @@ URL è richiesto</string>
<string name="settingshomeScreenSelectorDialogTitle">Seleziona schermata Home</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Scegli un Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-lv/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-pl/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Wybierz ekran główny</string>
<string name="settingsCustomFontHeaderText">Czcionka</string>
<string name="settingsCustomFontSelectorDialogTitle">Wybierz czcionkę</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Wybierz motyw aplikacji</string>
<string name="themeSelectionHeaderText">Motyw</string>
<string name="settingsPdfModeHeaderText">Tryb nocny PDF</string>

2
app/src/main/res/values-pt/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Selecionar Tela Inicial</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-ru/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Выбрать главный экран</string>
<string name="settingsCustomFontHeaderText">Шрифт</string>
<string name="settingsCustomFontSelectorDialogTitle">Выберите шрифт</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Выбрать тему приложения</string>
<string name="themeSelectionHeaderText">Тема</string>
<string name="settingsPdfModeHeaderText">Ночной режим PDF</string>

2
app/src/main/res/values-sr/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Одабери почетни екран</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-tr/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Ana Ekranı Seç</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-uk/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Оберіть основний екран</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

2
app/src/main/res/values-zh/strings.xml
View File

@ -206,7 +206,7 @@
<string name="settingshomeScreenSelectorDialogTitle">选择主屏幕</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="settingsPdfModeHeaderText">PDF Night Mode</string>

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

@ -272,7 +272,7 @@
<string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
<string name="settingsCustomFontHeaderText">Font</string>
<string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
<string name="settingsCustomFontDefault">Roboto</string>
<string name="settingsCustomFontDefault" translatable="false">Manrope</string>
<string name="themeSelectorDialogTitle">Select App Theme</string>
<string name="themeSelectionHeaderText">Theme</string>
<string name="themeSelectionSelectedText" translatable="false">Dark</string>