From d8fe52df11fa0ed5f941befb5c4cf40e086dae68 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 12 Aug 2017 08:49:45 +0200 Subject: [PATCH] Prepares variables for switching between layouts --- .../main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 4 ++++ app/src/main/res/values-fr/strings.xml | 7 ++++++- app/src/main/res/values/strings.xml | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) 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 0dbbb86e4..e42e254a4 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 @@ -185,11 +185,15 @@ public class Helper { public static final String SET_AUTO_STORE = "set_auto_store"; public static final String SET_POPUP_PUSH = "set_popup_push"; public static final String SET_NSFW_TIMEOUT = "set_nsfw_timeout"; + public static final String SET_TABS = "set_tabs"; public static final int ATTACHMENT_ALWAYS = 1; public static final int ATTACHMENT_WIFI = 2; public static final int ATTACHMENT_ASK = 3; public static final int THEME_LIGHT = 1; public static final int THEME_DARK = 2; + public static final int THEME_TABS = 1; + public static final int THEME_MENU = 2; + public static final int THEME_MENU_TABS = 3; public static final String SET_NOTIF_FOLLOW = "set_notif_follow"; public static final String SET_NOTIF_ADD = "set_notif_follow_add"; diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8f1f2efa1..148129430 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -300,7 +300,12 @@ Utiliser le navigateur intégré Activer Javascript Autoriser les cookies tiers - + Disposition des fils : + + Onglets + Menu + Onglets et menu + 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 c9cb01da1..d5e23d99b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -305,6 +305,14 @@ Use the built-in browser Enable Javascript Allow third-party cookies + Layout for timelines: + + Tabs + Menu + Tabs and menu + + + News Notify for new toots on the home timeline