From 1c1ab6a4e6ee1ea703ab27f80629e0e0b4853c1f Mon Sep 17 00:00:00 2001 From: tom79 Date: Fri, 25 Aug 2017 15:53:04 +0200 Subject: [PATCH] Prepares layouts + preferences --- .../mastodon/fragments/SettingsFragment.java | 25 +++++++++++++++++++ .../gouv/etalab/mastodon/helper/Helper.java | 6 +++++ .../res/layout-sw600dp/fragment_settings.xml | 21 ++++++++++++++++ app/src/main/res/layout/fragment_settings.xml | 22 ++++++++++++++++ app/src/main/res/values-de/strings.xml | 5 ++++ app/src/main/res/values-fr/strings.xml | 5 ++++ app/src/main/res/values/strings.xml | 7 ++++-- 7 files changed, 89 insertions(+), 2 deletions(-) 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 ccc883629..2783602f9 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 @@ -70,6 +70,7 @@ public class SettingsFragment extends Fragment { private static final int ACTIVITY_CHOOSE_FILE = 411; private TextView set_folder; int count = 0; + int count2 = 0; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -412,6 +413,30 @@ public class SettingsFragment extends Fragment { } }); + final Spinner translation_layout_spinner = (Spinner) rootView.findViewById(R.id.translation_layout_spinner); + ArrayAdapter adapterTrans = ArrayAdapter.createFromResource(getActivity(), + R.array.settings_translation, android.R.layout.simple_spinner_item); + translation_layout_spinner.setAdapter(adapterTrans); + + int positionSpinnerTrans = (sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX)); + translation_layout_spinner.setSelection(positionSpinnerTrans); + translation_layout_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if( count2 > 0){ + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putInt(Helper.SET_TRANSLATOR, position ); + editor.apply(); + }else { + count2++; + } + } + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + return rootView; } 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 309b1174d..1e54cea0e 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 @@ -204,6 +204,8 @@ public class Helper { public static final String SET_PREVIEW_REPLIES = "set_preview_replies"; public static final String SET_PREVIEW_REPLIES_PP = "set_preview_replies_pp"; public static final String SET_BUBBLE_COUNTER = "set_bubble_counter"; + public static final String SET_TRANSLATOR = "set_translator"; + public static final int ATTACHMENT_ALWAYS = 1; public static final int ATTACHMENT_WIFI = 2; public static final int ATTACHMENT_ASK = 3; @@ -213,6 +215,10 @@ public class Helper { public static final int THEME_MENU = 2; public static final int THEME_MENU_TABS = 3; + public static final int TRANS_YANDEX = 0; + public static final int TRANS_GOOGLE = 1; + public static final int TRANS_NONE = 2; + public static final String SET_NOTIF_FOLLOW = "set_notif_follow"; public static final String SET_NOTIF_ADD = "set_notif_follow_add"; public static final String SET_NOTIF_ASK = "set_notif_follow_ask"; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index d92f8d288..3a855d0b1 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -137,6 +137,27 @@ android:text="@string/embedded_browser" android:layout_height="wrap_content" /> + + + + + + + + + + + + + + + + + Yandex + Google + Nein + Blockiere Nicht mehr blockieren diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 92fbe6ad4..66e3aa8db 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -324,6 +324,11 @@ Menu Onglets et menu + + Yandex + Google + Non + Actualités Notifier lors de nouveaux pouets sur la page d\'accueil Afficher les messages d\'erreur diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e38f79ac8..5c5cfe75b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,5 @@ Mastalab - Open the menu Close the menu @@ -331,7 +330,11 @@ Tabs and menu - + + Yandex + Google + No + News Notify for new toots on the home timeline