From 2e51cec6d1d7abc655b17d1d4922da12e99edb9e Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Sun, 14 Jun 2020 12:18:13 -0500
Subject: [PATCH] Flesh out more of the UI

---
 .../ui/search/SearchFragment.java             |   2 -
 .../ui/tacnet/TACNETFragment.java             |   2 +-
 app/src/main/res/drawable/button_active.xml   |  16 +-
 app/src/main/res/drawable/button_default.xml  |  16 +-
 app/src/main/res/drawable/button_disabled.xml |  16 +-
 app/src/main/res/drawable/button_hover.xml    |  16 +-
 app/src/main/res/drawable/button_selected.xml |  16 +-
 app/src/main/res/layout/activity_main.xml     |   5 +-
 app/src/main/res/layout/dialog_base.xml       |  14 +-
 .../main/res/layout/dialog_edit_variable.xml  |  24 ++-
 app/src/main/res/layout/fragment_editor.xml   |  27 ++--
 app/src/main/res/layout/fragment_search.xml   |  45 ++++--
 app/src/main/res/layout/fragment_settings.xml |   1 +
 app/src/main/res/layout/fragment_tacnet.xml   | 147 ++++++++++--------
 app/src/main/res/values/colors.xml            |   6 +-
 app/src/main/res/values/dimens.xml            |  12 ++
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/values/styles.xml            |  21 ++-
 18 files changed, 237 insertions(+), 151 deletions(-)

diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/search/SearchFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/search/SearchFragment.java
index 83c87c4..83433f9 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/search/SearchFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/search/SearchFragment.java
@@ -23,11 +23,9 @@ public class SearchFragment extends Fragment {
         searchViewModel =
                 ViewModelProviders.of(this).get(SearchViewModel.class);
         View root = inflater.inflate(R.layout.fragment_search, container, false);
-        final TextView textView = root.findViewById(R.id.text_search);
         searchViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
             @Override
             public void onChanged(@Nullable String s) {
-                textView.setText(s);
             }
         });
         return root;
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java
index 3db896c..4567c53 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java
@@ -41,7 +41,7 @@ public class TACNETFragment extends Fragment {
                 Dialog dialog = new Dialog(getContext());
                 dialog.show();
 
-                ((TextView)dialog.findViewById(R.id.dialogTitle)).setText("Add Variable Variable");
+                ((TextView)dialog.findViewById(R.id.dialogTitle)).setText("Add Variable");
                 LinearLayout view = dialog.findViewById(R.id.dialogContent);
                 view.addView(getLayoutInflater().inflate(R.layout.dialog_edit_variable, null));
             }
diff --git a/app/src/main/res/drawable/button_active.xml b/app/src/main/res/drawable/button_active.xml
index 55088c4..13d10a7 100644
--- a/app/src/main/res/drawable/button_active.xml
+++ b/app/src/main/res/drawable/button_active.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:top="2dp"
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp">
+        android:top="@dimen/button_margin_top"
+        android:bottom="@dimen/button_margin_bottom"
+        android:left="@dimen/button_margin_left"
+        android:right="@dimen/button_margin_right">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorTertiary" />
             <corners android:radius="0dp" />
             <padding
-                android:top="8dp"
-                android:bottom="8dp"
-                android:left="16dp"
-                android:right="16dp" />
+                android:top="@dimen/button_padding_top"
+                android:bottom="@dimen/button_padding_bottom"
+                android:left="@dimen/button_padding_left"
+                android:right="@dimen/button_padding_right" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/button_default.xml b/app/src/main/res/drawable/button_default.xml
index 5e2055f..4ec0195 100644
--- a/app/src/main/res/drawable/button_default.xml
+++ b/app/src/main/res/drawable/button_default.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:top="2dp"
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp">
+        android:top="@dimen/button_margin_top"
+        android:bottom="@dimen/button_margin_bottom"
+        android:left="@dimen/button_margin_left"
+        android:right="@dimen/button_margin_right">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorPrimary" />
             <corners android:radius="0dp" />
             <padding
