From 0a72437088b3e8387aa6ab77e20293bc2385788a Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Sun, 16 Feb 2020 22:18:38 +0100
Subject: update to sdk 29, migrate to androidx, new GUI

---
 app/src/main/res/layout/activity_setup.xml    | 45 ---------------------------
 app/src/main/res/layout/settings_activity.xml |  9 ++++++
 app/src/main/res/values/arrays.xml            |  3 ++
 app/src/main/res/values/colors.xml            |  6 ++--
 app/src/main/res/values/dimens.xml            |  2 ++
 app/src/main/res/values/strings.xml           | 13 ++++++++
 app/src/main/res/values/styles.xml            |  9 ++++++
 app/src/main/res/xml/root_preferences.xml     | 31 ++++++++++++++++++
 8 files changed, 70 insertions(+), 48 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_setup.xml
 create mode 100644 app/src/main/res/layout/settings_activity.xml
 create mode 100644 app/src/main/res/values/arrays.xml
 create mode 100644 app/src/main/res/values/dimens.xml
 create mode 100644 app/src/main/res/xml/root_preferences.xml

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

diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
deleted file mode 100644
index 9512149..0000000
--- a/app/src/main/res/layout/activity_setup.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout 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"
-    tools:context=".SetupActivity">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.19">
-
-        <Button
-            android:id="@+id/btnStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="onStartClick"
-            android:text="@string/action_start" />
-
-        <Space
-            android:layout_width="75dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/btnStop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="onStopClick"
-            android:text="@string/action_stop" />
-
-    </LinearLayout>
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
new file mode 100644
index 0000000..de6591a
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,9 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..6b30d8d
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,3 @@
+<resources>
+
+</resources>
\ 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 69b2233..d044e23 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="colorPrimary">#2196F3</color>
+    <color name="colorPrimaryDark">#3F51B5</color>
+    <color name="colorAccent">#00BCD4</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..8542005
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,2 @@
+<resources>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c0ca47..bf12595 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,5 +7,18 @@
     <string name="action_start">Start</string>
     <string name="action_stop">Stop</string>
 
+    <string name="toast_no_mirror_permission">Cannot continue without broadcast screen permission</string>
     <string name="toast_no_input_service">Accessibility service not enabled: clients will not be able to control</string>
+
+    <!-- Settings activity -->
+    <string name="settings_category_main">Main</string>
+    <string name="settings_enable_key" translatable="false">enable</string>
+    <string name="settings_enable_title">Enable server</string>
+    <string name="settings_status_key" translatable="false">status</string>
+    <string name="status_server_enabled">Server enabled</string>
+    <string name="status_server_addresses">Server addresses:</string>
+    <plurals name="status_num_clients">
+        <item quantity="one">%d client connected.</item>
+        <item quantity="other">%d clients connected.</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..545b9c6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,4 +8,13 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
new file mode 100644
index 0000000..daedcc8
--- /dev/null
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Copyright 2018 The app Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory app:title="@string/settings_category_main">
+        <SwitchPreferenceCompat
+            app:key="@string/settings_enable_key"
+            app:title="@string/settings_enable_title"
+            app:persistent="false" />
+
+        <Preference
+            app:key="status"
+            app:title=""
+            app:persistent="false"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>
-- 
cgit v1.2.3