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

Add shadow and improve text quality on widgets #961

Merged
merged 1 commit into from
Feb 22, 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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.mozilla.vrbrowser.ui.widgets;

import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.MotionEvent;
Expand Down Expand Up @@ -158,11 +159,13 @@ public boolean onHover(View view, MotionEvent event) {
case MotionEvent.ACTION_HOVER_ENTER:
view.setHovered(true);
label.setHovered(true);
label.setShadowLayer(label.getShadowRadius(), label.getShadowDx(), label.getShadowDy(), getContext().getColor(R.color.text_shadow_light));
image.setHovered(true);
return true;

case MotionEvent.ACTION_HOVER_EXIT:
view.setHovered(false);
label.setShadowLayer(label.getShadowRadius(), label.getShadowDx(), label.getShadowDy(), getContext().getColor(R.color.text_shadow));
label.setHovered(false);
image.setHovered(false);
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
return false;

View favicon = view.findViewById(R.id.favicon);
View title = view.findViewById(R.id.title);
TextView title = view.findViewById(R.id.title);
View url = view.findViewById(R.id.url);
View delete = view.findViewById(R.id.delete);
int ev = motionEvent.getActionMasked();
Expand All @@ -354,6 +354,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
view.setHovered(true);
favicon.setHovered(true);
title.setHovered(true);
title.setShadowLayer(title.getShadowRadius(), title.getShadowDx(), title.getShadowDy(), getContext().getColor(R.color.text_shadow_light));
url.setHovered(true);
delete.setHovered(true);
return true;
Expand All @@ -362,6 +363,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
view.setHovered(false);
favicon.setHovered(false);
title.setHovered(false);
title.setShadowLayer(title.getShadowRadius(), title.getShadowDx(), title.getShadowDy(), getContext().getColor(R.color.text_shadow));
url.setHovered(false);
delete.setHovered(false);
return true;
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/honeycomb_button.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
android:fontFamily="sans-serif-light"
android:gravity="center"
android:text="Secondary text"
android:textStyle="bold"
android:textSize="@dimen/text_smaller_size" />
</LinearLayout>
</merge>
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@
<color name="iron">#5d5d5d</color>
<color name="rhino">#8c898a</color>
<color name="geranium">#d73e5a</color>
<color name="text_shadow">#8F000000</color>
<color name="text_shadow_light">#7FFFFFFF</color>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/dimen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<dimen name="text_big_size">18sp</dimen>
<dimen name="text_medium_size">14sp</dimen>
<dimen name="text_small_size">12sp</dimen>
<dimen name="text_smaller_size">10sp</dimen>
<dimen name="text_smaller_size">11sp</dimen>

<!-- Popup Window -->
<item name="url_bar_popup_world_width" format="float" type="dimen">4</item>
Expand Down
18 changes: 18 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@
<attr name="scrollbarStyle" format="color" />
</declare-styleable>


<style name="ShadowTextViewStyle" parent="android:Widget.TextView">
<item name="android:shadowColor">@color/text_shadow</item>
<item name="android:shadowDx">2</item>
<item name="android:shadowDy">2</item>
<item name="android:shadowRadius">7</item>
</style>

<style name="ShadowLightTextViewStyle" parent="android:Widget.TextView">
<item name="android:shadowColor">@color/text_shadow_light</item>
<item name="android:shadowDx">2</item>
<item name="android:shadowDy">2</item>
<item name="android:shadowRadius">4</item>
</style>

<style name="radioButtonTheme">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
Expand Down Expand Up @@ -278,6 +293,9 @@
<item name="android:fastScrollOverlayPosition">atThumb</item>
<item name="android:smoothScrollbar">true</item>
<item name="android:overScrollMode">ifContentScrolls</item>

<!-- TextView Style -->
<item name="android:textViewStyle">@style/ShadowTextViewStyle</item>
</style>

<style name="Widget.FastScroll" parent="android:Widget.Material.FastScroll"/>
Expand Down