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

Commit a7aa21dc authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

Merge branch '7012-r-fix-calendar-ui-regression' into 'v1-r' 

fix: Improve Calendar's monthly view UI

See merge request !50
parents 5bb94e78 8ae48f70

res/layout-sw600dp/full_month_header.xml

+29 −21
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



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

    xmlns:tools="http://schemas.android.com/tools"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -26,59 +27,66 @@ 
        android:gravity="left"

        android:visibility="gone" />



    <TextView android:id="@+id/d0_label"

    <TextView

        android:id="@+id/d0_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d1_label"

    <TextView

        android:id="@+id/d1_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d2_label"

    <TextView

        android:id="@+id/d2_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d3_label"

    <TextView

        android:id="@+id/d3_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d4_label"

    <TextView

        android:id="@+id/d4_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d5_label"

    <TextView

        android:id="@+id/d5_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d6_label"

    <TextView

        android:id="@+id/d6_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />

</LinearLayout>

res/layout/full_month_header.xml

+33 −24
Original line number Diff line number Diff line
@@ -15,70 +15,79 @@ 
-->



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

    xmlns:tools="http://schemas.android.com/tools"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="16dip"

    android:layout_height="wrap_content"

    android:background="@color/date_strip_bg">



    <TextView android:id="@+id/wk_label"

    <TextView

        android:id="@+id/wk_label"

        android:layout_width="24dip"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:gravity="center_horizontal"

        android:visibility="gone" />



    <TextView android:id="@+id/d0_label"

    <TextView

        android:id="@+id/d0_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d1_label"

    <TextView

        android:id="@+id/d1_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d2_label"

    <TextView

        android:id="@+id/d2_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d3_label"

    <TextView

        android:id="@+id/d3_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d4_label"

    <TextView

        android:id="@+id/d4_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d5_label"

    <TextView

        android:id="@+id/d5_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />



    <TextView android:id="@+id/d6_label"

    <TextView

        android:id="@+id/d6_label"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:gravity="right"

        android:gravity="center_horizontal"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_DayLabel" />

</LinearLayout>

res/layout/mini_month_header.xml

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



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

    xmlns:tools="http://schemas.android.com/tools"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -32,6 +33,7 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />



    <TextView android:id="@+id/d1_label"
@@ -39,6 +41,7 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />



    <TextView android:id="@+id/d2_label"
@@ -46,6 +49,7 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />



    <TextView android:id="@+id/d3_label"
@@ -53,6 +57,7 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />



    <TextView android:id="@+id/d4_label"
@@ -60,6 +65,7 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />



    <TextView android:id="@+id/d5_label"
@@ -67,6 +73,7 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />



    <TextView android:id="@+id/d6_label"
@@ -74,5 +81,6 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center"

        tools:text="@tools:sample/date/day_of_week"

        style="@style/TextAppearance.MonthView_MiniDayLabel" />

</LinearLayout>

res/values-w600dp-h879dp/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
-->

<resources>



    <dimen name="day_label_text_size">14sp</dimen>

    <dimen name="day_label_text_size">16sp</dimen>

    <dimen name="day_number_text_size">16sp</dimen>

    <dimen name="all_day_bottom_margin">10dip</dimen>

    <dimen name="one_day_header_height">0dip</dimen>

    <dimen name="day_header_bottom_margin">6dip</dimen>

res/values-w960dp-h527dp/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
-->

<resources>



    <dimen name="day_label_text_size">14sp</dimen>

    <dimen name="day_label_text_size">16sp</dimen>

    <dimen name="day_number_text_size">16sp</dimen>

    <dimen name="all_day_bottom_margin">10dip</dimen>

    <dimen name="one_day_header_height">0dip</dimen>

    <dimen name="day_header_bottom_margin">6dip</dimen>