From f363dfe766244c8fc10eab3d2c4acdd8fc4b576b Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Thu, 11 Jan 2018 15:20:18 -0800
Subject: [PATCH] Fix redbox style

Differential Revision: D6689447

fbshipit-source-id: de6b1295e53c46bdf99f0f4a26130f516763ee66
---
 .../res/devsupport/layout/redbox_view.xml     | 178 ++++++++----------
 .../src/main/res/devsupport/values/styles.xml |  12 +-
 2 files changed, 85 insertions(+), 105 deletions(-)

diff --git a/ReactAndroid/src/main/res/devsupport/layout/redbox_view.xml b/ReactAndroid/src/main/res/devsupport/layout/redbox_view.xml
index 259cc2e2c82089..832ac4fb877e63 100644
--- a/ReactAndroid/src/main/res/devsupport/layout/redbox_view.xml
+++ b/ReactAndroid/src/main/res/devsupport/layout/redbox_view.xml
@@ -1,109 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="#E80000"
-  >
-  <ListView
-    android:id="@+id/rn_redbox_stack"
     android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    />
-  <View
-    android:id="@+id/rn_redbox_line_separator"
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="@android:color/darker_gray"
-    android:visibility="gone"
-    />
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    >
-    <ProgressBar
-      android:id="@+id/rn_redbox_loading_indicator"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      style="@android:style/Widget.ProgressBar.Small"
-      android:indeterminateOnly="true"
-      android:visibility="gone"
-      android:paddingLeft="16dp"
-      />
-    <TextView
-      android:id="@+id/rn_redbox_report_label"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="@android:color/white"
-      android:textSize="14sp"
-      android:fontFamily="monospace"
-      android:visibility="gone"
-      android:paddingTop="16dp"
-      android:paddingBottom="16dp"
-      android:paddingLeft="16dp"
-      android:paddingRight="16dp"
-      android:lineSpacingExtra="4dp"
-      />
-  </LinearLayout>
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#E80000"
     >
-    <Button
-      android:id="@+id/rn_redbox_dismiss_button"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_margin="4dp"
-      android:text="@string/catalyst_dismiss_button"
-      android:textColor="@android:color/white"
-      android:textSize="14sp"
-      android:alpha="0.5"
-      style="?android:attr/borderlessButtonStyle"
-      android:gravity="center_horizontal|top"
-    />
-    <Button
-      android:id="@+id/rn_redbox_reload_button"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_margin="4dp"
-      android:text="@string/catalyst_reload_button"
-      android:textColor="@android:color/white"
-      android:textSize="14sp"
-      android:alpha="0.5"
-      style="?android:attr/borderlessButtonStyle"
-      android:gravity="center_horizontal|top"
-    />
-    <Button
-      android:id="@+id/rn_redbox_copy_button"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_margin="4dp"
-      android:text="@string/catalyst_copy_button"
-      android:textColor="@android:color/white"
-      android:textSize="14sp"
-      android:alpha="0.5"
-      style="?android:attr/borderlessButtonStyle"
-      android:gravity="center_horizontal|top"
-    />
-    <Button
-      android:id="@+id/rn_redbox_report_button"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_margin="4dp"
-      android:text="@string/catalyst_report_button"
-      android:textColor="@android:color/white"
-      android:textSize="14sp"
-      android:alpha="0.5"
-      style="?android:attr/borderlessButtonStyle"
-      android:visibility="gone"
-      android:gravity="center_horizontal|top"
-    />
-  </LinearLayout>
+    <ListView
+        android:id="@+id/rn_redbox_stack"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        />
+    <View
+        android:id="@+id/rn_redbox_line_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@android:color/darker_gray"
+        android:visibility="gone"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <ProgressBar
+            android:id="@+id/rn_redbox_loading_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            style="@android:style/Widget.ProgressBar.Small"
+            android:indeterminateOnly="true"
+            android:visibility="gone"
+            android:paddingLeft="16dp"
+            />
+        <TextView
+            android:id="@+id/rn_redbox_report_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            android:fontFamily="monospace"
+            android:visibility="gone"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:lineSpacingExtra="4dp"
+            />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <Button
+            android:id="@+id/rn_redbox_dismiss_button"
+            android:text="@string/catalyst_dismiss_button"
+            style="@style/redboxButton"
+            />
+        <Button
+            android:id="@+id/rn_redbox_reload_button"
+            android:text="@string/catalyst_reload_button"
+            style="@style/redboxButton"
+            />
+        <Button
+            android:id="@+id/rn_redbox_copy_button"
+            android:text="@string/catalyst_copy_button"
+            style="@style/redboxButton"
+            />
+        <Button
+            android:id="@+id/rn_redbox_report_button"
+            android:text="@string/catalyst_report_button"
+            android:visibility="gone"
+            style="@style/redboxButton"
+            />
+    </LinearLayout>
 </LinearLayout>
diff --git a/ReactAndroid/src/main/res/devsupport/values/styles.xml b/ReactAndroid/src/main/res/devsupport/values/styles.xml
index 86409058ffc0f9..e9f462c5359d56 100644
--- a/ReactAndroid/src/main/res/devsupport/values/styles.xml
+++ b/ReactAndroid/src/main/res/devsupport/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="Theme"/>
+  <style name="Theme" />
   <style name="Theme.Catalyst"/>
   <style name="Theme.Catalyst.RedBox">
     <item name="android:windowBackground">@color/catalyst_redbox_background</item>
@@ -13,4 +13,14 @@
     <item name="android:windowEnterAnimation">@anim/catalyst_push_up_in</item>
     <item name="android:windowExitAnimation">@anim/catalyst_push_up_out</item>
   </style>
+  <style name="redboxButton">
+    <item name="android:layout_width">0dp</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:layout_margin">4dp</item>
+    <item name="android:background">@null</item>
+    <item name="android:gravity">center</item>
+    <item name="android:textColor">#dddddd</item>
+    <item name="android:textSize">14sp</item>
+  </style>
 </resources>