From 67abd14bb10a8425dfc0a596cb2ced7e9396df2d Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Wed, 5 May 2021 12:11:51 +0200
Subject: [PATCH] Bugfixes

---
 .../anotherwidget/helpers/ImageHelper.kt      |   2 +-
 .../helpers/MediaPlayerHelper.kt              |   2 +
 .../receivers/NotificationListener.kt         |   1 +
 .../ui/fragments/MainFragment.kt              |   2 +-
 .../ui/widgets/LeftAlignedWidget.kt           |   2 +-
 .../ui/widgets/StandardWidget.kt              |   3 +-
 .../res/layout/activity_media_info_format.xml |   5 +-
 .../main/res/layout/left_aligned_widget.xml   |  11 +-
 .../res/layout/left_aligned_widget_sans.xml   |   6 +-
 .../main/res/layout/right_aligned_widget.xml  | 280 ------------------
 .../res/layout/right_aligned_widget_sans.xml  | 173 -----------
 11 files changed, 14 insertions(+), 473 deletions(-)
 delete mode 100644 app/src/main/res/layout/right_aligned_widget.xml
 delete mode 100644 app/src/main/res/layout/right_aligned_widget_sans.xml

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt
index 257115d..d852137 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ImageHelper.kt
@@ -20,7 +20,7 @@ object ImageHelper {
             else -> 0f * factor
         }, resources.displayMetrics)
 
-        if (originalView.drawable != null) {
+        if (originalView.drawable != null && originalView.drawable.intrinsicWidth > 0 && originalView.drawable.intrinsicHeight > 0) {
             val btm = originalView.drawable.toBitmap().copy(Bitmap.Config.ARGB_8888, true)
             val comb = Bitmap.createBitmap(btm)
             val shadowBitmap = generateShadowBitmap(context, cElevation, btm, factor)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt
index cd51492..5d20eac 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt
@@ -33,12 +33,14 @@ object MediaPlayerHelper {
                     DEFAULT_MEDIA_INFO_FORMAT.replace(MEDIA_INFO_TITLE, title)
                         .replace(MEDIA_INFO_ARTIST, artist)
                         .replace(MEDIA_INFO_ALBUM, album)
+                        .replace("\\n", System.getProperty("line.separator") ?: " ")
                 }
             }
             else -> {
                 format.replace(MEDIA_INFO_TITLE, title)
                     .replace(MEDIA_INFO_ARTIST, artist)
                     .replace(MEDIA_INFO_ALBUM, album)
+                    .replace("\\n", System.getProperty("line.separator") ?: " ")
             }
         }
     }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt
index e86d2ba..6a6bcf1 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NotificationListener.kt
@@ -9,6 +9,7 @@ import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
 import android.util.Log
 import android.widget.Toast