-                android:top="8dp"
-                android:bottom="8dp"
-                android:left="16dp"
-                android:right="16dp" />
+                android:top="@dimen/button_padding_top"
+                android:bottom="@dimen/button_padding_bottom"
+                android:left="@dimen/button_padding_left"
+                android:right="@dimen/button_padding_right" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/button_disabled.xml b/app/src/main/res/drawable/button_disabled.xml
index fdd7d53..dbb5471 100644
--- a/app/src/main/res/drawable/button_disabled.xml
+++ b/app/src/main/res/drawable/button_disabled.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:top="2dp"
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp">
+        android:top="@dimen/button_margin_top"
+        android:bottom="@dimen/button_margin_bottom"
+        android:left="@dimen/button_margin_left"
+        android:right="@dimen/button_margin_right">
         <shape android:shape="rectangle">
             <solid android:color="@color/buttonDisabled" />
             <corners android:radius="0dp" />
             <padding
-                android:top="8dp"
-                android:bottom="8dp"
-                android:left="16dp"
-                android:right="16dp" />
+                android:top="@dimen/button_padding_top"
+                android:bottom="@dimen/button_padding_bottom"
+                android:left="@dimen/button_padding_left"
+                android:right="@dimen/button_padding_right" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/button_hover.xml b/app/src/main/res/drawable/button_hover.xml
index e39e495..4b577f4 100644
--- a/app/src/main/res/drawable/button_hover.xml
+++ b/app/src/main/res/drawable/button_hover.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:top="2dp"
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp">
+        android:top="@dimen/button_margin_top"
+        android:bottom="@dimen/button_margin_bottom"
+        android:left="@dimen/button_margin_left"
+        android:right="@dimen/button_margin_right">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorSecondary" />
             <corners android:radius="0dp" />
             <padding
-                android:top="8dp"
-                android:bottom="8dp"
-                android:left="16dp"
-                android:right="16dp" />
+                android:top="@dimen/button_padding_top"
+                android:bottom="@dimen/button_padding_bottom"
+                android:left="@dimen/button_padding_left"
+                android:right="@dimen/button_padding_right" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/button_selected.xml b/app/src/main/res/drawable/button_selected.xml
index e39e495..4b577f4 100644
--- a/app/src/main/res/drawable/button_selected.xml
+++ b/app/src/main/res/drawable/button_selected.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:top="2dp"
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp">
+        android:top="@dimen/button_margin_top"
+        android:bottom="@dimen/button_margin_bottom"
+        android:left="@dimen/button_margin_left"
+        android:right="@dimen/button_margin_right">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorSecondary" />
             <corners android:radius="0dp" />
             <padding
-                android:top="8dp"
-                android:bottom="8dp"
-                android:left="16dp"
-                android:right="16dp" />
+                android:top="@dimen/button_padding_top"
+                android:bottom="@dimen/button_padding_bottom"
+                android:left="@dimen/button_padding_left"
+                android:right="@dimen/button_padding_right" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index daf36b1..5f239a1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,6 +10,7 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginBottom="56dp"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
         app:layout_constraintHorizontal_bias="0.0"
@@ -22,10 +23,10 @@
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="56dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nav_host_fragment"
         app:menu="@menu/bottom_nav_menu" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml
index 445aeda..4789ceb 100644
--- a/app/src/main/res/layout/dialog_base.xml
+++ b/app/src/main/res/layout/dialog_base.xml
@@ -19,22 +19,22 @@
         <TextView
             android:id="@+id/dialogTitle"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="24dp"
-            android:textColor="@color/dialogTitle"
-            android:textFontWeight="800"
-            android:text="[Title Not Set]"
+            android:layout_height="match_parent"
             android:layout_marginLeft="10dp"
+            android:gravity="center_vertical"
+            android:text="[Title Not Set]"
+            android:textColor="@color/dialogTitle"
+            android:textSize="@dimen/dialogTitleTextSize"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/dialogCloseButton"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:backgroundTint="@color/colorDanger"
             android:contentDescription="@string/dialog_close"
             android:src="@drawable/cross"
