From 3ef75e60fef1f16d6a97c3b4ad80c45e362b82ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 11:42:06 +0200
Subject: Danger on resources split into debug and release.

New provider dialog resources use danger_on checkbox in debug, but not in release.
This kind of solutions forces us to maintain 2 different codebases for the same class, so beware for next updates.

Next step: split java code.
---
 .../res/layout-xlarge/new_provider_dialog.xml      | 26 ++++++++++++++++++++++
 .../src/debug/res/layout/new_provider_dialog.xml   | 24 ++++++++++++++++++++
 bitmask_android/src/debug/res/values/strings.xml   |  4 ++++
 .../main/res/layout-xlarge/new_provider_dialog.xml | 26 ----------------------
 .../src/main/res/layout/new_provider_dialog.xml    | 24 --------------------
 .../res/layout-xlarge/new_provider_dialog.xml      | 19 ++++++++++++++++
 .../src/release/res/layout/new_provider_dialog.xml | 18 +++++++++++++++
 7 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml
 create mode 100644 bitmask_android/src/debug/res/layout/new_provider_dialog.xml
 create mode 100644 bitmask_android/src/debug/res/values/strings.xml
 delete mode 100644 bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml
 delete mode 100644 bitmask_android/src/main/res/layout/new_provider_dialog.xml
 create mode 100644 bitmask_android/src/release/res/layout-xlarge/new_provider_dialog.xml
 create mode 100644 bitmask_android/src/release/res/layout/new_provider_dialog.xml

diff --git a/bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml b/bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml
new file mode 100644
index 00000000..fc7d84ab
--- /dev/null
+++ b/bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:textSize="24sp" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:textSize="24sp"
+        android:hint="@string/new_provider_uri" />
+
+    <CheckBox
+        android:id="@+id/danger_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="24sp"
+        android:text="@string/danger_checkbox" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bitmask_android/src/debug/res/layout/new_provider_dialog.xml b/bitmask_android/src/debug/res/layout/new_provider_dialog.xml
new file mode 100644
index 00000000..19b8f442
--- /dev/null
+++ b/bitmask_android/src/debug/res/layout/new_provider_dialog.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:hint="@string/new_provider_uri" />
+
+    <CheckBox
+        android:id="@+id/danger_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/danger_checkbox" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bitmask_android/src/debug/res/values/strings.xml b/bitmask_android/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..3e568115
--- /dev/null
+++ b/bitmask_android/src/debug/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="danger_checkbox">Skip security check</string>
+</resources>
diff --git a/bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml b/bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml
deleted file mode 100644
index fc7d84ab..00000000
--- a/bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:textSize="24sp" >
-    
-    <EditText
-        android:id="@+id/new_provider_url"
-        android:inputType="textUri"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:textSize="24sp"
-        android:hint="@string/new_provider_uri" />
-
-    <CheckBox
-        android:id="@+id/danger_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:text="@string/danger_checkbox" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/bitmask_android/src/main/res/layout/new_provider_dialog.xml b/bitmask_android/src/main/res/layout/new_provider_dialog.xml
deleted file mode 100644
index 19b8f442..00000000
--- a/bitmask_android/src/main/res/layout/new_provider_dialog.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-    
-    <EditText
-        android:id="@+id/new_provider_url"
-        android:inputType="textUri"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
-        android:hint="@string/new_provider_uri" />
-
-    <CheckBox
-        android:id="@+id/danger_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/danger_checkbox" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/bitmask_android/src/release/res/layout-xlarge/new_provider_dialog.xml b/bitmask_android/src/release/res/layout-xlarge/new_provider_dialog.xml
new file mode 100644
index 00000000..12616625
--- /dev/null
+++ b/bitmask_android/src/release/res/layout-xlarge/new_provider_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:textSize="24sp" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:textSize="24sp"
+        android:hint="@string/new_provider_uri" />
+
+</LinearLayout>
diff --git a/bitmask_android/src/release/res/layout/new_provider_dialog.xml b/bitmask_android/src/release/res/layout/new_provider_dialog.xml
new file mode 100644
index 00000000..36eb0d6a
--- /dev/null
+++ b/bitmask_android/src/release/res/layout/new_provider_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:hint="@string/new_provider_uri" />
+
+</LinearLayout>
-- 
cgit v1.2.3