Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Improve separator line quality and create a reusable style. #1377

Merged
merged 1 commit into from
Jul 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/separator_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:color="@color/iron_blur" android:width="0.5dp" />
<solid android:color="@color/iron"/>
</shape>
10 changes: 4 additions & 6 deletions app/src/main/res/layout/options_controller.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@

<View
android:id="@+id/separatorTop"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/backButton"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<ScrollView
android:id="@+id/scrollbar"
Expand Down Expand Up @@ -66,12 +65,11 @@

<View
android:id="@+id/separatorBottom"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_above="@+id/resetButton"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
android:id="@+id/resetButton"
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/res/layout/options_developer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@

<View
android:id="@+id/separatorTop"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/backButton"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<ScrollView
android:id="@+id/scrollbar"
Expand Down Expand Up @@ -83,12 +82,11 @@

<View
android:id="@+id/separatorBottom"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_above="@+id/resetButton"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
android:id="@+id/resetButton"
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/res/layout/options_display.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@

<View
android:id="@+id/separatorTop"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/backButton"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<ScrollView
android:id="@+id/scrollbar"
Expand Down Expand Up @@ -131,12 +130,11 @@

<View
android:id="@+id/separatorBottom"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_above="@+id/resetButton"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
android:id="@+id/resetButton"
Expand Down
11 changes: 4 additions & 7 deletions app/src/main/res/layout/options_environment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@

<View
android:id="@+id/separatorTop"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/backButton"
android:layout_marginBottom="0dp"
android:background="@color/iron" />
android:layout_marginBottom="0dp" />

<ScrollView
android:id="@+id/scrollbar"
style="@style/scrollbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingRight="15dp"
Expand Down Expand Up @@ -68,12 +66,11 @@

<View
android:id="@+id/separatorBottom"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_above="@+id/resetButton"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
android:id="@+id/resetButton"
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/res/layout/options_language.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@

<View
android:id="@+id/separatorTop"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/voice_search_language_title"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<TextView
android:id="@+id/voice_search_language_title"
Expand Down Expand Up @@ -69,12 +68,11 @@

<View
android:id="@+id/separatorBottom"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_above="@+id/resetButton"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
android:id="@+id/resetButton"
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/res/layout/options_privacy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@

<View
android:id="@+id/separatorTop"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/backButton"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<ScrollView
android:id="@+id/scrollbar"
Expand Down Expand Up @@ -108,12 +107,11 @@

<View
android:id="@+id/separatorBottom"
style="?attr/separatorStyle"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_above="@+id/resetButton"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/iron" />
android:layout_marginBottom="10dp" />

<org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
android:id="@+id/resetButton"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/setting_radio_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/iron" />
style="?attr/separatorStyle" />
</LinearLayout>
</merge>
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<color name="blackberry">#25003e</color>
<color name="tangerine">#ff921e</color>
<color name="iron">#5d5d5d</color>
<color name="iron_blur">#805d5d5d</color>
<color name="rhino">#8c898a</color>
<color name="geranium">#d73e5a</color>
<color name="text_shadow">#8F000000</color>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
<attr name="mediaControlsButtonStyle" format="reference" />
<attr name="navigationBarTextButtonStyle" format="reference" />
<attr name="navigationBarButtonTint" format="reference" />
<attr name="separatorStyle" format="reference" />
<attr name="urlProtocolColor" format="color" />
<attr name="urlWebsiteColor" format="color" />
<attr name="scrollbarStyle" format="color" />

</declare-styleable>


Expand Down Expand Up @@ -49,6 +51,11 @@
<item name="android:padding">0dp</item>
</style>

<style name="separatorTheme">
<item name="android:background">@drawable/separator_background</item>
<item name="android:layout_height">1.5dp</item>
</style>

<style name="uiButtonTheme">
<item name="android:padding">@dimen/tray_icon_padding_max</item>
<item name="android:layout_gravity">center_vertical</item>
Expand Down Expand Up @@ -289,6 +296,7 @@
<item name="fullScreenFirstButtonStyle">@style/fullScreenFirstButtonTheme</item>
<item name="fullScreenLastButtonStyle">@style/fullScreenLastButtonTheme</item>
<item name="mediaControlsButtonStyle">@style/mediaControlsButtonTheme</item>
<item name="separatorStyle">@style/separatorTheme</item>
<item name="uiButtonStyle">@style/uiButtonTheme</item>
<item name="navigationBarTextButtonStyle">@style/navigationBarTextButtonTheme</item>
<item name="urlProtocolColor">@color/fog_url_protocol</item>
Expand Down