Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9af4b65f authored by wangqi's avatar wangqi Committed by Copybara-Service
Browse files

UI refresh for bottom nav bar. 

Bug: 73963403
Test: manual
PiperOrigin-RevId: 202535473
Change-Id: Iccb4e72c63cbf031399448ee2def5dcb3a152081
parent 53a52474

java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java

+3 −19
Original line number Diff line number Diff line
@@ -20,20 +20,18 @@ import android.content.Context; 
import android.content.res.ColorStateList;

import android.support.annotation.DrawableRes;

import android.support.annotation.Nullable;

import android.support.annotation.Px;

import android.support.annotation.StringRes;

import android.util.AttributeSet;

import android.view.View;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.RelativeLayout;

import android.widget.TextView;

import com.android.dialer.common.Assert;

import com.android.dialer.configprovider.ConfigProviderComponent;

import com.android.dialer.theme.base.ThemeComponent;



/** Navigation item in a bottom nav. */

final class BottomNavItem extends LinearLayout {

final class BottomNavItem extends RelativeLayout {



  private ImageView image;

  private TextView text;
@@ -57,7 +55,7 @@ final class BottomNavItem extends LinearLayout { 
    int colorId =

        selected

            ? ThemeComponent.get(getContext()).theme().getColorPrimary()

            : ThemeComponent.get(getContext()).theme().getTextColorSecondary();

            : ThemeComponent.get(getContext()).theme().getColorIcon();

    image.setImageTintList(ColorStateList.valueOf(colorId));

    text.setTextColor(colorId);

  }
@@ -87,20 +85,6 @@ final class BottomNavItem extends LinearLayout { 
      }

      notificationBadge.setVisibility(View.VISIBLE);

      notificationBadge.setText(countString);



      @Px int margin;

      if (countString.length() == 1) {

        margin = getContext().getResources().getDimensionPixelSize(R.dimen.badge_margin_length_1);

      } else if (countString.length() == 2) {

        margin = getContext().getResources().getDimensionPixelSize(R.dimen.badge_margin_length_2);

      } else {

        margin = getContext().getResources().getDimensionPixelSize(R.dimen.badge_margin_length_3);

      }



      FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) image.getLayoutParams();

      params.setMarginStart(margin);

      params.setMarginEnd(margin);

      image.setLayoutParams(params);

    }

  }

}

java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml

+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
  -->

<shape

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

  <solid android:color="?android:attr/colorPrimary"/>

  <corners android:radius="20dp"/>

  <stroke android:color="?android:attr/colorBackgroundFloating" android:width="2dp"/>

    android:shape="oval">

  <solid android:color="@color/dialer_red"/>

</shape>
 
 No newline at end of file

java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml

+27 −35
Original line number Diff line number Diff line
@@ -16,49 +16,41 @@ 
  -->

<com.android.dialer.main.impl.bottomnav.BottomNavItem

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="80dp"

    android:background="?android:attr/selectableItemBackgroundBorderless"

    android:minHeight="56dp"

    android:gravity="center"

    android:background="?android:attr/selectableItemBackgroundBorderless">



  <FrameLayout

      android:layout_width="wrap_content"

      android:layout_height="wrap_content">

    android:minWidth="80dp">



  <ImageView

      android:id="@+id/bottom_nav_item_image"

      android:layout_width="24dp"

      android:layout_height="24dp"

        android:layout_marginTop="8dp"/>

      android:layout_marginTop="8dp"

      android:layout_alignParentTop="true"

      android:layout_centerHorizontal="true"/>



  <TextView

      android:id="@+id/notification_badge"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="top|end"

      style="@style/Dialer.TextAppearance.OVERLINE"

      android:layout_width="16dp"

      android:layout_height="16dp"

      android:layout_marginTop="2dp"

        android:paddingStart="6dp"

        android:paddingEnd="6dp"

        android:paddingBottom="1dp"

        android:minHeight="20dp"

        android:minWidth="20dp"

        android:gravity="center"

        android:textSize="12sp"

        android:textColor="?android:attr/textColorPrimaryInverse"

      android:layout_marginStart="-8dp"

      android:layout_alignParentTop="true"

      android:layout_toEndOf="@id/bottom_nav_item_image"

      android:background="@drawable/notification_badge"

        android:fontFamily="sans-serif-medium"

      android:gravity="center"

      android:textColor="?android:attr/colorBackgroundFloating"

      android:textSize="11dp"

      android:visibility="invisible"/>

  </FrameLayout>



  <TextView

      android:id="@+id/bottom_nav_item_text"

      style="@style/Dialer.TextAppearance.SubHeader2"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      android:layout_marginBottom="8dp"

      android:gravity="center_horizontal"

      android:textSize="12sp"

      style="@style/Dialer.TextAppearance.Secondary"/>

      android:layout_below="@id/bottom_nav_item_image"

      android:layout_centerHorizontal="true"

      android:gravity="center_horizontal"/>

</com.android.dialer.main.impl.bottomnav.BottomNavItem>
 
 No newline at end of file

java/com/android/dialer/main/impl/bottomnav/res/values/dimens.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>

  <dimen name="badge_margin_length_1">10dp</dimen>

  <dimen name="badge_margin_length_2">14dp</dimen>

  <dimen name="badge_margin_length_3">22dp</dimen>

</resources>
 
 No newline at end of file

java/com/android/dialer/theme/common/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
  <color name="notification_action_dismiss">#A52714</color>

  <color name="notification_action_answer_video">#097138</color>



  <color name="dialer_red">#C53929</color>

  <color name="dialer_red">#EA4335</color>



  <!-- Legacy -->

  <color name="blue_grey_100">#CFD8DC</color>