removing the redundant xml rule in the portrait yearly view too

This commit is contained in:
tibbi 2020-05-17 10:28:20 +02:00
parent d59e124ad4
commit fbad874f5d

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TableLayout <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/calendar_holder" android:id="@+id/calendar_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -14,7 +13,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/yearly_padding_full" android:layout_marginEnd="@dimen/yearly_padding_full"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -24,14 +22,14 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/january" android:text="@string/january"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_1" android:id="@+id/month_1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/month_1_label" android:layout_below="@+id/month_1_label"
android:layout_centerInParent="true"/> android:layout_centerInParent="true" />
</RelativeLayout> </RelativeLayout>
@ -50,13 +48,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/february" android:text="@string/february"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_2" android:id="@+id/month_2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/month_2_label"/> android:layout_below="@+id/month_2_label" />
</RelativeLayout> </RelativeLayout>
@ -64,7 +62,6 @@
android:id="@+id/month_3_holder" android:id="@+id/month_3_holder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_marginStart="@dimen/yearly_padding_full" android:layout_marginStart="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
@ -75,13 +72,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/march" android:text="@string/march"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_3" android:id="@+id/month_3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/month_3_label"/> android:layout_below="@+id/month_3_label" />
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
@ -93,7 +90,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/yearly_padding_full" android:layout_marginEnd="@dimen/yearly_padding_full"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -103,14 +99,14 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/april" android:text="@string/april"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_4" android:id="@+id/month_4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_4_label" android:layout_below="@+id/month_4_label"
app:days="30"/> app:days="30" />
</RelativeLayout> </RelativeLayout>
@ -129,13 +125,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/may" android:text="@string/may"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_5" android:id="@+id/month_5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_5_label"/> android:layout_below="@+id/month_5_label" />
</RelativeLayout> </RelativeLayout>
@ -143,7 +139,6 @@
android:id="@+id/month_6_holder" android:id="@+id/month_6_holder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_marginStart="@dimen/yearly_padding_full" android:layout_marginStart="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
@ -154,14 +149,14 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/june" android:text="@string/june"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_6" android:id="@+id/month_6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_6_label" android:layout_below="@+id/month_6_label"
app:days="30"/> app:days="30" />
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
@ -172,7 +167,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/yearly_padding_full" android:layout_marginEnd="@dimen/yearly_padding_full"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -182,13 +176,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/july" android:text="@string/july"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_7" android:id="@+id/month_7"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_7_label"/> android:layout_below="@+id/month_7_label" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -206,13 +200,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/august" android:text="@string/august"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_8" android:id="@+id/month_8"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_8_label"/> android:layout_below="@+id/month_8_label" />
</RelativeLayout> </RelativeLayout>
@ -220,7 +214,6 @@
android:id="@+id/month_9_holder" android:id="@+id/month_9_holder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_marginStart="@dimen/yearly_padding_full" android:layout_marginStart="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
@ -231,14 +224,14 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/september" android:text="@string/september"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_9" android:id="@+id/month_9"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_9_label" android:layout_below="@+id/month_9_label"
app:days="30"/> app:days="30" />
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
@ -250,7 +243,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/yearly_padding_full" android:layout_marginEnd="@dimen/yearly_padding_full"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -260,13 +252,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/october" android:text="@string/october"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_10" android:id="@+id/month_10"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_10_label"/> android:layout_below="@+id/month_10_label" />
</RelativeLayout> </RelativeLayout>
@ -285,23 +277,21 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/november" android:text="@string/november"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_11" android:id="@+id/month_11"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_11_label" android:layout_below="@+id/month_11_label"
android:layout_marginLeft="@dimen/yearly_month_padding"
android:layout_marginStart="@dimen/yearly_month_padding" android:layout_marginStart="@dimen/yearly_month_padding"
app:days="30"/> app:days="30" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_12_holder" android:id="@+id/month_12_holder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_marginStart="@dimen/yearly_padding_full" android:layout_marginStart="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
@ -312,13 +302,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/december" android:text="@string/december"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.calendar.pro.views.SmallMonthView <com.simplemobiletools.calendar.pro.views.SmallMonthView
android:id="@+id/month_12" android:id="@+id/month_12"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/month_12_label"/> android:layout_below="@+id/month_12_label" />
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>