-            android:backgroundTint="@color/colorDanger"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_edit_variable.xml b/app/src/main/res/layout/dialog_edit_variable.xml
index ab67f5c..ff84b47 100644
--- a/app/src/main/res/layout/dialog_edit_variable.xml
+++ b/app/src/main/res/layout/dialog_edit_variable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -7,7 +8,9 @@
         android:id="@+id/textView5"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/variable_name" />
+        android:gravity="center|center_horizontal|center_vertical"
+        android:text="@string/variable_name"
+        android:textColor="@color/dialogLabel" />
 
     <EditText
         android:id="@+id/variableName"
@@ -21,10 +24,12 @@
         android:id="@+id/textView6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/variable_type" />
+        android:gravity="center|center_horizontal|center_vertical"
+        android:text="@string/variable_type"
+        android:textColor="@color/dialogLabel" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName3"
+        android:id="@+id/variableType"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
@@ -35,16 +40,25 @@
         android:id="@+id/textView7"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/variable_value" />
+        android:gravity="center|center_horizontal|center_vertical"
+        android:text="@string/variable_value"
+        android:textColor="@color/dialogLabel" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName4"
+        android:id="@+id/variableValue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
         android:hint="@string/variable_value"
         android:inputType="textPersonName" />
 
+    <Switch
+        android:id="@+id/variableValueBoolean"
+        style="@style/ToggleButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/variable_value" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_editor.xml b/app/src/main/res/layout/fragment_editor.xml
index 90b5b6b..48f22e8 100644
--- a/app/src/main/res/layout/fragment_editor.xml
+++ b/app/src/main/res/layout/fragment_editor.xml
@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ui.editor.EditorFragment">
 
     <TextView
         android:id="@+id/text_editor"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:textAlignment="center" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="TODO" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 7ca6a0e..ea9791f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,22 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ui.search.SearchFragment">
 
-    <TextView
-        android:id="@+id/text_search"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:background="@color/list_even"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/search_query"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ems="10"
+            android:hint="@string/search"
+            android:inputType="textPersonName" />
+
+        <ImageButton
+            android:id="@+id/search"
+            style="@style/Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/search" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/search_results"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 71dcb95..854a6db 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -37,4 +37,5 @@
             android:layout_height="wrap_content"
             android:text="@string/settings_manage_configurations" />
     </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tacnet.xml b/app/src/main/res/layout/fragment_tacnet.xml
index 7857e60..44fc586 100644
--- a/app/src/main/res/layout/fragment_tacnet.xml
+++ b/app/src/main/res/layout/fragment_tacnet.xml
@@ -4,91 +4,106 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#FFFFFF"
     tools:context=".ui.tacnet.TACNETFragment">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/text_tacnet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:textAlignment="center"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:id="@+id/tacnet_connect"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/tacnet_connect" />
-
-            <TextView
-                android:id="@+id/textView2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/tacnet_hostname" />
-
-            <EditText
-                android:id="@+id/editTextTextPersonName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/tacnet_hostname"
-                android:inputType="textPersonName" />
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/tacnet_port" />
-
-            <EditText
-                android:id="@+id/port"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/tacnet_port"
-                android:inputType="textPersonName" />
-
-            <Button
-                android:id="@+id/connect"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/tacnet_connect" />
-        </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/textView4"
+            <LinearLayout
+                android:id="@+id/tacnet_connect"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/tacnet_server" />
+                android:layout_marginLeft="48dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="48dp"
+                android:layout_marginBottom="24dp"
+                android:background="@color/list_even"
+                android:orientation="vertical"
+                android:padding="16dp">
 
