diff options
7 files changed, 36 insertions, 0 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontStyle.java index 5a448852..f38410e8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontStyle.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/ContentFontStyle.java @@ -3,6 +3,7 @@ package ml.docilealligator.infinityforreddit.font; import ml.docilealligator.infinityforreddit.R; public enum ContentFontStyle { + XSmall(R.style.ContentFontStyle_XSmall, "XSmall"), Small(R.style.ContentFontStyle_Small, "Small"), Normal(R.style.ContentFontStyle_Normal, "Normal"), Large(R.style.ContentFontStyle_Large, "Large"), diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontStyle.java index a7e3d7fa..240447cb 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontStyle.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/FontStyle.java @@ -3,6 +3,7 @@ package ml.docilealligator.infinityforreddit.font; import ml.docilealligator.infinityforreddit.R; public enum FontStyle { + XSmall(R.style.FontStyle_XSmall, "XSmall"), Small(R.style.FontStyle_Small, "Small"), Normal(R.style.FontStyle_Normal, "Normal"), Large(R.style.FontStyle_Large, "Large"), diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontStyle.java b/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontStyle.java index 0c2a7d53..867036cf 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontStyle.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/font/TitleFontStyle.java @@ -3,6 +3,7 @@ package ml.docilealligator.infinityforreddit.font; import ml.docilealligator.infinityforreddit.R; public enum TitleFontStyle { + XSmall(R.style.TitleFontStyle_XSmall, "XSmall"), Small(R.style.TitleFontStyle_Small, "Small"), Normal(R.style.TitleFontStyle_Normal, "Normal"), Large(R.style.TitleFontStyle_Large, "Large"), diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java index dc82e438..0728f5e8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java @@ -19,6 +19,7 @@ public class APIUtils { public static final String API_UPLOAD_MEDIA_URI = "https://reddit-uploaded-media.s3-accelerate.amazonaws.com"; public static final String API_UPLOAD_VIDEO_URI = "https://reddit-uploaded-video.s3-accelerate.amazonaws.com"; public static final String GFYCAT_API_BASE_URI = "https://api.gfycat.com/v1/gfycats/"; + //public static final String REDGIFS_API_BASE_URI = "https://api.redgifs.com/v2/gifs/"; public static final String REDGIFS_API_BASE_URI = "https://api.redgifs.com/v1/gfycats/"; public static final String IMGUR_API_BASE_URI = "https://api.imgur.com/3/"; public static final String PUSHSHIFT_API_BASE_URI = "https://api.pushshift.io/"; diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 79229db3..51015180 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -104,6 +104,7 @@ </string-array> <string-array name="settings_font_size"> + <item>@string/extra_small</item> <item>@string/small</item> <item>@string/normal</item> <item>@string/large</item> @@ -111,6 +112,7 @@ </string-array> <string-array name="settings_font_size_values"> + <item>XSmall</item> <item>Small</item> <item>Normal</item> <item>Large</item> @@ -118,6 +120,7 @@ </string-array> <string-array name="settings_title_font_size"> + <item>@string/extra_small</item> <item>@string/small</item> <item>@string/normal</item> <item>@string/large</item> @@ -125,6 +128,7 @@ </string-array> <string-array name="settings_title_font_size_values"> + <item>XSmall</item> <item>Small</item> <item>Normal</item> <item>Large</item> @@ -132,6 +136,7 @@ </string-array> <string-array name="settings_content_font_size"> + <item>@string/extra_small</item> <item>@string/small</item> <item>@string/normal</item> <item>@string/large</item> @@ -140,6 +145,7 @@ </string-array> <string-array name="settings_content_font_size_values"> + <item>XSmall</item> <item>Small</item> <item>Normal</item> <item>Large</item> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 805449d9..70e98c9d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1172,6 +1172,7 @@ <string name="only_on_wifi">Only on Wifi</string> <string name="never">Never</string> <string name="normal">Normal</string> + <string name="extra_small">Extra Small</string> <string name="extra_large">Extra Large</string> <string name="enormously_large">Enormously Large</string> <string name="default_in_array">Default</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5edc64cb..40a2c351 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -143,6 +143,15 @@ <style name="FontStyle" /> + <style name="FontStyle.XSmall"> + <item name="font_default">10sp</item> + <item name="font_10">8sp</item> + <item name="font_12">10sp</item> + <item name="font_16">12sp</item> + <item name="font_18">14sp</item> + <item name="font_20">16sp</item> + </style> + <style name="FontStyle.Small"> <item name="font_default">12sp</item> <item name="font_10">10sp</item> @@ -181,6 +190,14 @@ <style name="TitleFontStyle" /> + <style name="TitleFontStyle.XSmall"> + <item name="title_font_default">10sp</item> + <item name="title_font_12">10sp</item> + <item name="title_font_16">12sp</item> + <item name="title_font_18">14sp</item> + <item name="title_font_20">16sp</item> + </style> + <style name="TitleFontStyle.Small"> <item name="title_font_default">12sp</item> <item name="title_font_12">12sp</item> @@ -215,6 +232,14 @@ <style name="ContentFontStyle" /> + <style name="ContentFontStyle.XSmall"> + <item name="content_font_default">10sp</item> + <item name="content_font_12">10sp</item> + <item name="content_font_16">12sp</item> + <item name="content_font_18">14sp</item> + <item name="content_font_20">16sp</item> + </style> + <style name="ContentFontStyle.Small"> <item name="content_font_default">12sp</item> <item name="content_font_12">12sp</item> |