works as intended :)

4 files changed, 39 insertions, 9 deletions

diff --git a/app/java/res/layout/main.xml b/app/java/res/layout/main.xml
index cc1780c..d3bbcf5 100644
--- a/app/java/res/layout/main.xml
+++ b/app/java/res/layout/main.xml
@@ -24,6 +24,20 @@
         android:id="@+id/button_start"
         android:layout_gravity="center"
         android:onClick="onClickButtonStart"
-        android:text="@string/button_start__start"
+        android:text="@string/button_start"
+        android:background="#22B225"
+        android:textColor="@android:color/white"
+        android:textSize="96sp"
+    />
+    <Button
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/button_stop"
+        android:layout_gravity="center"
+        android:onClick="onClickButtonStop"
+        android:text="@string/button_stop"
+        android:background="#96060C"
+        android:textColor="@android:color/white"
+        android:textSize="96sp"
     />
 </FrameLayout>
diff --git a/app/java/res/menu/settings.xml b/app/java/res/menu/settings.xml
index 2d86504..3af94ef 100644
--- a/app/java/res/menu/settings.xml
+++ b/app/java/res/menu/settings.xml
@@ -4,7 +4,8 @@
 >
     <item
         android:id="@+id/menu__settings"
+        android:icon="@android:drawable/ic_menu_preferences"
         android:title="@string/menu__settings"
-        android:orderInCategory="100"
+        android:showAsAction="always"
     />
 </menu>
diff --git a/app/java/res/values/strings.xml b/app/java/res/values/strings.xml
index bd4f88b..b34abae 100644
--- a/app/java/res/values/strings.xml
+++ b/app/java/res/values/strings.xml
@@ -11,10 +11,10 @@
         stopping
     </string>
 
-    <string name="button_start__start">
+    <string name="button_start">
         Start
     </string>
-    <string name="button_start__stop">
+    <string name="button_stop">
         Stop
     </string>
 
diff --git a/app/java/res/xml/settings.xml b/app/java/res/xml/settings.xml
index ea44ce0..0cd7034 100644
--- a/app/java/res/xml/settings.xml
+++ b/app/java/res/xml/settings.xml
@@ -9,14 +9,32 @@
         android:summary="Whether to use the automatic discovery mechanism to set the DNS server"
     />
 
+    <EditTextPreference
+        android:key="dns_server_address"
+        android:title="Pihole IP address"
+    />
+
     <SwitchPreference
         android:key="use_wifi_listener"
         android:defaultValue="false"
         android:title="Use WiFi listener"
-        android:summary="Automatically de/activates the proxy on WiFi dis/connect"
+        android:summary="Automatically deactivates the proxy on WiFi disconnect"
+    />
+
+    <SwitchPreference
+        android:key="use_wifi_listener_for_activation"
+        android:dependency="use_wifi_listener"
+        android:defaultValue="false"
+        android:title="Use WiFi listener for activation"
+        android:summary="Automatically activates the proxy on WiFi connect when connecting to specific WLAN. Needs location services to function!"
+    />
+
+    <EditTextPreference
+        android:key="wifi_listener_ssid"
+        android:dependency="use_wifi_listener_for_activation"
+        android:title="WLAN SSID"
     />
 
-    <!-- USE_WIFI_LISTENER -->
     <!-- SELECT_FROM_KNOWN_SSIDS -->
     <!-- <MultiSelectListPreference -->
     <!--     android:id="@+id/known_ssids" -->
@@ -24,7 +42,4 @@
     <!--     android:entries="" -->
     <!--     android:entryValues="" -->
     <!-- /> -->
-
-    <!-- USE_AUTOMATIC_DNS/PIHOLE_SERVER_DISCOVERY -->
-    <!-- SET_MANUAL_DNS/PIHOLE_SERVER_IP -->
 </PreferenceScreen>