From cd5a3433b658c7b0d7a78d20725c36c2ab38eb51 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 5 Aug 2018 23:06:56 +0200
Subject: [PATCH] move monthly fragment top layout directly in
 fragment_month_widget file

---
 .../main/res/layout/fragment_month_widget.xml | 48 ++++++++++++++++-
 .../main/res/layout/top_navigation_widget.xml | 54 -------------------
 2 files changed, 47 insertions(+), 55 deletions(-)
 delete mode 100644 app/src/main/res/layout/top_navigation_widget.xml

diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml
index 6a1677961..b8cbe6fb4 100644
--- a/app/src/main/res/layout/fragment_month_widget.xml
+++ b/app/src/main/res/layout/fragment_month_widget.xml
@@ -7,7 +7,53 @@
     android:layout_height="match_parent"
     android:padding="@dimen/medium_margin">
 
-    <include layout="@layout/top_navigation_widget"/>
+    <ImageView
+        android:id="@+id/top_left_arrow"
+        style="@style/ArrowStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@+id/top_value"
+        android:layout_alignTop="@+id/top_value"
+        android:paddingLeft="@dimen/medium_margin"
+        android:paddingRight="@dimen/medium_margin"
+        android:src="@drawable/ic_pointer_left"/>
+
+    <TextView
+        android:id="@+id/top_value"
+        style="@style/MonthStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/top_right_arrow"
+        android:layout_toRightOf="@+id/top_left_arrow"
+        android:gravity="center"
+        android:lines="1"
+        android:paddingBottom="@dimen/medium_margin"
+        android:paddingTop="@dimen/medium_margin"
+        android:textSize="@dimen/month_text_size"/>
+
+    <ImageView
+        android:id="@+id/top_right_arrow"
+        style="@style/ArrowStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@+id/top_value"
+        android:layout_alignTop="@+id/top_value"
+        android:layout_toLeftOf="@+id/top_new_event"
+        android:paddingLeft="@dimen/medium_margin"
+        android:paddingRight="@dimen/medium_margin"
+        android:src="@drawable/ic_pointer_right"/>
+
+    <ImageView
+        android:id="@+id/top_new_event"
+        style="@style/ArrowStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@+id/top_value"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/top_value"
+        android:paddingLeft="@dimen/medium_margin"
+        android:paddingRight="@dimen/medium_margin"
+        android:src="@drawable/ic_plus"/>
 
     <include
         android:id="@+id/first_row_widget"
diff --git a/app/src/main/res/layout/top_navigation_widget.xml b/app/src/main/res/layout/top_navigation_widget.xml
deleted file mode 100644
index 06113029d..000000000
--- a/app/src/main/res/layout/top_navigation_widget.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/calendar_holder">
-
-    <ImageView
-        android:id="@+id/top_left_arrow"
-        style="@style/ArrowStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/top_value"
-        android:layout_alignTop="@+id/top_value"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:src="@drawable/ic_pointer_left"/>
-
-    <TextView
-        android:id="@+id/top_value"
-        style="@style/MonthStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/top_right_arrow"
-        android:layout_toRightOf="@+id/top_left_arrow"
-        android:gravity="center"
-        android:lines="1"
-        android:paddingBottom="@dimen/medium_margin"
-        android:paddingTop="@dimen/medium_margin"
-        android:textSize="@dimen/month_text_size"/>
-
-    <ImageView
-        android:id="@+id/top_right_arrow"
-        style="@style/ArrowStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/top_value"
-        android:layout_alignTop="@+id/top_value"
-        android:layout_toLeftOf="@+id/top_new_event"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:src="@drawable/ic_pointer_right"/>
-
-    <ImageView
-        android:id="@+id/top_new_event"
-        style="@style/ArrowStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/top_value"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/top_value"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:src="@drawable/ic_plus"/>
-
-</merge>