diff --git a/Clover/app/src/main/assets/font/RobotoCondensed-Regular.ttf b/Clover/app/src/main/assets/font/RobotoCondensed-Regular.ttf new file mode 100644 index 00000000..b9fc49c9 Binary files /dev/null and b/Clover/app/src/main/assets/font/RobotoCondensed-Regular.ttf differ diff --git a/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java b/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java index 49423308..34ad1c8b 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java +++ b/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java @@ -60,6 +60,7 @@ public class ChanSettings { private static final StringSetting theme; public static final StringSetting fontSize; + public static final BooleanSetting fontCondensed; public static final BooleanSetting openLinkConfirmation; public static final BooleanSetting autoRefreshThread; // public static final BooleanSetting imageAutoLoad; @@ -124,6 +125,7 @@ public class ChanSettings { boolean tablet = AndroidUtils.getRes().getBoolean(R.bool.is_tablet); fontSize = new StringSetting(p, "preference_font", tablet ? "16" : "14"); + fontCondensed = new BooleanSetting(p, "preference_font_condensed", false); openLinkConfirmation = new BooleanSetting(p, "preference_open_link_confirmation", true); autoRefreshThread = new BooleanSetting(p, "preference_auto_refresh_thread", true); // imageAutoLoad = new BooleanSetting(p, "preference_image_auto_load", true); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java b/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java index 977603f8..4cae2b0c 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java @@ -73,6 +73,7 @@ import java.util.ArrayList; import java.util.List; import static android.text.TextUtils.isEmpty; +import static org.floens.chan.utils.AndroidUtils.ROBOTO_CONDENSED_REGULAR; import static org.floens.chan.utils.AndroidUtils.dp; import static org.floens.chan.utils.AndroidUtils.getString; import static org.floens.chan.utils.AndroidUtils.setRoundItemBackground; @@ -159,6 +160,10 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin comment.setTextSize(textSizeSp); comment.setPadding(paddingPx, paddingPx, paddingPx, 0); + if (ChanSettings.fontCondensed.get()) { + comment.setTypeface(ROBOTO_CONDENSED_REGULAR); + } + replies.setTextSize(textSizeSp); replies.setPadding(paddingPx, 0, paddingPx, paddingPx); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java index e0a25267..b5a39a08 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java @@ -64,6 +64,7 @@ public class MainSettingsController extends SettingsController implements Toolba private int clickCount; private SettingView developerView; private SettingView fontView; + private SettingView fontCondensed; private ToolbarMenuItem overflow; private PopupWindow advancedSettingsHint; @@ -133,8 +134,8 @@ public class MainSettingsController extends SettingsController implements Toolba if (item == imageAutoLoadView) { videoAutoLoadView.setEnabled(!ChanSettings.imageAutoLoadNetwork.get().equals(ChanSettings.ImageAutoLoadMode.NONE.name)); - } else if (item == fontView) { - EventBus.getDefault().post(new RefreshUIMessage("fontsize")); + } else if (item == fontView || item == fontCondensed) { + EventBus.getDefault().post(new RefreshUIMessage("font")); } } @@ -183,6 +184,7 @@ public class MainSettingsController extends SettingsController implements Toolba } fontView = appearance.add(new ListSettingView(this, ChanSettings.fontSize, R.string.setting_font_size, fontSizes.toArray(new ListSettingView.Item[fontSizes.size()]))); + fontCondensed = appearance.add(new BooleanSettingView(this, ChanSettings.fontCondensed, R.string.setting_font_condensed, R.string.setting_font_condensed_description)); groups.add(appearance); diff --git a/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java b/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java index 9979597e..3828861a 100644 --- a/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java +++ b/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java @@ -62,12 +62,14 @@ public class AndroidUtils { public static Typeface ROBOTO_MEDIUM; public static Typeface ROBOTO_MEDIUM_ITALIC; + public static Typeface ROBOTO_CONDENSED_REGULAR; private static ConnectivityManager connectivityManager; public static void init() { ROBOTO_MEDIUM = getTypeface("Roboto-Medium.ttf"); ROBOTO_MEDIUM_ITALIC = getTypeface("Roboto-MediumItalic.ttf"); + ROBOTO_CONDENSED_REGULAR = getTypeface("RobotoCondensed-Regular.ttf"); connectivityManager = (ConnectivityManager) getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE); } diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 28a7c99b..8cfc2885 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -325,6 +325,8 @@ along with this program. If not, see . Swipe to change the theme.\nTap the toolbar to change its color. Font size (default) + Use condensed font + Use a condensed font for the posts Ask before opening links Auto refresh threads Auto load images