Skip to content

Commit c096d02

Browse files
committed
UI tweaks: add rounded card corners, don't zoom selected siderbar header, rounded search box
1 parent 817ca5c commit c096d02

File tree

6 files changed

+28
-7
lines changed

6 files changed

+28
-7
lines changed

leanback-1.0.0/src/main/java/androidx/leanback/widget/FocusHighlightHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@ public static void setupHeaderItemFocusHighlight(VerticalGridView gridView,
244244
* @see HeadersFragment#getBridgeAdapter()
245245
*/
246246
public static void setupHeaderItemFocusHighlight(ItemBridgeAdapter adapter) {
247-
setupHeaderItemFocusHighlight(adapter, true);
247+
// MOD: disable focus zoom of the sidebar headers
248+
//setupHeaderItemFocusHighlight(adapter, true);
249+
setupHeaderItemFocusHighlight(adapter, false);
248250
}
249251

250252
/**

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/presenter/VideoCardPresenter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public void setSelected(boolean selected) {
8484
cardView.enableBadge(isBadgeEnabled());
8585
cardView.enableTitle(isTitleEnabled());
8686
cardView.enableContent(isContentEnabled());
87+
cardView.setBackgroundColor(mDefaultBackgroundColor); // background is temporarily visible during animations
8788
updateCardBackgroundColor(cardView, false);
8889
return new ViewHolder(cardView);
8990
}
@@ -94,7 +95,9 @@ private void updateCardBackgroundColor(ComplexImageCardView view, boolean select
9495

9596
// Both background colors should be set because the view's
9697
// background is temporarily visible during animations.
97-
view.setBackgroundColor(backgroundColor);
98+
// NOTE: has visual bug with rounded corners
99+
//view.setBackgroundColor(backgroundColor);
100+
98101
View infoField = view.findViewById(R.id.info_field);
99102
if (infoField != null) {
100103
infoField.setBackgroundColor(backgroundColor);

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/util/ViewUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public class ViewUtil {
3232
/**
3333
* Focused card zoom factor
3434
*/
35-
public static final int FOCUS_ZOOM_FACTOR = FocusHighlight.ZOOM_FACTOR_SMALL;
35+
//public static final int FOCUS_ZOOM_FACTOR = FocusHighlight.ZOOM_FACTOR_SMALL;
36+
public static final int FOCUS_ZOOM_FACTOR = FocusHighlight.ZOOM_FACTOR_NONE;
3637
/**
3738
* Dim focused card?
3839
*/
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
2+
<solid android:color="#EEEEEE"/>
3+
4+
<corners android:radius="10dp"/>
5+
6+
<padding
7+
android:left="6dp"
8+
android:top="6dp"
9+
android:right="6dp"
10+
android:bottom="6dp"/>
11+
</shape>

smarttubetv/src/main/res/layout/lb_search_bar.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<requestFocus/>
3131
</androidx.leanback.widget.SpeechOrbView>
3232

33+
<!-- MOD: rounded search bg (old value: lb_in_app_search_bg) -->
3334
<RelativeLayout
3435
android:id="@+id/lb_search_bar_items"
3536
android:layout_width="@dimen/lb_search_bar_items_width"
@@ -39,7 +40,7 @@
3940
android:layout_marginStart="@dimen/lb_search_bar_items_margin_start"
4041
android:layout_marginTop="@dimen/lb_search_bar_inner_margin_top"
4142
android:layout_marginBottom="@dimen/lb_search_bar_inner_margin_bottom"
42-
android:background="@drawable/lb_in_app_search_bg"
43+
android:background="@drawable/rounded_search_bg"
4344
>
4445

4546
<ImageView

smarttubetv/src/main/res/values/dimens.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,17 @@
7272
<dimen name="lb_browse_title_height">50dp</dimen>
7373

7474
<!--
75-
Making my card's corner rounded. More info:
75+
MOD: Making card's corner rounded. More info:
7676
https://stackoverflow.com/questions/42623677/android-tv-verticalgridfragment-shadow-dimension-and-color
7777
https://developer.android.com/reference/androidx/leanback/widget/ShadowOverlayHelper
7878
https://developer.android.com/reference/kotlin/androidx/leanback/widget/ListRowPresenter#arechildroundedcornersenabled
7979
You can also override ShadowOverlayHelper.Options createShadowOverlayOptions() in
8080
ListRowPresenter which gives you some ability to change corner radius and focused and unfocused z.
8181
-->
82-
<!--<dimen name="lb_rounded_rect_corner_radius">5dp</dimen>-->
82+
<dimen name="lb_rounded_rect_corner_radius">12dp</dimen>
83+
84+
<!-- MOD: don't zoom SearchOrbView -->
85+
<!--<item name="lb_search_orb_focused_zoom" type="fraction">100%</item>-->
8386

8487
<!--
8588
Space between cards. Origin: 8dp More info:
@@ -117,7 +120,7 @@
117120
<dimen name="activity_horizontal_margin">16dp</dimen>
118121
<dimen name="activity_vertical_margin">16dp</dimen>
119122

120-
<!-- Tooltip mod: extracted private values -->
123+
<!-- Tooltip MOD: extracted private values -->
121124
<dimen name="tooltip_corner_radius_mod">20dp</dimen>
122125
<dimen name="tooltip_horizontal_padding_mod">16dp</dimen>
123126
<dimen name="tooltip_margin_mod">8dp</dimen>

0 commit comments

Comments
 (0)