From d835a9b8f38acf1970acc18ce2030f7d5f7377dd Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 28 Nov 2017 01:51:19 +0100
Subject: base for sidebar

---
 app/src/main/res/menu/main.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 app/src/main/res/menu/main.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
new file mode 100644
index 00000000..56f43959
--- /dev/null
+++ b/app/src/main/res/menu/main.xml
@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="se.leap.bitmaskclient.MainActivity">
+    <item
+        android:id="@+id/action_example"
+        android:showAsAction="withText|ifRoom"
+        android:title="@string/action_example" />
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings" />
+</menu>
-- 
cgit v1.2.3


From 08ec840de9657085d9a0baaab54f6b33e16a12d0 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Thu, 14 Dec 2017 21:21:22 +0100
Subject: add LogFragment

---
 app/src/main/res/menu/f_log.xml | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 app/src/main/res/menu/f_log.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/f_log.xml b/app/src/main/res/menu/f_log.xml
new file mode 100644
index 00000000..5e0af56c
--- /dev/null
+++ b/app/src/main/res/menu/f_log.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+    <item
+            android:id="@+id/toggle_time"
+            android:alphabeticShortcut="t"
+            android:icon="@drawable/ic_menu_view"
+            app:showAsAction="ifRoom"
+            android:title="@string/logview_options" />
+
+    <item
+            android:id="@+id/clearlog"
+            android:icon="@drawable/ic_menu_delete"
+            app:showAsAction="ifRoom"
+            android:title="@string/clear_log"
+            android:titleCondensed="@string/clear"/>
+    <item
+            android:id="@+id/send"
+            android:icon="@drawable/ic_menu_share"
+            app:showAsAction="ifRoom"
+            android:title="@string/send_logfile"
+            android:titleCondensed="@string/send"/>
+
+    <item
+            android:id="@+id/edit_vpn"
+            android:alphabeticShortcut="e"
+            android:icon="@drawable/ic_menu_edit"
+            app:showAsAction="withText|ifRoom"
+            android:title="@string/edit_vpn"
+	    android:visible="false"/>
+
+</menu>
-- 
cgit v1.2.3


From d1d34f0bf995f48dac7781711656b8cb8e387707 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 19 Dec 2017 16:08:49 +0100
Subject: move log fragment layout

---
 app/src/main/res/menu/f_log.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/f_log.xml b/app/src/main/res/menu/f_log.xml
index 5e0af56c..d30b13cb 100644
--- a/app/src/main/res/menu/f_log.xml
+++ b/app/src/main/res/menu/f_log.xml
@@ -28,12 +28,4 @@
             android:title="@string/send_logfile"
             android:titleCondensed="@string/send"/>
 
-    <item
-            android:id="@+id/edit_vpn"
-            android:alphabeticShortcut="e"
-            android:icon="@drawable/ic_menu_edit"
-            app:showAsAction="withText|ifRoom"
-            android:title="@string/edit_vpn"
-	    android:visible="false"/>
-
 </menu>
-- 
cgit v1.2.3