From 4d9295b42b910ce8a8a37c686d7fb8eabdeea881 Mon Sep 17 00:00:00 2001 From: stom79 Date: Wed, 7 Nov 2018 08:07:45 +0100 Subject: [PATCH] Add the function in settings --- .../etalab/mastodon/fragments/SettingsFragment.java | 13 +++++++++++++ .../java/fr/gouv/etalab/mastodon/helper/Helper.java | 1 + .../main/res/layout-sw600dp/fragment_settings.xml | 7 +++++++ app/src/main/res/layout/fragment_settings.xml | 6 ++++++ app/src/main/res/values/strings.xml | 1 + 5 files changed, 28 insertions(+) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index f11221e09..b9973a0eb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -105,6 +105,19 @@ public class SettingsFragment extends Fragment { }); + boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, true); + + final CheckBox set_display_card = rootView.findViewById(R.id.set_display_card); + set_display_card.setChecked(display_card); + set_display_card.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_DISPLAY_CARD, set_display_card.isChecked()); + editor.apply(); + } + }); + boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, false); final CheckBox set_auto_add_media_url = rootView.findViewById(R.id.set_auto_add_media_url); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index f9a238667..f25dc2307 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -284,6 +284,7 @@ public class Helper { public static final String SET_ENABLE_TIME_SLOT = "set_enable_time_slot"; public static final String SET_KEEP_BACKGROUND_PROCESS = "set_keep_background_process"; public static final String SET_DISPLAY_EMOJI = "set_display_emoji"; + public static final String SET_DISPLAY_CARD = "set_display_card"; public static final int S_512KO = 1; public static final int S_1MO = 2; public static final int S_2MO = 3; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index cbca6b6a8..b604c6f69 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -166,6 +166,13 @@ android:layout_width="wrap_content" android:text="@string/set_display_emoji" android:layout_height="wrap_content" /> + + + + + Channels Use Emoji One information + Display cards in all toots Never