status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix redbox style 

Differential Revision: D6689447

fbshipit-source-id: de6b1295e53c46bdf99f0f4a26130f516763ee66
This commit is contained in:
Andrew Chen (Eng) 2018-01-11 15:20:18 -08:00 committed by Facebook Github Bot
parent e3c27f585a
commit f363dfe766
2 changed files with 85 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
ReactAndroid/src/main/res/devsupport/layout/redbox_view.xml
View File

@ -1,109 +1,79 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <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_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_weight="1" android:orientation="vertical"
/> android:background="#E80000"
<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 <ListView
android:id="@+id/rn_redbox_loading_indicator" android:id="@+id/rn_redbox_stack"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
style="@android:style/Widget.ProgressBar.Small" android:layout_weight="1"
android:indeterminateOnly="true" android:divider="@null"
android:visibility="gone" android:dividerHeight="0dp"
android:paddingLeft="16dp" />
/> <View
<TextView android:id="@+id/rn_redbox_line_separator"
android:id="@+id/rn_redbox_report_label" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:background="@android:color/darker_gray"
android:textColor="@android:color/white" android:visibility="gone"
android:textSize="14sp" />
android:fontFamily="monospace" <LinearLayout
android:visibility="gone" android:layout_width="match_parent"
android:paddingTop="16dp" android:layout_height="wrap_content"
android:paddingBottom="16dp" android:orientation="horizontal"
android:paddingLeft="16dp" >
android:paddingRight="16dp" <ProgressBar
android:lineSpacingExtra="4dp" android:id="@+id/rn_redbox_loading_indicator"
/> android:layout_width="wrap_content"
</LinearLayout> android:layout_height="match_parent"
<LinearLayout style="@android:style/Widget.ProgressBar.Small"
android:layout_width="match_parent" android:indeterminateOnly="true"
android:layout_height="wrap_content" android:visibility="gone"
android:orientation="horizontal" android:paddingLeft="16dp"
> />
<Button <TextView
android:id="@+id/rn_redbox_dismiss_button" android:id="@+id/rn_redbox_report_label"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:textColor="@android:color/white"
android:layout_margin="4dp" android:textSize="14sp"
android:text="@string/catalyst_dismiss_button" android:fontFamily="monospace"
android:textColor="@android:color/white" android:visibility="gone"
android:textSize="14sp" android:paddingTop="16dp"
android:alpha="0.5" android:paddingBottom="16dp"
style="?android:attr/borderlessButtonStyle" android:paddingLeft="16dp"
android:gravity="center_horizontal|top" android:paddingRight="16dp"
/> android:lineSpacingExtra="4dp"
<Button />
android:id="@+id/rn_redbox_reload_button" </LinearLayout>
android:layout_width="0dp" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_margin="4dp" android:orientation="horizontal"
android:text="@string/catalyst_reload_button" >
android:textColor="@android:color/white" <Button
android:textSize="14sp" android:id="@+id/rn_redbox_dismiss_button"
android:alpha="0.5" android:text="@string/catalyst_dismiss_button"
style="?android:attr/borderlessButtonStyle" style="@style/redboxButton"
android:gravity="center_horizontal|top" />
/> <Button
<Button android:id="@+id/rn_redbox_reload_button"
android:id="@+id/rn_redbox_copy_button" android:text="@string/catalyst_reload_button"
android:layout_width="0dp" style="@style/redboxButton"
android:layout_height="wrap_content" />
android:layout_weight="1" <Button
android:layout_margin="4dp" android:id="@+id/rn_redbox_copy_button"
android:text="@string/catalyst_copy_button" android:text="@string/catalyst_copy_button"
android:textColor="@android:color/white" style="@style/redboxButton"
android:textSize="14sp" />
android:alpha="0.5" <Button
style="?android:attr/borderlessButtonStyle" android:id="@+id/rn_redbox_report_button"
android:gravity="center_horizontal|top" android:text="@string/catalyst_report_button"
/> android:visibility="gone"
<Button style="@style/redboxButton"
android:id="@+id/rn_redbox_report_button" />
android:layout_width="0dp" </LinearLayout>
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>
</LinearLayout> </LinearLayout>

12
ReactAndroid/src/main/res/devsupport/values/styles.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme"/> <style name="Theme" />
<style name="Theme.Catalyst"/> <style name="Theme.Catalyst"/>
<style name="Theme.Catalyst.RedBox"> <style name="Theme.Catalyst.RedBox">
<item name="android:windowBackground">@color/catalyst_redbox_background</item> <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:windowEnterAnimation">@anim/catalyst_push_up_in</item>
<item name="android:windowExitAnimation">@anim/catalyst_push_up_out</item> <item name="android:windowExitAnimation">@anim/catalyst_push_up_out</item>
</style> </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> </resources>