-            <Button
-                android:id="@+id/button2"
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center|center_horizontal|center_vertical"
+                    android:text="@string/tacnet_connect"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/tacnet_hostname" />
+
+                <EditText
+                    android:id="@+id/editTextTextPersonName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/tacnet_hostname"
+                    android:inputType="textUri" />
+
+                <TextView
+                    android:id="@+id/textView3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center|center_horizontal|center_vertical"
+                    android:text="@string/tacnet_port" />
+
+                <EditText
+                    android:id="@+id/port"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/tacnet_port"
+                    android:inputType="number" />
+
+                <Button
+                    android:id="@+id/connect"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/tacnet_connect" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/tacnet_server"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/tacnet_start_server" />
+                android:layout_marginLeft="48dp"
+                android:layout_marginRight="48dp"
+                android:layout_marginBottom="24dp"
+                android:background="@color/list_even"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/tacnet_server"
+                    android:textStyle="bold" />
+
+                <Button
+                    android:id="@+id/tacnet_start_server"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/tacnet_start_server" />
+            </LinearLayout>
+
         </LinearLayout>
-    </LinearLayout>
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a03fda0..33585c8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,8 +18,12 @@
     <color name="list_even">#555</color>
     <color name="list_odd">#999</color>
 
-    <color name="dialogBackground">#eee</color>
+    <color name="tacnetPrimary">#003f7f</color>
+    <color name="tacnetSecondary">#007f7f</color>
+
+    <color name="dialogBackground">#ddd</color>
     <color name="dialogTitle">#fff</color>
+    <color name="dialogLabel">#222</color>
     <color name="dialogCloseColor">#222</color>
     <color name="dialogAlert">#f80</color>
     <color name="dialogError">@color/colorDanger</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e00c2dd..da408f9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,16 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="button_padding_left">16dp</dimen>
+    <dimen name="button_padding_right">16dp</dimen>
+    <dimen name="button_padding_top">8dp</dimen>
+    <dimen name="button_padding_bottom">8dp</dimen>
+
+    <dimen name="button_margin_left">8dp</dimen>
+    <dimen name="button_margin_right">8dp</dimen>
+    <dimen name="button_margin_top">8dp</dimen>
+    <dimen name="button_margin_bottom">8dp</dimen>
+
+    <dimen name="dialogTitleTextSize">18dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 160625d..952be86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,8 @@
     <string name="settings_manage_presets">Manage Presets</string>
     <string name="settings_manage_configurations">Manage Configurations</string>
 
+    <string name="search">Search</string>
+
     <string name="dialog_close">Close</string>
     <string name="dialog_cancel">Cancel</string>
     <string name="dialog_okay">Okay</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0b473fa..b25298e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,11 +6,13 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
 
-        <item name="buttonStyle">@style/Button</item>
-        <item name="android:textColor">#000</item>
-        <item name="bottomNavigationStyle">@style/NavigationBar</item>
+        <item name="android:textColor">#fff</item>
         <item name="android:fontFamily">@font/dejavusans_condensed_fontfamily</item>
+
+        <item name="buttonStyle">@style/Button</item>
+        <item name="bottomNavigationStyle">@style/NavigationBar</item>
         <item name="editTextStyle">@style/TextInput</item>
+        <item name="switchStyle">@style/ToggleButton</item>
     </style>
 
     <style name="NavigationBar" parent="Widget.Design.BottomNavigationView">
@@ -30,6 +32,19 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="ToggleButton" parent="Widget.AppCompat.CompoundButton.Switch">
+        <item name="android:background">@drawable/button</item>
+        <item name="android:textColor">@color/buttonContent</item>
+        <item name="android:fontFamily">@font/dejavusans_condensed_fontfamily</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingLeft">@dimen/button_padding_left</item>
+        <item name="android:paddingRight">@dimen/button_padding_right</item>
+        <item name="android:paddingTop">@dimen/button_padding_top</item>
+        <item name="android:paddingBottom">@dimen/button_padding_bottom</item>
+    </style>
+
     <style name="TextInput" parent="Widget.AppCompat.EditText">
         <item name="android:background">@drawable/button</item>
         <item name="android:textColor">#ffffff</item>