+import com.google.gson.Gson
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
index c890ea7..5406549 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
@@ -45,7 +45,7 @@ class MainFragment : Fragment() {
     companion object {
         fun newInstance() = MainFragment()
         private val PREVIEW_BASE_HEIGHT: Int
-            get() = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 200
+            get() = if (Preferences.widgetAlign == Constants.WidgetAlign.CENTER.rawValue) 120 else 180
     }
 
     private lateinit var viewModel: MainViewModel
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt
index 5040072..6d89ea0 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/LeftAlignedWidget.kt
@@ -238,7 +238,7 @@ class LeftAlignedWidget(val context: Context) {
                 views.setViewVisibility(R.id.sub_line_top_margin_small_sans, View.GONE)
                 views.setViewVisibility(R.id.sub_line_top_margin_medium_sans, View.GONE)
                 views.setViewVisibility(R.id.sub_line_top_margin_large_sans, View.GONE)
-            } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) {
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
                 var showSomething = false
                 loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                     when (provider) {
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
index f9d3b7d..f4b2b79 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
@@ -8,6 +8,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
 import android.text.format.DateUtils
+import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
@@ -260,7 +261,7 @@ class StandardWidget(val context: Context) {
 
                 views.setViewVisibility(R.id.first_line_rect, View.GONE)
 
-            } else if (GlanceProviderHelper.showGlanceProviders(context) && bindingView.calendarLayout.isVisible) {
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
                 var showSomething = false
                 loop@ for (provider: Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                     when (provider) {
diff --git a/app/src/main/res/layout/activity_media_info_format.xml b/app/src/main/res/layout/activity_media_info_format.xml
index 5138a46..25c9526 100644
--- a/app/src/main/res/layout/activity_media_info_format.xml
+++ b/app/src/main/res/layout/activity_media_info_format.xml
@@ -110,10 +110,7 @@
                     app:textAllCaps="false"
                     android:gravity="center_vertical|start"
                     android:textAlignment="viewStart"
-                    android:maxLines="1"
-                    android:lines="1"
-                    android:singleLine="true"
-                    android:ellipsize="end"
+                    android:maxLines="2"
                     android:layout_marginLeft="32dp"
                     android:layout_marginRight="32dp" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/left_aligned_widget.xml b/app/src/main/res/layout/left_aligned_widget.xml
index 276fb0d..89ee934 100644
--- a/app/src/main/res/layout/left_aligned_widget.xml
+++ b/app/src/main/res/layout/left_aligned_widget.xml
@@ -1,7 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="vertical"
@@ -17,8 +16,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerVertical="true">
+        android:orientation="vertical">
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -141,7 +139,6 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
                 android:id="@+id/sub_line"
                 android:visibility="gone"
                 android:orientation="horizontal">
@@ -150,6 +147,7 @@
                     android:layout_height="wrap_content"
                     android:cropToPadding="false"
                     android:clipChildren="false"
+                    android:layout_marginTop="2dp"
                     android:layout_marginEnd="4dp">
                     <ImageView
                         android:layout_width="16dp"
@@ -169,9 +167,8 @@
                 <TextView
                     android:id="@+id/sub_line_text"
                     android:layout_width="wrap_content"
-                    android:ellipsize="end"
-                    android:lines="1"
-                    android:maxLines="1"
+                    android:gravity="start"
+                    android:maxLines="2"
                     android:includeFontPadding="false"
                     android:layout_height="wrap_content"
                     style="@style/AnotherWidget.Widget.Subtitle" />
diff --git a/app/src/main/res/layout/left_aligned_widget_sans.xml b/app/src/main/res/layout/left_aligned_widget_sans.xml
index e2f2311..131c28e 100644
--- a/app/src/main/res/layout/left_aligned_widget_sans.xml
+++ b/app/src/main/res/layout/left_aligned_widget_sans.xml
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:gravity="center_vertical"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:id="@+id/main_layout"
@@ -75,9 +74,7 @@
             android:layout_height="wrap_content">
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingTop="4dp">
+                android:layout_height="wrap_content">
                 <ImageView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -88,7 +85,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:alpha="0"
-                android:layout_centerVertical="true"
                 android:orientation="vertical">
                 <LinearLayout
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/right_aligned_widget.xml b/app/src/main/res/layout/right_aligned_widget.xml
deleted file mode 100644
index 5519290..0000000
--- a/app/src/main/res/layout/right_aligned_widget.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:id="@+id/main_layout">
-    <ProgressBar
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"
-        android:indeterminateTint="@color/colorPrimary"
-        android:id="@+id/loader" />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|end"
-        android:layout_centerVertical="true"
-        android:orientation="vertical"
-        android:id="@+id/date_layout">
-        <TextView
-            android:id="@+id/empty_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lines="1"
-            android:textColor="@color/colorPrimary"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:includeFontPadding="false"
-            style="@style/AnotherWidget.Widget.Title"/>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|end"
-            android:visibility="gone"
-            android:scaleX=".8"
-            android:scaleY=".8"
-            android:transformPivotX="0dp"
-            android:layout_marginStart="4dp"
-            android:id="@+id/weather">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:id="@+id/divider1"
-                    android:text="@string/divider"
-                    android:includeFontPadding="false"
-                    style="@style/AnotherWidget.Widget.Subtitle"/>
-            </LinearLayout>
-            <ImageView
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:paddingEnd="4dp"
-                android:paddingStart="4dp"
-                android:layout_marginEnd="4dp"
-                android:id="@+id/empty_weather_icon"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/AnotherWidget.Widget.Date.Big"
-                android:maxLines="1"
-                android:includeFontPadding="false"
-                android:id="@+id/temp"/>
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:id="@+id/calendar_layout"
-        android:visibility="gone"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:gravity="center_vertical|end">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical">
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_previous_shadow"
-                        android:src="@drawable/round_chevron_right_24" />
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_previous"
-                        android:src="@drawable/round_chevron_right_24" />
-                </RelativeLayout>
-                <TextView
-                    android:id="@+id/next_event"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:maxLines="1"
-                    android:lines="1"
-                    android:gravity="end"
-                    android:ellipsize="end"
-                    android:includeFontPadding="false"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Title" />
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical">
-                    <TextView
-                        android:id="@+id/next_event_difference_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="marquee"
-                        android:includeFontPadding="false"
-                        style="@style/AnotherWidget.Widget.Title" />
-                </LinearLayout>
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical">
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_next_shadow"
-                        android:src="@drawable/round_chevron_right_24" />
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:id="@+id/action_next"
-                        android:src="@drawable/round_chevron_right_24" />
-                </RelativeLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:scaleX=".8"
-                android:scaleY=".8"
-                android:transformPivotX="0dp"
-                android:layout_marginStart="4dp"
-                android:gravity="center_vertical"
-                android:id="@+id/special_weather">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:id="@+id/divider3"
-                        android:text="@string/divider"
-                        android:includeFontPadding="false"
-                        style="@style/AnotherWidget.Widget.Subtitle"/>
-                </LinearLayout>
-                <ImageView
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:paddingEnd="4dp"
-                    android:paddingStart="4dp"
-                    android:layout_marginEnd="4dp"
-                    android:id="@+id/special_weather_icon"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Date.Big"
-                    android:maxLines="1"
-                    android:includeFontPadding="false"
-                    android:id="@+id/special_temp"/>
-            </LinearLayout>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_small" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="8dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_medium" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="12dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/second_row_top_margin_large" />
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|end"
-            android:id="@+id/second_row"
-            android:layout_marginStart="4dp"
-            android:orientation="horizontal">
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:cropToPadding="false"
-                android:clipChildren="false"
-                android:layout_marginEnd="4dp">
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:cropToPadding="false"
-                    android:clipChildren="false"
-                    android:id="@+id/second_row_icon_shadow"
-                    android:src="@drawable/round_today_24"/>
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:cropToPadding="false"
-                    android:clipChildren="false"
-                    android:id="@+id/second_row_icon"
-                    android:src="@drawable/round_today_24"/>
-            </RelativeLayout>
-            <TextView
-                android:id="@+id/next_event_date"
-                android:layout_width="wrap_content"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1"
-                android:includeFontPadding="false"
-                android:layout_height="wrap_content"
-                style="@style/AnotherWidget.Widget.Subtitle" />
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:visibility="gone"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:layout_marginStart="8dp"
-                android:id="@+id/calendar_weather">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:id="@+id/divider2"
-                    android:text="@string/divider"
-                    android:includeFontPadding="false"
-                    style="@style/AnotherWidget.Widget.Subtitle"/>
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:id="@+id/weather_icon"
-                    android:clipChildren="false"
-                    android:clipToPadding="false"
-                    android:adjustViewBounds="true"
-                    android:layout_marginEnd="2dp"
-                    android:layout_marginStart="2dp"
-                    android:src="@drawable/clear_night"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Widget.Date"
-                    android:layout_marginStart="8dp"
-                    android:ellipsize="marquee"
-                    android:layout_marginEnd="4dp"
-                    android:includeFontPadding="false"
-                    android:id="@+id/calendar_temp"/>
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/right_aligned_widget_sans.xml b/app/src/main/res/layout/right_aligned_widget_sans.xml
deleted file mode 100644
index 85ce6f5..0000000
--- a/app/src/main/res/layout/right_aligned_widget_sans.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="8dp"
-        android:scaleType="fitXY"
-        android:id="@+id/widget_shape_background"
-        android:src="@drawable/card_background" />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center_vertical|end"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:id="@+id/main_layout"
-        android:animateLayoutChanges="true">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/time_container"
-            android:orientation="horizontal">
-            <TextClock
-                android:id="@+id/time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:format12Hour="h:mm"
-                android:padding="0dp"
-                android:lines="1"
-                android:maxLines="1"
-                style="@style/AnotherWidget.Widget.Title"/>
-            <TextClock
-                android:id="@+id/time_am_pm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:format12Hour="a"
-                android:format24Hour=""
-                android:padding="0dp"
-                android:lines="1"
-                android:maxLines="1"
-                style="@style/AnotherWidget.Widget.Title"/>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_marginTop="-16dp"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_none" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_marginTop="-8dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_small" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_medium" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:visibility="gone"
-            android:orientation="horizontal"
-            android:id="@+id/clock_bottom_margin_large" />
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical|end"
-                android:alpha="0"
-                android:orientation="vertical"
-                android:id="@+id/empty_layout_rect">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/empty_date_rect"/>
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/weather_rect" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/calendar_layout_rect"
-                android:alpha="0"
-                android:gravity="center_vertical|end">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/action_previous_rect" />
-                        <ImageView
-                            android:layout_height="wrap_content"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:id="@+id/next_event_rect" />
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/next_event_difference_time_rect" />
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/action_next_rect" />
-                    </LinearLayout>
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/calendar_weather_rect" />
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/special_weather_rect" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="4dp"
-                    android:visibility="gone"
-                    android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_small_sans" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="8dp"
-                    android:visibility="gone"
-                    android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_medium_sans" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="12dp"
-                    android:visibility="gone"
-                    android:orientation="horizontal"
-                    android:id="@+id/second_row_top_margin_large_sans" />
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/second_row_rect" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
-                android:id="@+id/bitmap_container"/>
-
-        </RelativeLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file