Move timestamp dialog's shortcuts and remove their drawables

Author: nevenz

app/src/main/res/drawable-hdpi/cic_next_week_black_36dp.png

@@ -30,10 +30,9 @@
                 android:id="@+id/date_picker_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
                 android:layout_marginStart="4dp"
                 android:layout_marginLeft="4dp"
-                app:layout_constraintTop_toBottomOf="@+id/tomorrow_button"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 android:textSize="?attr/font_micro"
                 android:textAllCaps="true"
@@ -55,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                app:layout_constraintTop_toBottomOf="@+id/date_picker_button"
+                app:layout_constraintTop_toBottomOf="@+id/tomorrow_button"
                 app:layout_constraintStart_toStartOf="@+id/date_picker_label"
                 android:textSize="?attr/font_micro"
                 android:textAllCaps="true"
@@ -179,44 +178,37 @@
 
             <!-- Shortcuts -->
 
-            <Button
-                android:id="@+id/tomorrow_button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:drawableTop="?attr/oic_tomorrow_36dp"
-                android:text="@string/tomorrow"
-                android:singleLine="true"
-                app:layout_constraintStart_toEndOf="@+id/today_button"
-                app:layout_constraintEnd_toStartOf="@+id/next_week_button"
-                app:layout_constraintTop_toTopOf="parent" />
-
             <Button
                 android:id="@+id/today_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="?attr/oic_today_36dp"
                 android:text="@string/today"
                 android:singleLine="true"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 app:layout_constraintBottom_toBottomOf="@+id/tomorrow_button"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/tomorrow_button"
-                app:layout_constraintTop_toTopOf="@+id/tomorrow_button" />
+                app:layout_constraintTop_toBottomOf="@id/date_picker_button" />
+
+            <Button
+                android:id="@+id/tomorrow_button"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/tomorrow"
+                android:singleLine="true"
+                app:layout_constraintStart_toEndOf="@+id/today_button"
+                app:layout_constraintEnd_toStartOf="@+id/next_week_button"
+                app:layout_constraintTop_toBottomOf="@id/date_picker_button" />
 
             <Button
                 android:id="@+id/next_week_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="?attr/oic_next_week_36dp"
                 android:text="@string/next_week"
                 android:singleLine="true"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
                 app:layout_constraintBottom_toBottomOf="@+id/tomorrow_button"
                 app:layout_constraintStart_toEndOf="@id/tomorrow_button"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/tomorrow_button"
+                app:layout_constraintTop_toBottomOf="@id/date_picker_button"
                 app:layout_constraintVertical_bias="0.0" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/drawable-hdpi/cic_next_week_white_36dp.png

@@ -151,9 +151,6 @@
         <attr name="oic_new_above_24dp" format="reference"/>
         <attr name="oic_new_below_24dp" format="reference"/>
         <attr name="oic_new_under_24dp" format="reference"/>
-        <attr name="oic_next_week_36dp" format="reference"/>
-        <attr name="oic_today_36dp" format="reference"/>
-        <attr name="oic_tomorrow_36dp" format="reference"/>
 
         <attr name="active_focused_icon_alpha" format="float"/>
         <attr name="oic_item_alpha" format="float"/>

app/src/main/res/drawable-hdpi/cic_today_black_36dp.png

@@ -173,9 +173,6 @@
         <item name="oic_new_above_24dp">@drawable/cic_new_above_black_24dp</item>
         <item name="oic_new_below_24dp">@drawable/cic_new_below_black_24dp</item>
         <item name="oic_new_under_24dp">@drawable/cic_new_under_black_24dp</item>
-        <item name="oic_next_week_36dp">@drawable/cic_next_week_black_36dp</item>
-        <item name="oic_today_36dp">@drawable/cic_today_black_36dp</item>
-        <item name="oic_tomorrow_36dp">@drawable/cic_tomorrow_black_36dp</item>
 
         <item name="active_focused_icon_alpha">0.87</item>
         <item name="oic_item_alpha">0.54</item>
@@ -341,9 +338,6 @@
         <item name="oic_new_above_24dp">@drawable/cic_new_above_white_24dp</item>
         <item name="oic_new_below_24dp">@drawable/cic_new_below_white_24dp</item>
         <item name="oic_new_under_24dp">@drawable/cic_new_under_white_24dp</item>
-        <item name="oic_next_week_36dp">@drawable/cic_next_week_white_36dp</item>
-        <item name="oic_today_36dp">@drawable/cic_today_white_36dp</item>
-        <item name="oic_tomorrow_36dp">@drawable/cic_tomorrow_white_36dp</item>
 
         <item name="active_focused_icon_alpha">1</item>
         <item name="oic_item_alpha">0.70</item>