diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2020-06-10 04:22:19 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2020-06-10 04:22:19 +0000 |
| commit | 4cd07e3bb61d848590a953a37c8501962e2c0bd8 (patch) | |
| tree | cf4878e6ccea7a7f58d117fef57233a5cd48c6c8 | |
| parent | 9a47a3d9d20c061e38161293498622e3a6aaf8b5 (diff) | |
| download | infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.tar infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.tar.gz infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.tar.bz2 infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.tar.lz infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.tar.xz infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.tar.zst infinity-for-reddit-4cd07e3bb61d848590a953a37c8501962e2c0bd8.zip | |
Prepare to add different font support.
122 files changed, 735 insertions, 179 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java index 1eb8aa0a..883d0ce8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java @@ -27,11 +27,14 @@ import com.google.android.material.tabs.TabLayout; import ml.docilealligator.infinityforreddit.ActivityToolbarInterface; import ml.docilealligator.infinityforreddit.AppBarStateChangeListener; -import ml.docilealligator.infinityforreddit.ContentFontStyle; import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeWrapper; -import ml.docilealligator.infinityforreddit.FontStyle; +import ml.docilealligator.infinityforreddit.Font.ContentFontFamily; +import ml.docilealligator.infinityforreddit.Font.ContentFontStyle; +import ml.docilealligator.infinityforreddit.Font.FontFamily; +import ml.docilealligator.infinityforreddit.Font.FontStyle; +import ml.docilealligator.infinityforreddit.Font.TitleFontFamily; +import ml.docilealligator.infinityforreddit.Font.TitleFontStyle; import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.TitleFontStyle; import ml.docilealligator.infinityforreddit.Utils.CustomThemeSharedPreferencesUtils; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; @@ -113,6 +116,15 @@ public abstract class BaseActivity extends AppCompatActivity { getTheme().applyStyle(ContentFontStyle.valueOf(mSharedPreferences .getString(SharedPreferencesUtils.CONTENT_FONT_SIZE_KEY, ContentFontStyle.Normal.name())).getResId(), true); + getTheme().applyStyle(FontFamily.valueOf(mSharedPreferences + .getString(SharedPreferencesUtils.FONT_FAMILY_KEY, FontFamily.Default.name())).getResId(), true); + + getTheme().applyStyle(TitleFontFamily.valueOf(mSharedPreferences + .getString(SharedPreferencesUtils.TITLE_FONT_FAMILY_KEY, TitleFontFamily.Default.name())).getResId(), true); + + getTheme().applyStyle(ContentFontFamily.valueOf(mSharedPreferences + .getString(SharedPreferencesUtils.CONTENT_FONT_FAMILY_KEY, ContentFontFamily.Default.name())).getResId(), true); + Window window = getWindow(); View decorView = window.getDecorView(); if (!hasDrawerLayout) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ThemePreviewActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ThemePreviewActivity.java index c9a08f48..015f0a37 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ThemePreviewActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ThemePreviewActivity.java @@ -41,15 +41,15 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; import ml.docilealligator.infinityforreddit.AppBarStateChangeListener; -import ml.docilealligator.infinityforreddit.ContentFontStyle; +import ml.docilealligator.infinityforreddit.Font.ContentFontStyle; import ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme; import ml.docilealligator.infinityforreddit.CustomTheme.CustomThemeSettingsItem; -import ml.docilealligator.infinityforreddit.FontStyle; +import ml.docilealligator.infinityforreddit.Font.FontStyle; import ml.docilealligator.infinityforreddit.Fragment.ThemePreviewCommentsFragment; import ml.docilealligator.infinityforreddit.Fragment.ThemePreviewPostsFragment; import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.TitleFontStyle; +import ml.docilealligator.infinityforreddit.Font.TitleFontStyle; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewGIFActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewGIFActivity.java index 8bdc82fe..59521940 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewGIFActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewGIFActivity.java @@ -47,11 +47,11 @@ import butterknife.BindView; import butterknife.ButterKnife; import ml.docilealligator.infinityforreddit.AsyncTask.SaveGIFToFileAsyncTask; import ml.docilealligator.infinityforreddit.BuildConfig; -import ml.docilealligator.infinityforreddit.ContentFontStyle; -import ml.docilealligator.infinityforreddit.FontStyle; +import ml.docilealligator.infinityforreddit.Font.ContentFontStyle; +import ml.docilealligator.infinityforreddit.Font.FontStyle; import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.TitleFontStyle; +import ml.docilealligator.infinityforreddit.Font.TitleFontStyle; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; import pl.droidsonroids.gif.GifImageView; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java index 779d7fe7..6db185e0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java @@ -49,11 +49,11 @@ import butterknife.BindView; import butterknife.ButterKnife; import ml.docilealligator.infinityforreddit.AsyncTask.SaveImageToFileAsyncTask; import ml.docilealligator.infinityforreddit.BuildConfig; -import ml.docilealligator.infinityforreddit.ContentFontStyle; -import ml.docilealligator.infinityforreddit.FontStyle; +import ml.docilealligator.infinityforreddit.Font.ContentFontStyle; +import ml.docilealligator.infinityforreddit.Font.FontStyle; import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.TitleFontStyle; +import ml.docilealligator.infinityforreddit.Font.TitleFontStyle; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; public class ViewImageActivity extends AppCompatActivity { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java index 9e0b95e7..7d776ed6 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java @@ -33,14 +33,14 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; import ml.docilealligator.infinityforreddit.API.ImgurAPI; -import ml.docilealligator.infinityforreddit.ContentFontStyle; -import ml.docilealligator.infinityforreddit.FontStyle; +import ml.docilealligator.infinityforreddit.Font.ContentFontStyle; +import ml.docilealligator.infinityforreddit.Font.FontStyle; import ml.docilealligator.infinityforreddit.Fragment.ViewImgurImageFragment; import ml.docilealligator.infinityforreddit.Fragment.ViewImgurVideoFragment; import ml.docilealligator.infinityforreddit.ImgurMedia; import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.TitleFontStyle; +import ml.docilealligator.infinityforreddit.Font.TitleFontStyle; import ml.docilealligator.infinityforreddit.Utils.APIUtils; import ml.docilealligator.infinityforreddit.Utils.JSONUtils; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java new file mode 100644 index 00000000..1ef28bbe --- /dev/null +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java @@ -0,0 +1,25 @@ +package ml.docilealligator.infinityforreddit.Font; + +import ml.docilealligator.infinityforreddit.R; + +public enum ContentFontFamily { + Default(R.style.ContentFontFamily, "Default"), + BalsamiqSans(R.style.ContentFontFamily_BalsamiqSans, "BalsamiqSans"), + NotoSans(R.style.ContentFontFamily_NotoSans, "NotoSans"); + + private int resId; + private String title; + + ContentFontFamily(int resId, String title) { + this.resId = resId; + this.title = title; + } + + public int getResId() { + return resId; + } + + public String getTitle() { + return title; + } +} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ContentFontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontStyle.java index 4eee6b53..654cff07 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ContentFontStyle.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontStyle.java @@ -1,4 +1,6 @@ -package ml.docilealligator.infinityforreddit; +package ml.docilealligator.infinityforreddit.Font; + +import ml.docilealligator.infinityforreddit.R; public enum ContentFontStyle { Small(R.style.ContentFontStyle_Small, "Small"), diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java new file mode 100644 index 00000000..f33873b2 --- /dev/null +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java @@ -0,0 +1,25 @@ +package ml.docilealligator.infinityforreddit.Font; + +import ml.docilealligator.infinityforreddit.R; + +public enum FontFamily { + Default(R.style.FontFamily, "Default"), + BalsamiqSans(R.style.FontFamily_BalsamiqSans, "BalsamiqSans"), + NotoSans(R.style.FontFamily_NotoSans, "NotoSans"); + + private int resId; + private String title; + + FontFamily(int resId, String title) { + this.resId = resId; + this.title = title; + } + + public int getResId() { + return resId; + } + + public String getTitle() { + return title; + } +} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontStyle.java index 61d4cfb8..101b17b4 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FontStyle.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontStyle.java @@ -1,4 +1,6 @@ -package ml.docilealligator.infinityforreddit; +package ml.docilealligator.infinityforreddit.Font; + +import ml.docilealligator.infinityforreddit.R; public enum FontStyle { Small(R.style.FontStyle_Small, "Small"), diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java new file mode 100644 index 00000000..2b9a73b0 --- /dev/null +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java @@ -0,0 +1,25 @@ +package ml.docilealligator.infinityforreddit.Font; + +import ml.docilealligator.infinityforreddit.R; + +public enum TitleFontFamily { + Default(R.style.TitleFontFamily, "Default"), + BalsamiqSans(R.style.TitleFontFamily_BalsamiqSans, "BalsamiqSans"), + NotoSans(R.style.TitleFontFamily_NotoSans, "NotoSans"); + + private int resId; + private String title; + + TitleFontFamily(int resId, String title) { + this.resId = resId; + this.title = title; + } + + public int getResId() { + return resId; + } + + public String getTitle() { + return title; + } +} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/TitleFontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontStyle.java index 5dc32c9d..9ac48525 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/TitleFontStyle.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontStyle.java @@ -1,4 +1,6 @@ -package ml.docilealligator.infinityforreddit; +package ml.docilealligator.infinityforreddit.Font; + +import ml.docilealligator.infinityforreddit.R; public enum TitleFontStyle { Small(R.style.TitleFontStyle_Small, "Small"), diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java index a51c9e0b..b29ff3ed 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java @@ -29,6 +29,9 @@ public class SharedPreferencesUtils { public static final String FONT_SIZE_KEY = "font_size"; public static final String TITLE_FONT_SIZE_KEY = "title_font_size"; public static final String CONTENT_FONT_SIZE_KEY = "content_font_size"; + public static final String FONT_FAMILY_KEY = "font_family"; + public static final String TITLE_FONT_FAMILY_KEY = "title_font_family"; + public static final String CONTENT_FONT_FAMILY_KEY = "content_font_family"; public static final String AMOLED_DARK_KEY = "amoled_dark"; public static final String IMMERSIVE_INTERFACE_KEY = "immersive_interface"; public static final String IMMERSIVE_INTERFACE_IGNORE_NAV_BAR_KEY = "immersive_interface_ignore_nav_bar"; diff --git a/app/src/main/res/font/balsamiq_sans.xml b/app/src/main/res/font/balsamiq_sans.xml new file mode 100644 index 00000000..01faaeb6 --- /dev/null +++ b/app/src/main/res/font/balsamiq_sans.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<font-family xmlns:app="http://schemas.android.com/apk/res-auto"> + <font + app:fontStyle="normal" + app:fontWeight="400" + app:font="@font/balsamiq_sans_regular" /> + + <font + app:fontStyle="normal" + app:fontWeight="700" + app:font="@font/balsamiq_sans_bold" /> + + <font + app:fontStyle="italic" + app:fontWeight="400" + app:font="@font/balsamiq_sans_italic" /> + + <font + app:fontStyle="italic" + app:fontWeight="700" + app:font="@font/balsamiq_sans_bold_italic" /> +</font-family>
\ No newline at end of file diff --git a/app/src/main/res/font/balsamiq_sans_bold.ttf b/app/src/main/res/font/balsamiq_sans_bold.ttf Binary files differnew file mode 100644 index 00000000..840ff319 --- /dev/null +++ b/app/src/main/res/font/balsamiq_sans_bold.ttf diff --git a/app/src/main/res/font/balsamiq_sans_bold_italic.ttf b/app/src/main/res/font/balsamiq_sans_bold_italic.ttf Binary files differnew file mode 100644 index 00000000..9a8d7567 --- /dev/null +++ b/app/src/main/res/font/balsamiq_sans_bold_italic.ttf diff --git a/app/src/main/res/font/balsamiq_sans_italic.ttf b/app/src/main/res/font/balsamiq_sans_italic.ttf Binary files differnew file mode 100644 index 00000000..6c749d45 --- /dev/null +++ b/app/src/main/res/font/balsamiq_sans_italic.ttf diff --git a/app/src/main/res/font/balsamiq_sans_regular.ttf b/app/src/main/res/font/balsamiq_sans_regular.ttf Binary files differnew file mode 100644 index 00000000..5f3febff --- /dev/null +++ b/app/src/main/res/font/balsamiq_sans_regular.ttf diff --git a/app/src/main/res/font/noto_sans.xml b/app/src/main/res/font/noto_sans.xml new file mode 100644 index 00000000..5fe68106 --- /dev/null +++ b/app/src/main/res/font/noto_sans.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<font-family xmlns:app="http://schemas.android.com/apk/res-auto"> + <font + app:fontStyle="normal" + app:fontWeight="400" + app:font="@font/noto_sans_regular" /> + + <font + app:fontStyle="normal" + app:fontWeight="700" + app:font="@font/noto_sans_bold" /> + + <font + app:fontStyle="italic" + app:fontWeight="400" + app:font="@font/noto_sans_italic" /> + + <font + app:fontStyle="italic" + app:fontWeight="700" + app:font="@font/noto_sans_bold_italic" /> +</font-family>
\ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_bold.ttf b/app/src/main/res/font/noto_sans_bold.ttf Binary files differnew file mode 100644 index 00000000..54ad879b --- /dev/null +++ b/app/src/main/res/font/noto_sans_bold.ttf diff --git a/app/src/main/res/font/noto_sans_bold_italic.ttf b/app/src/main/res/font/noto_sans_bold_italic.ttf Binary files differnew file mode 100644 index 00000000..530a8283 --- /dev/null +++ b/app/src/main/res/font/noto_sans_bold_italic.ttf diff --git a/app/src/main/res/font/noto_sans_italic.ttf b/app/src/main/res/font/noto_sans_italic.ttf Binary files differnew file mode 100644 index 00000000..27ff1ed6 --- /dev/null +++ b/app/src/main/res/font/noto_sans_italic.ttf diff --git a/app/src/main/res/font/noto_sans_regular.ttf b/app/src/main/res/font/noto_sans_regular.ttf Binary files differnew file mode 100644 index 00000000..10589e27 --- /dev/null +++ b/app/src/main/res/font/noto_sans_regular.ttf diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index 33b9cfc3..0fb6ef04 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -37,7 +37,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - android:textSize="?attr/title_font_16" /> + android:textSize="?attr/title_font_16" + android:fontFamily="?attr/content_font_family" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/content_markdown_view_comment_activity" @@ -66,7 +67,8 @@ android:paddingEnd="16dp" android:paddingBottom="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/content_font_18" /> + android:textSize="?attr/content_font_18" + android:fontFamily="?attr/content_font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml index a3a6f916..b606221d 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -51,6 +51,7 @@ android:textSize="?attr/font_default" android:background="#00000000" android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" android:maxLength="50" /> <View @@ -67,7 +68,8 @@ android:inputType="textMultiLine" android:textSize="?attr/font_default" android:background="#00000000" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <View android:id="@+id/divider_2_create_multi_reddit_activity" @@ -90,7 +92,8 @@ android:layout_weight="1" android:text="@string/private_multi_reddit" android:textSize="?attr/font_default" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <Switch android:id="@+id/visibility_switch_create_multi_reddit_activity" @@ -108,6 +111,7 @@ android:text="@string/select_subreddits" android:textSize="?attr/font_default" android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" /> diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml index 305c9578..79bc90f3 100644 --- a/app/src/main/res/layout/activity_edit_comment.xml +++ b/app/src/main/res/layout/activity_edit_comment.xml @@ -33,6 +33,7 @@ android:padding="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/content_font_18" + android:fontFamily="?attr/content_font_family" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit_multi_reddit.xml b/app/src/main/res/layout/activity_edit_multi_reddit.xml index c95ea6d1..c037daea 100644 --- a/app/src/main/res/layout/activity_edit_multi_reddit.xml +++ b/app/src/main/res/layout/activity_edit_multi_reddit.xml @@ -59,6 +59,7 @@ android:textSize="?attr/font_default" android:background="#00000000" android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" android:maxLength="50" /> <View diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml index bc3e377b..d5ac9360 100644 --- a/app/src/main/res/layout/activity_edit_post.xml +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -48,7 +48,8 @@ android:gravity="top" android:padding="16dp" android:textSize="?attr/title_font_18" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/title_font_family" /> <View android:id="@+id/divider_edit_post_activity" @@ -65,7 +66,8 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/content_font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_multi_reddit_listing.xml b/app/src/main/res/layout/activity_multi_reddit_listing.xml index 6fdd794a..308374b2 100644 --- a/app/src/main/res/layout/activity_multi_reddit_listing.xml +++ b/app/src/main/res/layout/activity_multi_reddit_listing.xml @@ -66,7 +66,8 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="@string/no_multi_reddits" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 8360f4b9..c6367aa1 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -57,7 +57,8 @@ android:layout_toStartOf="@id/rules_button_post_image_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity" android:text="@string/choose_a_subreddit" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <Button android:id="@+id/rules_button_post_image_activity" @@ -67,7 +68,8 @@ android:layout_centerVertical="true" android:text="@string/rules" android:textColor="@android:color/white" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -89,6 +91,7 @@ android:text="@string/flair" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -103,6 +106,7 @@ android:text="@string/spoiler" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -116,6 +120,7 @@ android:text="@string/nsfw" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -137,7 +142,8 @@ android:inputType="textCapSentences|textMultiLine" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <View android:id="@+id/divider_3_post_image_activity" @@ -184,6 +190,7 @@ android:text="@string/select_again" android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> <ImageView diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 0187eb5a..29a0eb7b 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -57,7 +57,8 @@ android:layout_toStartOf="@id/rules_button_post_link_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity" android:text="@string/choose_a_subreddit" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <Button android:id="@+id/rules_button_post_link_activity" @@ -67,7 +68,8 @@ android:layout_centerVertical="true" android:text="@string/rules" android:textColor="@android:color/white" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -89,6 +91,7 @@ android:text="@string/flair" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -103,6 +106,7 @@ android:text="@string/spoiler" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -116,6 +120,7 @@ android:text="@string/nsfw" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -137,7 +142,8 @@ android:inputType="textCapSentences|textMultiLine" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <View android:id="@+id/divider_3_post_link_activity" @@ -154,7 +160,8 @@ android:inputType="textMultiLine" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/content_font_18" /> + android:textSize="?attr/content_font_18" + android:fontFamily="?attr/content_font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index c28d08f5..e5d9b29d 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -57,7 +57,8 @@ android:layout_toStartOf="@id/rules_button_post_text_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity" android:text="@string/choose_a_subreddit" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <Button android:id="@+id/rules_button_post_text_activity" @@ -67,7 +68,8 @@ android:layout_centerVertical="true" android:text="@string/rules" android:textColor="@android:color/white" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -89,6 +91,7 @@ android:text="@string/flair" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -103,6 +106,7 @@ android:text="@string/spoiler" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -116,6 +120,7 @@ android:text="@string/nsfw" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -137,7 +142,8 @@ android:inputType="textCapSentences|textMultiLine" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <View android:id="@+id/divider_3_post_text_activity" @@ -154,7 +160,8 @@ android:inputType="textCapSentences|textMultiLine" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/content_font_18" /> + android:textSize="?attr/content_font_18" + android:fontFamily="?attr/content_font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 7eea9601..49580159 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -57,7 +57,8 @@ android:layout_toStartOf="@id/rules_button_post_video_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity" android:text="@string/choose_a_subreddit" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <Button android:id="@+id/rules_button_post_video_activity" @@ -67,7 +68,8 @@ android:layout_centerVertical="true" android:text="@string/rules" android:textColor="@android:color/white" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -89,6 +91,7 @@ android:text="@string/flair" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -103,6 +106,7 @@ android:text="@string/spoiler" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -116,6 +120,7 @@ android:text="@string/nsfw" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -137,7 +142,8 @@ android:inputType="textCapSentences|textMultiLine" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <View android:id="@+id/divider_3_post_video_activity" @@ -184,6 +190,7 @@ android:text="@string/select_again" android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> <com.google.android.exoplayer2.ui.PlayerView diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml index 3d39420a..563435fd 100644 --- a/app/src/main/res/layout/activity_rules.xml +++ b/app/src/main/res/layout/activity_rules.xml @@ -52,6 +52,8 @@ android:gravity="center" android:visibility="gone" android:textSize="?attr/font_default" + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index bcda1172..3855767b 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -63,7 +63,8 @@ android:layout_height="wrap_content" android:text="@string/search_in" android:textColor="?attr/colorAccent" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/subreddit_name_text_view_search_activity" @@ -75,7 +76,8 @@ android:layout_toEndOf="@id/search_in_text_view_search_activity" android:text="@string/all_subreddits" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> diff --git a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml index 9585922d..9b53ac6c 100644 --- a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml +++ b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml @@ -69,7 +69,9 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="@string/no_subreddits" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_theme_preview.xml b/app/src/main/res/layout/activity_theme_preview.xml index fb6172b7..2a03432a 100644 --- a/app/src/main/res/layout/activity_theme_preview.xml +++ b/app/src/main/res/layout/activity_theme_preview.xml @@ -52,14 +52,16 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/subreddit_preview" - android:textSize="?attr/font_18"/> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/user_name_text_view_theme_preview_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/username_preview" - android:textSize="?attr/font_18"/> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family"/> </LinearLayout> @@ -85,7 +87,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/primary_text_preview" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/secondary_text_text_view_theme_preview_activity" @@ -94,7 +97,8 @@ android:layout_weight="1" android:gravity="end" android:text="@string/secondary_text_preview" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> @@ -164,7 +168,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@android:color/transparent"/> + android:background="@android:color/transparent" /> <ImageView android:id="@+id/message_bottom_app_bar_theme_preview_activity" diff --git a/app/src/main/res/layout/activity_view_gif.xml b/app/src/main/res/layout/activity_view_gif.xml index 695ebc95..a09b4a4e 100644 --- a/app/src/main/res/layout/activity_view_gif.xml +++ b/app/src/main/res/layout/activity_view_gif.xml @@ -45,7 +45,8 @@ android:gravity="center" android:textColor="@android:color/white" android:text="@string/error_loading_gif_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_image.xml b/app/src/main/res/layout/activity_view_image.xml index 3b1b2e8c..c094cb47 100644 --- a/app/src/main/res/layout/activity_view_image.xml +++ b/app/src/main/res/layout/activity_view_image.xml @@ -44,7 +44,8 @@ android:gravity="center" android:textColor="@android:color/white" android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_imgur_media.xml b/app/src/main/res/layout/activity_view_imgur_media.xml index e6d6e67c..8e17ae8b 100644 --- a/app/src/main/res/layout/activity_view_imgur_media.xml +++ b/app/src/main/res/layout/activity_view_imgur_media.xml @@ -42,7 +42,8 @@ android:gravity="center" android:textColor="@android:color/white" android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_message.xml b/app/src/main/res/layout/activity_view_message.xml index f5f1c4e5..b50842c3 100644 --- a/app/src/main/res/layout/activity_view_message.xml +++ b/app/src/main/res/layout/activity_view_message.xml @@ -71,7 +71,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml index d867c596..e4928bae 100644 --- a/app/src/main/res/layout/activity_view_post_detail.xml +++ b/app/src/main/res/layout/activity_view_post_detail.xml @@ -64,7 +64,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index bbe2e94a..27dceb9f 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -65,7 +65,8 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textSize="?attr/font_18" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" + android:fontFamily="?attr/font_family" /> <com.google.android.material.chip.Chip android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity" @@ -85,6 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/online_subscriber_count_text_view_view_subreddit_detail_activity" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/barrier" @@ -96,6 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/barrier" @@ -107,6 +110,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/since" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/creation_time_text_view_view_subreddit_detail_activity" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -117,6 +121,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/since_text_view_view_subreddit_detail_activity" /> @@ -135,8 +140,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone"/> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index 3499823e..c56aa0fe 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -64,6 +64,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" android:layout_gravity="center_horizontal"/> <com.google.android.material.chip.Chip @@ -85,7 +86,8 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_toStartOf="@id/cakeday_text_view_view_user_detail_activity" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/cakeday_text_view_view_user_detail_activity" @@ -93,7 +95,8 @@ android:layout_height="wrap_content" android:gravity="end" android:layout_alignParentEnd="true" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -103,6 +106,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </LinearLayout> diff --git a/app/src/main/res/layout/adapter_default_entry.xml b/app/src/main/res/layout/adapter_default_entry.xml index acc53340..c05db9ff 100644 --- a/app/src/main/res/layout/adapter_default_entry.xml +++ b/app/src/main/res/layout/adapter_default_entry.xml @@ -3,4 +3,5 @@ android:id="@+id/text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="?attr/content_font_default" />
\ No newline at end of file + android:textSize="?attr/content_font_default" + android:fontFamily="?attr/content_font_family" />
\ No newline at end of file diff --git a/app/src/main/res/layout/color_picker.xml b/app/src/main/res/layout/color_picker.xml index 3e8b25cd..b8769926 100644 --- a/app/src/main/res/layout/color_picker.xml +++ b/app/src/main/res/layout/color_picker.xml @@ -12,6 +12,7 @@ android:paddingStart="24dp" android:paddingEnd="24dp" android:text="@string/color_picker" + android:fontFamily="?attr/font_family" style="@style/MaterialAlertDialogTitleTextStyle" /> <View @@ -28,7 +29,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="#" - android:textColor="?attr/primaryTextColor"/> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <EditText android:id="@+id/color_edit_text_color_picker" @@ -37,7 +39,8 @@ android:gravity="center" android:maxLength="8" android:inputType="textCapCharacters|textNoSuggestions" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> </LinearLayout> @@ -53,7 +56,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="A" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <SeekBar android:id="@+id/a_seek_bar_color_picker" @@ -75,7 +79,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="R" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <SeekBar android:id="@+id/r_seek_bar_color_picker" @@ -97,7 +102,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="G" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <SeekBar android:id="@+id/g_seek_bar_color_picker" @@ -119,7 +125,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="B" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <SeekBar android:id="@+id/b_seek_bar_color_picker" @@ -142,6 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" + android:fontFamily="?attr/font_family" style="@style/MaterialAlertDialogNegativeButtonStyle" /> <Button @@ -149,6 +157,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/ok" + android:fontFamily="?attr/font_family" style="@style/MaterialAlertDialogPositiveButtonStyle" /> </LinearLayout> diff --git a/app/src/main/res/layout/copy_text_material_dialog.xml b/app/src/main/res/layout/copy_text_material_dialog.xml index a8dfb7a5..88fa9f97 100644 --- a/app/src/main/res/layout/copy_text_material_dialog.xml +++ b/app/src/main/res/layout/copy_text_material_dialog.xml @@ -12,6 +12,7 @@ android:paddingStart="24dp" android:paddingEnd="24dp" android:textIsSelectable="true" + android:fontFamily="?attr/font_family" android:enabled="true" android:focusable="true" android:longClickable="true" /> diff --git a/app/src/main/res/layout/dialog_edit_flair.xml b/app/src/main/res/layout/dialog_edit_flair.xml index cb1f51d1..226bbb1e 100644 --- a/app/src/main/res/layout/dialog_edit_flair.xml +++ b/app/src/main/res/layout/dialog_edit_flair.xml @@ -11,6 +11,7 @@ android:background="#00000000" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:hint="@string/flair" android:maxLength="64" /> @@ -21,6 +22,7 @@ android:layout_marginEnd="24dp" android:text="@string/only_allow_64_chars" android:textColor="?attr/colorAccent" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_edit_theme_name.xml b/app/src/main/res/layout/dialog_edit_theme_name.xml index 9a63f486..9e126bc5 100644 --- a/app/src/main/res/layout/dialog_edit_theme_name.xml +++ b/app/src/main/res/layout/dialog_edit_theme_name.xml @@ -7,4 +7,5 @@ android:background="#00000000" android:hint="@string/theme_name_hint" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" />
\ No newline at end of file + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" />
\ No newline at end of file diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml index 7280717b..76cc3b86 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml @@ -15,7 +15,8 @@ android:includeFontPadding="false" android:textColor="#FFFFFF" android:textSize="12sp" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/slash" @@ -26,7 +27,8 @@ android:text="/" android:textColor="#FFFFFF" android:textSize="12sp" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="?attr/font_family" /> <TextView android:id="@id/exo_duration" android:layout_width="wrap_content" @@ -36,7 +38,8 @@ android:includeFontPadding="false" android:textColor="#FFFFFF" android:textSize="12sp" - android:textStyle="bold" /> + android:textStyle="bold" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@id/exo_play" android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml index d76c46fc..89749c08 100644 --- a/app/src/main/res/layout/exo_playback_control_view.xml +++ b/app/src/main/res/layout/exo_playback_control_view.xml @@ -51,7 +51,8 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:includeFontPadding="false" - android:textColor="#FFBEBEBE"/> + android:textColor="#FFBEBEBE" + android:fontFamily="?attr/font_family" /> <com.google.android.exoplayer2.ui.DefaultTimeBar android:id="@id/exo_progress" @@ -67,7 +68,8 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:includeFontPadding="false" - android:textColor="#FFBEBEBE"/> + android:textColor="#FFBEBEBE" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml index d0d57e55..db9fadd9 100644 --- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml @@ -25,6 +25,7 @@ android:text="@string/edit" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> <TextView @@ -43,6 +44,7 @@ android:text="@string/delete" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> <TextView @@ -61,7 +63,8 @@ android:paddingBottom="16dp" android:text="@string/share" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/copy_text_view_comment_more_bottom_sheet_fragment" @@ -79,7 +82,8 @@ android:paddingBottom="16dp" android:text="@string/copy_text" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/report_view_comment_more_bottom_sheet_fragment" @@ -97,7 +101,8 @@ android:paddingBottom="16dp" android:text="@string/report" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_comments_listing.xml b/app/src/main/res/layout/fragment_comments_listing.xml index e6096cb2..9ac463ab 100644 --- a/app/src/main/res/layout/fragment_comments_listing.xml +++ b/app/src/main/res/layout/fragment_comments_listing.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_comments_listing_fragment" @@ -41,7 +40,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml index 1e1e5394..9256d044 100644 --- a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml @@ -19,6 +19,7 @@ android:text="@string/copy_raw_text" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -34,6 +35,7 @@ android:text="@string/copy_markdown" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -49,6 +51,7 @@ android:text="@string/copy_all_raw_text" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -64,6 +67,7 @@ android:text="@string/copy_all_markdown" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml b/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml index c5ac6fda..81b4a46b 100644 --- a/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml @@ -22,6 +22,7 @@ android:text="@string/import_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_import_day_night_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -40,6 +41,7 @@ android:text="@string/create_light_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_light_theme_preference_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -58,6 +60,7 @@ android:text="@string/create_dark_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_dark_theme_preference_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -76,6 +79,7 @@ android:text="@string/create_amoled_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_amoled_theme_preference_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -92,7 +96,8 @@ android:paddingEnd="32dp" android:text="@string/create_theme_info" android:textColor="?attr/secondaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml index 82962293..b44d9001 100644 --- a/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_custom_theme_options_bottom_sheet.xml @@ -18,7 +18,8 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/edit_theme_text_view_custom_theme_options_bottom_sheet_fragment" @@ -32,6 +33,7 @@ android:text="@string/edit_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_edit_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -50,6 +52,7 @@ android:text="@string/change_theme_name" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_edit_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -68,6 +71,7 @@ android:text="@string/share_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_share_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -86,6 +90,7 @@ android:text="@string/delete_theme" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_delete_24dp" android:drawablePadding="48dp" android:clickable="true" diff --git a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml index edd8ad20..41a12ab8 100644 --- a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml @@ -11,7 +11,8 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="@string/flair" - android:textSize="?attr/font_18" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> <ProgressBar android:id="@+id/progress_bar_flair_bottom_sheet_fragment" @@ -28,7 +29,8 @@ android:gravity="center" android:padding="48dp" android:visibility="gone" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view_bottom_sheet_fragment" diff --git a/app/src/main/res/layout/fragment_followed_users_listing.xml b/app/src/main/res/layout/fragment_followed_users_listing.xml index 5b94e075..f0a6b6e9 100644 --- a/app/src/main/res/layout/fragment_followed_users_listing.xml +++ b/app/src/main/res/layout/fragment_followed_users_listing.xml @@ -39,7 +39,8 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="@string/no_users" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_multi_reddit_listing.xml b/app/src/main/res/layout/fragment_multi_reddit_listing.xml index 87f6bf6a..f9c3ec74 100644 --- a/app/src/main/res/layout/fragment_multi_reddit_listing.xml +++ b/app/src/main/res/layout/fragment_multi_reddit_listing.xml @@ -39,7 +39,8 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="@string/no_multi_reddits" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml index 466e90a0..7a0409b9 100644 --- a/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_multi_reddit_options_bottom_sheet.xml @@ -22,6 +22,7 @@ android:text="@string/edit_multi_reddit" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_edit_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -40,6 +41,7 @@ android:text="@string/delete_multi_reddit" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_delete_24dp" android:drawablePadding="48dp" android:clickable="true" diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml index 94d2f551..e8b3ac0f 100644 --- a/app/src/main/res/layout/fragment_post.xml +++ b/app/src/main/res/layout/fragment_post.xml @@ -39,7 +39,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml index 1bbf20a0..b33ab495 100644 --- a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml @@ -24,7 +24,8 @@ android:paddingBottom="16dp" android:text="@string/sort_best" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/confidence_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -39,7 +40,8 @@ android:paddingBottom="16dp" android:text="@string/sort_confidence" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/top_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -54,7 +56,8 @@ android:paddingBottom="16dp" android:text="@string/sort_top" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/new_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -69,7 +72,8 @@ android:paddingBottom="16dp" android:text="@string/sort_new" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/controversial_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -84,7 +88,8 @@ android:paddingBottom="16dp" android:text="@string/sort_controversial" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/old_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -99,7 +104,8 @@ android:paddingBottom="16dp" android:text="@string/sort_old" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/random_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -114,7 +120,8 @@ android:paddingBottom="16dp" android:text="@string/sort_random" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/qa_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -129,7 +136,8 @@ android:paddingBottom="16dp" android:text="@string/sort_qa" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/live_type_text_view_post_comment_sort_type_bottom_sheet_fragment" @@ -144,7 +152,8 @@ android:paddingBottom="16dp" android:text="@string/sort_live" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml index d5844678..939d6a43 100644 --- a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml @@ -25,7 +25,8 @@ android:paddingBottom="16dp" android:text="@string/post_layout_card" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/compact_layout_text_view_post_layout_bottom_sheet_fragment" @@ -40,7 +41,8 @@ android:paddingBottom="16dp" android:text="@string/post_layout_compact" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml index 2497dcb0..5dc07eb0 100644 --- a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml @@ -22,6 +22,7 @@ android:text="@string/bottom_sheet_post_text" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_outline_text_24px" android:drawablePadding="48dp" android:clickable="true" @@ -40,6 +41,7 @@ android:text="@string/bottom_sheet_post_link" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" android:clickable="true" @@ -58,6 +60,7 @@ android:text="@string/bottom_sheet_post_video" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_outline_video_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -76,6 +79,7 @@ android:text="@string/bottom_sheet_post_image" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_image_24dp" android:drawablePadding="48dp" android:clickable="true" diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml index e1c0f8ea..f7511131 100644 --- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml @@ -17,6 +17,7 @@ android:text="@string/sort_relevance" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -32,6 +33,7 @@ android:text="@string/sort_hot" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -47,6 +49,7 @@ android:text="@string/sort_top" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -62,6 +65,7 @@ android:text="@string/sort_new" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -77,6 +81,7 @@ android:text="@string/sort_comments" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml index be3e8030..3d3515ae 100644 --- a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml @@ -17,6 +17,7 @@ android:text="@string/sort_relevance" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -32,6 +33,7 @@ android:text="@string/sort_activity" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml index b842f077..3f7c0a93 100644 --- a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml @@ -22,6 +22,7 @@ android:text="@string/share_post_link" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" android:clickable="true" @@ -40,6 +41,7 @@ android:text="@string/copy_post_link" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_copy_24dp" android:drawablePadding="48dp" android:clickable="true" @@ -57,6 +59,7 @@ android:paddingEnd="32dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" android:clickable="true" @@ -75,6 +78,7 @@ android:paddingEnd="32dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_copy_24dp" android:drawablePadding="48dp" android:clickable="true" diff --git a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml index 23650b68..ac998161 100644 --- a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml @@ -19,6 +19,7 @@ android:text="@string/sort_time_hour" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -34,6 +35,7 @@ android:text="@string/sort_time_day" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -49,6 +51,7 @@ android:text="@string/sort_time_week" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -64,6 +67,7 @@ android:text="@string/sort_time_month" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -79,6 +83,7 @@ android:text="@string/sort_time_year" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -94,6 +99,7 @@ android:text="@string/sort_time_all_time" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml index f60fe0bb..d8a62445 100644 --- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml @@ -17,6 +17,7 @@ android:text="@string/sort_best" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -32,6 +33,7 @@ android:text="@string/sort_hot" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -47,6 +49,7 @@ android:text="@string/sort_new" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -62,6 +65,7 @@ android:text="@string/sort_random" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -77,6 +81,7 @@ android:text="@string/sort_rising" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -92,6 +97,7 @@ android:text="@string/sort_top" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -107,6 +113,7 @@ android:text="@string/sort_controversial" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_subreddit_listing.xml b/app/src/main/res/layout/fragment_subreddit_listing.xml index 8c81235d..16122bd6 100644 --- a/app/src/main/res/layout/fragment_subreddit_listing.xml +++ b/app/src/main/res/layout/fragment_subreddit_listing.xml @@ -39,7 +39,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml b/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml index 5675e124..c8c74361 100644 --- a/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml +++ b/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml @@ -39,7 +39,8 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="@string/no_subreddits" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_theme_preview_comments.xml b/app/src/main/res/layout/fragment_theme_preview_comments.xml index 89447a51..5fd566e7 100644 --- a/app/src/main/res/layout/fragment_theme_preview_comments.xml +++ b/app/src/main/res/layout/fragment_theme_preview_comments.xml @@ -53,6 +53,7 @@ android:maxLines="2" android:text="@string/username_preview" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_theme_preview_comments_fragment" app:layout_constraintEnd_toStartOf="@+id/comment_time_text_view_theme_preview_comments_fragment" app:layout_constraintStart_toEndOf="@id/author_type_image_view_theme_preview_comments_fragment" @@ -67,6 +68,7 @@ android:maxLines="2" android:text="@string/author_flair_preview" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/comment_time_text_view_theme_preview_comments_fragment" app:layout_constraintStart_toStartOf="parent" @@ -79,6 +81,7 @@ android:gravity="end" android:text="2 Hours" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -94,7 +97,8 @@ android:layout_marginEnd="16dp" android:layout_marginBottom="8dp" android:text="@string/comment_content_preview" - android:textSize="?attr/content_font_default" /> + android:textSize="?attr/content_font_default" + android:fontFamily="?attr/content_font_family" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/bottom_constraint_layout_theme_preview_comments_fragment" @@ -126,6 +130,7 @@ android:text="1234" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintStart_toEndOf="@+id/up_vote_button_theme_preview_comments_fragment" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml index c486f8b0..760d412d 100644 --- a/app/src/main/res/layout/fragment_theme_preview_posts.xml +++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml @@ -41,6 +41,7 @@ android:layout_marginEnd="8dp" android:text="@string/subreddit_preview" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_theme_preview_posts_fragment" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_theme_preview_posts_fragment" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_theme_preview_posts_fragment" @@ -56,6 +57,7 @@ android:maxLines="2" android:text="@string/username_preview" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_theme_preview_posts_fragment" app:layout_constraintHorizontal_bias="0" @@ -79,6 +81,7 @@ android:gravity="end" android:text="2 Hours" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -100,7 +103,8 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:text="@string/post_title_preview" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <TextView android:id="@+id/content_text_view_theme_preview_posts_fragment" @@ -112,6 +116,7 @@ android:maxLines="4" android:text="@string/post_content_preview" android:textSize="?attr/content_font_default" + android:fontFamily="?attr/content_font_family" android:ellipsize="end" /> <com.nex3z.flowlayout.FlowLayout @@ -130,6 +135,7 @@ android:text="@string/post_type_preview" android:textColor="@android:color/white" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -143,6 +149,7 @@ android:text="@string/spoiler" android:textColor="@android:color/white" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -155,6 +162,7 @@ android:text="@string/nsfw" android:textColor="@android:color/white" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -168,6 +176,7 @@ android:text="@string/flair_preview" android:textColor="@android:color/white" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -179,7 +188,8 @@ android:drawablePadding="4dp" android:text="@string/gilded_preview" android:textColor="@color/gold" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/archived_image_view_theme_preview_posts_fragment" @@ -209,7 +219,8 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:text="abcd.efg" - android:textSize="?attr/font_12" /> + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" /> <ProgressBar android:id="@+id/progress_bar_theme_preview_posts_fragment" @@ -251,6 +262,7 @@ android:text="1234" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_theme_preview_posts_fragment" app:layout_constraintTop_toTopOf="parent" /> @@ -279,6 +291,7 @@ android:text="567" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/minus_button_theme_preview_posts_fragment" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml b/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml index 05ea66c9..2aa8e144 100644 --- a/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_url_menu_bottom_sheet.xml @@ -19,6 +19,7 @@ android:text="@string/copy_raw_text" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -36,6 +37,7 @@ android:text="@string/copy_markdown" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -53,6 +55,7 @@ android:text="@string/copy_all_raw_text" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_user_listing.xml b/app/src/main/res/layout/fragment_user_listing.xml index 321c789b..8e5aeb23 100644 --- a/app/src/main/res/layout/fragment_user_listing.xml +++ b/app/src/main/res/layout/fragment_user_listing.xml @@ -4,7 +4,6 @@ android:id="@+id/coordinator_layout_user_listing_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" tools:application=".UserListingFragment"> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout @@ -40,7 +39,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml index dbf56287..8abaf5ff 100644 --- a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml @@ -11,6 +11,7 @@ android:text="@string/sort_new" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -26,6 +27,7 @@ android:text="@string/sort_hot" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -41,6 +43,7 @@ android:text="@string/sort_top" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" @@ -56,6 +59,7 @@ android:text="@string/sort_controversial" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="32dp" diff --git a/app/src/main/res/layout/fragment_view_imgur_images.xml b/app/src/main/res/layout/fragment_view_imgur_images.xml index 9d2ae408..a28346dc 100644 --- a/app/src/main/res/layout/fragment_view_imgur_images.xml +++ b/app/src/main/res/layout/fragment_view_imgur_images.xml @@ -31,7 +31,8 @@ android:gravity="center" android:textColor="@android:color/white" android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_acknowledgement.xml b/app/src/main/res/layout/item_acknowledgement.xml index b1d37f97..fba5dbde 100644 --- a/app/src/main/res/layout/item_acknowledgement.xml +++ b/app/src/main/res/layout/item_acknowledgement.xml @@ -15,13 +15,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_16" /> + android:textSize="?attr/font_16" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/introduction_text_view_item_acknowledgement" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index ab0ebbe4..6129a269 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -48,6 +48,7 @@ android:ellipsize="end" android:maxLines="2" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_item_post_comment" app:layout_constraintEnd_toStartOf="@+id/barrier" app:layout_constraintStart_toEndOf="@id/author_type_image_view_item_comment" @@ -61,6 +62,7 @@ android:ellipsize="end" android:maxLines="2" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/barrier" @@ -74,6 +76,7 @@ android:layout_marginEnd="8dp" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/comment_time_text_view_item_post_comment" app:layout_constraintTop_toTopOf="parent" /> @@ -84,6 +87,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -104,7 +108,9 @@ android:layout_marginTop="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:visibility="gone" /> + android:visibility="gone" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/comment_markdown_view_item_post_comment" @@ -115,7 +121,8 @@ android:layout_marginEnd="16dp" android:layout_marginBottom="8dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/content_font_default" /> + android:textSize="?attr/content_font_default" + android:fontFamily="?attr/content_font_family" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/bottom_constraint_layout_item_post_comment" @@ -146,6 +153,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintStart_toEndOf="@+id/up_vote_button_item_post_comment" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/item_comment_footer_error.xml b/app/src/main/res/layout/item_comment_footer_error.xml index ab0bc98f..1eb5e084 100644 --- a/app/src/main/res/layout/item_comment_footer_error.xml +++ b/app/src/main/res/layout/item_comment_footer_error.xml @@ -12,7 +12,8 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_toStartOf="@id/retry_button_item_comment_footer_error" - android:textSize="?attr/font_18" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> <Button android:id="@+id/retry_button_item_comment_footer_error" @@ -21,6 +22,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:text="@string/retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_custom_theme_color_item.xml b/app/src/main/res/layout/item_custom_theme_color_item.xml index 9a56b98b..9e52f44b 100644 --- a/app/src/main/res/layout/item_custom_theme_color_item.xml +++ b/app/src/main/res/layout/item_custom_theme_color_item.xml @@ -25,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_16" /> + android:textSize="?attr/font_16" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/theme_item_info_text_view_item_custom_theme_color_item" @@ -33,7 +34,8 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:textColor="?attr/secondaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_custom_theme_switch_item.xml b/app/src/main/res/layout/item_custom_theme_switch_item.xml index 18e3aed2..9b6ef0ef 100644 --- a/app/src/main/res/layout/item_custom_theme_switch_item.xml +++ b/app/src/main/res/layout/item_custom_theme_switch_item.xml @@ -20,7 +20,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_16" /> + android:textSize="?attr/font_16" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/theme_item_info_text_view_item_custom_theme_switch_item" @@ -28,7 +29,8 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:textColor="?attr/secondaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_favorite_thing_divider.xml b/app/src/main/res/layout/item_favorite_thing_divider.xml index 657d5bbf..13d99e4a 100644 --- a/app/src/main/res/layout/item_favorite_thing_divider.xml +++ b/app/src/main/res/layout/item_favorite_thing_divider.xml @@ -8,6 +8,7 @@ android:id="@+id/divider_text_view_item_favorite_thing_divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml index abd5c477..9d6f1c33 100644 --- a/app/src/main/res/layout/item_flair.xml +++ b/app/src/main/res/layout/item_flair.xml @@ -12,7 +12,8 @@ android:layout_height="wrap_content" android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/edit_flair_image_view_item_flair" diff --git a/app/src/main/res/layout/item_footer_error.xml b/app/src/main/res/layout/item_footer_error.xml index c0278ca9..b72b74fa 100644 --- a/app/src/main/res/layout/item_footer_error.xml +++ b/app/src/main/res/layout/item_footer_error.xml @@ -14,7 +14,8 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_toStartOf="@id/retry_button_item_footer_error" - android:textSize="?attr/font_18" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> <Button android:id="@+id/retry_button_item_footer_error" @@ -24,6 +25,7 @@ android:layout_centerVertical="true" android:textColor="@android:color/white" android:text="@string/retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml index 6d49a1e6..b5dd0d92 100644 --- a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml +++ b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml @@ -18,6 +18,7 @@ android:layout_gravity="center_horizontal" android:gravity="center" android:text="@string/load_comments_failed" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml index d801a867..f045676d 100644 --- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml +++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml @@ -22,7 +22,8 @@ android:padding="8dp" android:text="@string/comment_load_more_comments" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml index 1ac3b4ed..792be94f 100644 --- a/app/src/main/res/layout/item_message.xml +++ b/app/src/main/res/layout/item_message.xml @@ -11,7 +11,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/subject_text_view_item_message" @@ -19,7 +20,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textSize="?attr/font_16" - android:textColor="?attr/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/title_text_view_item_message" @@ -27,12 +29,14 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/title_font_family" /> <TextView android:id="@+id/content_custom_markwon_view_item_message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/content_font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_multi_reddit.xml b/app/src/main/res/layout/item_multi_reddit.xml index b522251b..5d8d36e5 100644 --- a/app/src/main/res/layout/item_multi_reddit.xml +++ b/app/src/main/res/layout/item_multi_reddit.xml @@ -21,6 +21,7 @@ android:layout_weight="1" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:layout_gravity="center_vertical" /> <ImageView diff --git a/app/src/main/res/layout/item_nav_drawer_account.xml b/app/src/main/res/layout/item_nav_drawer_account.xml index 7cf71e6a..1aebf8db 100644 --- a/app/src/main/res/layout/item_nav_drawer_account.xml +++ b/app/src/main/res/layout/item_nav_drawer_account.xml @@ -21,6 +21,7 @@ android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_menu_group_title.xml b/app/src/main/res/layout/item_nav_drawer_menu_group_title.xml index 5db89c04..01901b25 100644 --- a/app/src/main/res/layout/item_nav_drawer_menu_group_title.xml +++ b/app/src/main/res/layout/item_nav_drawer_menu_group_title.xml @@ -4,4 +4,5 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="@string/label_post" - android:textSize="?attr/font_default" />
\ No newline at end of file + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_menu_item.xml b/app/src/main/res/layout/item_nav_drawer_menu_item.xml index 6fcd0b35..6a75d908 100644 --- a/app/src/main/res/layout/item_nav_drawer_menu_item.xml +++ b/app/src/main/res/layout/item_nav_drawer_menu_item.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml b/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml index 9c96ea4f..04751a6a 100644 --- a/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml +++ b/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml @@ -22,6 +22,7 @@ android:layout_weight="1" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:layout_gravity="center_vertical" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_no_comment_placeholder.xml b/app/src/main/res/layout/item_no_comment_placeholder.xml index 2e0dc99d..17193549 100644 --- a/app/src/main/res/layout/item_no_comment_placeholder.xml +++ b/app/src/main/res/layout/item_no_comment_placeholder.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/no_comments_yet" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index d81a2bdc..f23220d7 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -37,6 +37,7 @@ android:layout_marginEnd="8dp" android:textColor="#E91E63" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_compact" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_compact" @@ -59,6 +60,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -85,6 +87,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" app:layout_constraintBottom_toTopOf="@id/flow_layout_item_post_compact" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/barrier2" @@ -113,6 +116,7 @@ android:padding="4dp" android:textColor="@android:color/white" android:textSize="?attr/font_10" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -126,6 +130,7 @@ android:text="@string/spoiler" android:textColor="@android:color/white" android:textSize="?attr/font_10" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -139,6 +144,7 @@ android:text="@string/nsfw" android:textColor="@android:color/white" android:textSize="?attr/font_10" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -152,6 +158,7 @@ android:padding="4dp" android:textColor="@android:color/white" android:textSize="?attr/font_10" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -163,6 +170,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_10" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -198,6 +206,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:layout_constraintTop_toBottomOf="@id/flow_layout_item_post_compact" app:layout_constraintStart_toStartOf="parent" @@ -297,6 +306,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_compact" app:layout_constraintTop_toTopOf="parent" /> @@ -330,6 +340,7 @@ android:paddingEnd="12dp" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml index 3667d7b5..f4f88d5a 100644 --- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml @@ -27,6 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail_image_and_gif_autoplay" @@ -41,6 +42,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/author_flair_text_view_item_post_detail_image_and_gif_autoplay" @@ -56,6 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" android:visibility="gone" @@ -71,6 +74,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintHorizontal_bias="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/guideline" @@ -94,6 +98,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" android:textIsSelectable="true" android:enabled="true" android:focusable="true" @@ -113,7 +118,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -125,7 +130,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -139,7 +144,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -152,7 +157,7 @@ android:layout_gravity="center" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -183,6 +188,8 @@ android:id="@+id/awards_text_view_item_post_detail_image_and_gif_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -220,6 +227,7 @@ android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </RelativeLayout> @@ -252,6 +260,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_detail_image_and_gif_autoplay" /> @@ -278,6 +287,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml index 1b8570da..c9e7bd2c 100644 --- a/app/src/main/res/layout/item_post_detail_link.xml +++ b/app/src/main/res/layout/item_post_detail_link.xml @@ -27,6 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail_link" @@ -41,6 +42,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/author_flair_text_view_item_post_detail_link" @@ -56,6 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" android:visibility="gone" @@ -71,6 +74,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintHorizontal_bias="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/guideline" @@ -94,6 +98,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" android:textIsSelectable="true" android:enabled="true" android:focusable="true" @@ -114,7 +119,7 @@ android:padding="4dp" android:text="@string/link" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -126,7 +131,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -140,7 +145,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -153,7 +158,7 @@ android:layout_gravity="center" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -184,6 +189,8 @@ android:id="@+id/awards_text_view_item_post_detail_link" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -195,7 +202,8 @@ android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/font_12" /> + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" /> <RelativeLayout android:id="@+id/image_view_wrapper_item_post_detail_link" @@ -230,6 +238,7 @@ android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </RelativeLayout> @@ -262,6 +271,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_detail_link" /> @@ -288,6 +298,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_detail_no_preview_link.xml b/app/src/main/res/layout/item_post_detail_no_preview_link.xml index 01e887fb..e7640de2 100644 --- a/app/src/main/res/layout/item_post_detail_no_preview_link.xml +++ b/app/src/main/res/layout/item_post_detail_no_preview_link.xml @@ -27,6 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail_no_preview_link" @@ -41,6 +42,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/author_flair_text_view_item_post_detail_no_preview_link" @@ -56,6 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" android:visibility="gone" @@ -71,6 +74,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintHorizontal_bias="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/guideline" @@ -94,6 +98,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" android:textIsSelectable="true" android:enabled="true" android:focusable="true" @@ -123,7 +128,7 @@ android:padding="4dp" android:text="@string/link" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -135,7 +140,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -149,7 +154,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -162,7 +167,7 @@ android:layout_gravity="center" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -193,6 +198,8 @@ android:id="@+id/awards_text_view_item_post_detail_no_preview_link" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -204,7 +211,8 @@ android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/font_12" /> + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/image_view_no_preview_link_item_post_detail_no_preview_link" @@ -240,6 +248,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_detail_no_preview_link" /> @@ -266,6 +275,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml index 00b81547..c7d02b7f 100644 --- a/app/src/main/res/layout/item_post_detail_text.xml +++ b/app/src/main/res/layout/item_post_detail_text.xml @@ -27,6 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail_text" @@ -41,6 +42,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/author_flair_text_view_item_post_detail_text" @@ -56,6 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" android:visibility="gone" @@ -71,6 +74,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintHorizontal_bias="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/guideline" @@ -94,6 +98,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" android:textIsSelectable="true" android:enabled="true" android:focusable="true" @@ -124,6 +129,7 @@ android:text="@string/text" android:textSize="?attr/font_12" android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -136,6 +142,7 @@ android:text="@string/spoiler" android:textSize="?attr/font_12" android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -149,7 +156,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -162,7 +169,7 @@ android:layout_gravity="center" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -193,6 +200,8 @@ android:id="@+id/awards_text_view_item_post_detail_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -223,6 +232,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_detail_text" /> @@ -249,6 +259,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml index 5de14a3e..c4b36198 100644 --- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml +++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml @@ -27,6 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail_video_and_gif_preview" @@ -41,6 +42,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/author_flair_text_view_item_post_detail_video_and_gif_preview" @@ -56,6 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" android:visibility="gone" @@ -71,6 +74,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintHorizontal_bias="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/guideline" @@ -94,6 +98,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" android:textIsSelectable="true" android:enabled="true" android:focusable="true" @@ -113,7 +118,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -125,7 +130,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -139,7 +144,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -152,7 +157,7 @@ android:layout_gravity="center" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -183,6 +188,8 @@ android:id="@+id/awards_text_view_item_post_detail_video_and_gif_preview" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -233,6 +240,7 @@ android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </RelativeLayout> @@ -265,6 +273,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_detail_video_and_gif_preview" /> @@ -291,6 +300,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml index b73fae27..6ee5736a 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml @@ -27,6 +27,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail_video_autoplay" @@ -41,6 +42,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/author_flair_text_view_item_post_detail_video_autoplay" @@ -56,6 +58,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" android:visibility="gone" @@ -71,6 +74,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintHorizontal_bias="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/guideline" @@ -94,6 +98,7 @@ android:paddingEnd="16dp" android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" android:textIsSelectable="true" android:enabled="true" android:focusable="true" @@ -114,7 +119,7 @@ android:padding="4dp" android:text="@string/video" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -126,7 +131,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -140,7 +145,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -153,7 +158,7 @@ android:layout_gravity="center" android:padding="4dp" android:textSize="?attr/font_12" - android:textColor="@android:color/white" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -184,6 +189,8 @@ android:id="@+id/awards_text_view_item_post_detail_video_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> </com.nex3z.flowlayout.FlowLayout> @@ -229,6 +236,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_detail_video_autoplay" /> @@ -255,6 +263,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_image_and_gif_autoplay.xml index e29f4287..39bf4933 100644 --- a/app/src/main/res/layout/item_post_image_and_gif_autoplay.xml +++ b/app/src/main/res/layout/item_post_image_and_gif_autoplay.xml @@ -37,6 +37,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_image_and_gif_autoplay" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_image_and_gif_autoplay" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_image_and_gif_autoplay" @@ -49,6 +50,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" @@ -74,6 +76,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -94,7 +97,8 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <com.nex3z.flowlayout.FlowLayout android:layout_width="match_parent" @@ -110,6 +114,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,6 +126,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -134,6 +140,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -145,6 +152,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -157,6 +165,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -217,7 +226,8 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -248,6 +258,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_image_and_gif_autoplay" /> @@ -273,6 +284,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_link.xml b/app/src/main/res/layout/item_post_link.xml index 66c55908..d6965fca 100644 --- a/app/src/main/res/layout/item_post_link.xml +++ b/app/src/main/res/layout/item_post_link.xml @@ -37,6 +37,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_link" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_link" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_link" @@ -49,6 +50,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" @@ -74,6 +76,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -94,7 +97,8 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <com.nex3z.flowlayout.FlowLayout android:layout_width="match_parent" @@ -111,6 +115,7 @@ android:padding="4dp" android:text="@string/link" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,6 +127,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -135,6 +141,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -146,6 +153,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -158,6 +166,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -194,6 +203,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" /> <RelativeLayout @@ -228,7 +238,8 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -259,6 +270,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_link" /> @@ -284,6 +296,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_no_preview_link.xml b/app/src/main/res/layout/item_post_no_preview_link.xml index bf1ba331..39396df9 100644 --- a/app/src/main/res/layout/item_post_no_preview_link.xml +++ b/app/src/main/res/layout/item_post_no_preview_link.xml @@ -37,6 +37,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_no_preview_link_type" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_no_preview_link_type" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_no_preview_link_type" @@ -49,6 +50,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" @@ -74,6 +76,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -94,7 +97,8 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <com.nex3z.flowlayout.FlowLayout android:layout_width="match_parent" @@ -111,6 +115,7 @@ android:padding="4dp" android:text="@string/link" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,6 +127,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -135,6 +141,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -146,6 +153,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -158,6 +166,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -193,7 +202,8 @@ android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/font_12" /> + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/image_view_no_preview_link_item_post_no_preview_link_type" @@ -228,6 +238,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_no_preview_link_type" /> @@ -253,6 +264,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml index 39ea56f4..c79fd6fc 100644 --- a/app/src/main/res/layout/item_post_text.xml +++ b/app/src/main/res/layout/item_post_text.xml @@ -37,6 +37,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_text_type" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_text_type" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_text_type" @@ -49,6 +50,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" @@ -74,6 +76,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -94,7 +97,8 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <TextView android:id="@+id/content_text_view_item_post_text_type" @@ -106,6 +110,7 @@ android:maxLines="4" android:visibility="gone" android:textSize="?attr/content_font_default" + android:fontFamily="?attr/content_font_family" android:ellipsize="end" /> <com.nex3z.flowlayout.FlowLayout @@ -123,6 +128,7 @@ android:padding="4dp" android:text="@string/text" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -134,6 +140,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -147,6 +154,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -158,6 +166,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -170,6 +179,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -222,6 +232,7 @@ android:layout_height="wrap_content" android:gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:textStyle="bold" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -247,6 +258,7 @@ android:padding="12dp" android:gravity="center_vertical" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:textStyle="bold" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" diff --git a/app/src/main/res/layout/item_post_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_video_and_gif_preview.xml index ad2e3b9d..738f1edf 100644 --- a/app/src/main/res/layout/item_post_video_and_gif_preview.xml +++ b/app/src/main/res/layout/item_post_video_and_gif_preview.xml @@ -37,6 +37,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_and_gif_preview" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_video_and_gif_preview" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_and_gif_preview" @@ -49,6 +50,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" @@ -74,6 +76,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -94,7 +97,8 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <com.nex3z.flowlayout.FlowLayout android:layout_width="match_parent" @@ -111,6 +115,7 @@ android:padding="4dp" android:text="@string/gif" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,6 +127,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -135,6 +141,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -146,6 +153,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -158,6 +166,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -232,7 +241,8 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </RelativeLayout> @@ -263,6 +273,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_video_and_gif_preview" /> @@ -288,6 +299,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index bfbc7456..5db83d38 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml @@ -37,6 +37,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_video_type_autoplay" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay" @@ -49,6 +50,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" @@ -74,6 +76,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guideline2" @@ -94,7 +97,8 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/title_font_18" /> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> <com.nex3z.flowlayout.FlowLayout android:layout_width="match_parent" @@ -111,6 +115,7 @@ android:padding="4dp" android:text="@string/video" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,6 +127,7 @@ android:layout_gravity="center" android:text="@string/spoiler" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -135,6 +141,7 @@ android:padding="4dp" android:text="@string/nsfw" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -146,6 +153,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" @@ -158,6 +166,7 @@ android:layout_height="wrap_content" android:padding="4dp" android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" android:visibility="gone" app:lib_setRadius="3dp" app:lib_setRoundedView="true" @@ -226,6 +235,7 @@ android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/plus_button_item_post_video_type_autoplay" /> @@ -251,6 +261,7 @@ android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" + android:fontFamily="?attr/font_family" android:drawableStart="@drawable/ic_comment_grey_24dp" android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_predefined_custom_theme.xml b/app/src/main/res/layout/item_predefined_custom_theme.xml index 56b97f88..6c7ebf82 100644 --- a/app/src/main/res/layout/item_predefined_custom_theme.xml +++ b/app/src/main/res/layout/item_predefined_custom_theme.xml @@ -22,7 +22,8 @@ android:layout_marginStart="32dp" android:layout_gravity="center_vertical" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/add_image_view_item_predefined_custom_theme" diff --git a/app/src/main/res/layout/item_report_reason.xml b/app/src/main/res/layout/item_report_reason.xml index 08d6900b..df95e799 100644 --- a/app/src/main/res/layout/item_report_reason.xml +++ b/app/src/main/res/layout/item_report_reason.xml @@ -17,8 +17,8 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <CheckBox android:id="@+id/check_box_item_report_reason" diff --git a/app/src/main/res/layout/item_rule.xml b/app/src/main/res/layout/item_rule.xml index 8b003197..1003f6c5 100644 --- a/app/src/main/res/layout/item_rule.xml +++ b/app/src/main/res/layout/item_rule.xml @@ -8,8 +8,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_16" /> + android:textSize="?attr/title_font_16" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/description_markwon_view_item_rule" @@ -18,6 +18,7 @@ android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textSize="?attr/content_font_default" /> + android:textSize="?attr/content_font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_selected_subreddit.xml b/app/src/main/res/layout/item_selected_subreddit.xml index 9653e179..6e1a570a 100644 --- a/app/src/main/res/layout/item_selected_subreddit.xml +++ b/app/src/main/res/layout/item_selected_subreddit.xml @@ -13,7 +13,9 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_vertical" - android:layout_marginEnd="16dp" /> + android:layout_marginEnd="16dp" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/delete_image_view_item_selected_subreddit" diff --git a/app/src/main/res/layout/item_subreddit_listing.xml b/app/src/main/res/layout/item_subreddit_listing.xml index 30a6fe90..da9c0044 100644 --- a/app/src/main/res/layout/item_subreddit_listing.xml +++ b/app/src/main/res/layout/item_subreddit_listing.xml @@ -24,8 +24,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="32dp" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/subreddit_icon_gif_image_view_item_subreddit_listing" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml index 1f62ae81..a67dbaf2 100644 --- a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml +++ b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml @@ -25,8 +25,8 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <CheckBox android:id="@+id/checkbox_item_subscribed_subreddit_multiselection" diff --git a/app/src/main/res/layout/item_subscribed_thing.xml b/app/src/main/res/layout/item_subscribed_thing.xml index 0507fac4..83a12a8a 100644 --- a/app/src/main/res/layout/item_subscribed_thing.xml +++ b/app/src/main/res/layout/item_subscribed_thing.xml @@ -20,8 +20,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:layout_gravity="center_vertical" /> <ImageView diff --git a/app/src/main/res/layout/item_theme_name.xml b/app/src/main/res/layout/item_theme_name.xml index c08f517d..4daded11 100644 --- a/app/src/main/res/layout/item_theme_name.xml +++ b/app/src/main/res/layout/item_theme_name.xml @@ -12,7 +12,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_16" /> + android:textSize="?attr/font_16" + android:fontFamily="?attr/font_family" /> <TextView android:id="@+id/description_text_view_item_theme_name" @@ -21,6 +22,7 @@ android:layout_marginTop="4dp" android:text="@string/theme_name_description" android:textColor="?attr/secondaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_theme_type_divider.xml b/app/src/main/res/layout/item_theme_type_divider.xml index ebeeefd9..7338064c 100644 --- a/app/src/main/res/layout/item_theme_type_divider.xml +++ b/app/src/main/res/layout/item_theme_type_divider.xml @@ -3,4 +3,5 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:textSize="?attr/font_default" />
\ No newline at end of file + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_user_custom_theme.xml b/app/src/main/res/layout/item_user_custom_theme.xml index 6f088b8f..03bfed78 100644 --- a/app/src/main/res/layout/item_user_custom_theme.xml +++ b/app/src/main/res/layout/item_user_custom_theme.xml @@ -22,7 +22,8 @@ android:layout_marginStart="32dp" android:layout_gravity="center_vertical" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/share_image_view_item_user_custom_theme" diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml index 522b2e42..5178c5be 100644 --- a/app/src/main/res/layout/item_user_listing.xml +++ b/app/src/main/res/layout/item_user_listing.xml @@ -24,8 +24,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="32dp" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/user_icon_gif_image_view_item_user_listing" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_view_all_comments.xml b/app/src/main/res/layout/item_view_all_comments.xml index 28816da4..713d8ace 100644 --- a/app/src/main/res/layout/item_view_all_comments.xml +++ b/app/src/main/res/layout/item_view_all_comments.xml @@ -8,5 +8,5 @@ android:clickable="true" android:focusable="true" android:text="@string/view_all_comments" - android:textColor="?attr/colorAccent" - android:textSize="?attr/font_default" />
\ No newline at end of file + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" />
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index bd578e0d..8ccdbe04 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -32,6 +32,7 @@ android:layout_alignParentStart="true" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" android:layout_below="@id/profile_image_view_nav_header_main" android:layout_toStartOf="@id/account_switcher_image_view_nav_header_main" /> @@ -44,7 +45,8 @@ android:layout_alignParentStart="true" android:layout_below="@id/name_text_view_nav_header_main" android:layout_toStartOf="@id/account_switcher_image_view_nav_header_main" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> <ImageView android:id="@+id/account_switcher_image_view_nav_header_main" diff --git a/app/src/main/res/layout/view_table_entry_cell.xml b/app/src/main/res/layout/view_table_entry_cell.xml index 6d544918..0430660c 100644 --- a/app/src/main/res/layout/view_table_entry_cell.xml +++ b/app/src/main/res/layout/view_table_entry_cell.xml @@ -6,4 +6,5 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#000" android:textSize="16sp" + android:fontFamily="?attr/font_family" tools:text="Table content" />
\ No newline at end of file diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index f9b5058b..0cfd9358 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -27,6 +27,18 @@ <attr name="content_font_20" format="dimension"/> </declare-styleable> + <declare-styleable name="FontFamily"> + <attr name="font_family" format="reference"/> + </declare-styleable> + + <declare-styleable name="TitleFontFamily"> + <attr name="title_font_family" format="reference"/> + </declare-styleable> + + <declare-styleable name="ContentFontFamily"> + <attr name="content_font_family" format="reference"/> + </declare-styleable> + <declare-styleable name="Theme"> <attr name="colorPrimary" format="color"/> <attr name="colorPrimaryDark" format="color"/> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a7e31f71..d09b0c72 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -229,6 +229,48 @@ <item name="content_font_20">26sp</item> </style> + <style name="FontFamily" /> + + <style name="FontFamily.Default"> + <item name="font_family">@null</item> + </style> + + <style name="FontFamily.BalsamiqSans"> + <item name="font_family">@font/balsamiq_sans</item> + </style> + + <style name="FontFamily.NotoSans"> + <item name="font_family">@font/noto_sans</item> + </style> + + <style name="TitleFontFamily" /> + + <style name="TitleFontFamily.Default"> + <item name="title_font_family">@null</item> + </style> + + <style name="TitleFontFamily.BalsamiqSans"> + <item name="title_font_family">@font/balsamiq_sans</item> + </style> + + <style name="TitleFontFamily.NotoSans"> + <item name="title_font_family">@font/noto_sans</item> + </style> + + <style name="ContentFontFamily" /> + + <style name="ContentFontFamily.Default"> + <item name="content_font_family">@null</item> + </style> + + <style name="ContentFontFamily.BalsamiqSans"> + <item name="content_font_family">@font/balsamiq_sans</item> + </style> + + <style name="ContentFontFamily.NotoSans"> + <item name="content_font_family">@font/noto_sans</item> + </style> + <style name="Theme" /> <style name="Theme.Normal"> |