From 6f236bca7f8d6ad3a253c3e6d3f54683b0fb5c8e Mon Sep 17 00:00:00 2001
From: Arno Welzel <github@arnowelzel.de>
Date: Fri, 5 Sep 2014 07:37:28 +0200
Subject: [PATCH] Fix for incorrect day weekday labels when switching start of
 week from sunday to monday.

---
 AndroidManifest.xml                           |  4 ++--
 res/layout-land/main.xml                      | 23 ++++++++++++++++---
 res/layout/main.xml                           | 19 ++++++++++++++-
 res/raw-de/about.html                         |  2 +-
 res/raw-fr/about.html                         |  2 +-
 res/raw-it/about.html                         |  2 +-
 res/raw/about.html                            |  2 +-
 .../android/periodical/MainActivity.java      |  4 ++++
 8 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e134ac62..23de5d15 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="de.arnowelzel.android.periodical"
-      android:versionCode="18"
-      android:versionName="0.18"
+      android:versionCode="19"
+      android:versionName="0.19"
       android:installLocation="auto">
           
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index b7b45466..ac7253ec 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -27,7 +27,7 @@ android:layout_height="fill_parent" >
             android:layout_weight="0.6"
             android:orientation="horizontal" >
 
-            <TextView android:layout_width="wrap_content" android:layout_height="fill_parent" android:gravity="center" android:text="@string/main_calday_su" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_su" android:textStyle="bold" />
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_mo" android:textStyle="bold" />
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_tu" android:textStyle="bold" />
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_we" android:textStyle="bold" />
@@ -44,7 +44,7 @@ android:layout_height="fill_parent" >
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-            <TextView android:layout_width="wrap_content" android:layout_height="fill_parent" android:gravity="center" android:text="@string/main_calday_mo" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_mo" android:textStyle="bold" />
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_tu" android:textStyle="bold" />
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_we" android:textStyle="bold" />
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_th" android:textStyle="bold" />
@@ -154,7 +154,7 @@ android:layout_height="fill_parent" >
     >
 
         <TableRow
-            android:id="@+id/rowcaldays_2"
+            android:id="@+id/rowcaldays0_2"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_weight="0.6"
@@ -169,6 +169,23 @@ android:layout_height="fill_parent" >
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_sa" android:textStyle="bold" />
         </TableRow>
 
+        <TableRow
+                android:id="@+id/rowcaldays1_2"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="0.6"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_mo" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_tu" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_we" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_th" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_fr" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_sa" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_su" android:textStyle="bold" />
+        </TableRow>
+        
         <TableRow
             android:id="@+id/rowcal0107_2"
             android:layout_width="fill_parent"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index f21b53c7..8c5c8900 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -184,7 +184,7 @@ android:layout_below="@+id/monthselector"
     >
 
         <TableRow
-            android:id="@+id/rowcaldays_2"
+            android:id="@+id/rowcaldays0_2"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_weight="0.6"
@@ -199,6 +199,23 @@ android:layout_below="@+id/monthselector"
             <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_sa" android:textStyle="bold" />
         </TableRow>
 
+        <TableRow
+                android:id="@+id/rowcaldays1_2"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="0.6"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_mo" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_tu" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_we" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_th" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_fr" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_sa" android:textStyle="bold" />
+            <TextView android:gravity="center" android:layout_height="fill_parent" android:text="@string/main_calday_su" android:textStyle="bold" />
+        </TableRow>
+        
         <TableRow
             android:id="@+id/rowcal0107_2"
             android:layout_width="fill_parent"
diff --git a/res/raw-de/about.html b/res/raw-de/about.html
index 332235fc..0fa9130c 100644
--- a/res/raw-de/about.html
+++ b/res/raw-de/about.html
@@ -5,7 +5,7 @@
 <title>Über</title>
 </head>
 <body>
-<h1>Periodical 0.18</h1>
+<h1>Periodical 0.19</h1>
 
 <h2>Berechnung der Fruchtbarkeit nach  Knaus-Ogino<br />
 Copyright © 2012-2014 Arno Welzel</h2>
diff --git a/res/raw-fr/about.html b/res/raw-fr/about.html
index b7825bd9..bda2dba7 100644
--- a/res/raw-fr/about.html
+++ b/res/raw-fr/about.html
@@ -5,7 +5,7 @@
 <title>À propos</title>
 </head>
 <body>
-<h1>Periodical 0.18</h1>
+<h1>Periodical 0.19</h1>
 
 <h2>Calcul de la fertilité selon la méthode Knaus-Ogino<br />
 Copyright © 2012-2014 Arno Welzel</h2>
diff --git a/res/raw-it/about.html b/res/raw-it/about.html
index 3b65fd3a..9ddebf4b 100644
--- a/res/raw-it/about.html
+++ b/res/raw-it/about.html
@@ -5,7 +5,7 @@
 <title>A proposito</title>
 </head>
 <body>
-<h1>Periodical 0.18</h1>
+<h1>Periodical 0.19</h1>
 
 <h2>Calcolo della fertilità in base a Knaus&#8211;Ogino<br />
 Copyright © 2012-2014 Arno Welzel</h2>
diff --git a/res/raw/about.html b/res/raw/about.html
index f24d22bb..9fd84644 100644
--- a/res/raw/about.html
+++ b/res/raw/about.html
@@ -5,7 +5,7 @@
 <title>About</title>
 </head>
 <body>
-<h1>Periodical 0.18</h1>
+<h1>Periodical 0.19</h1>
 
 <h2>Calculation of fertility according to Knaus&#8211;Ogino<br />
 Copyright © 2012-2014 Arno Welzel</h2>
diff --git a/src/de/arnowelzel/android/periodical/MainActivity.java b/src/de/arnowelzel/android/periodical/MainActivity.java
index 3acf0d42..2fe69e8e 100644
--- a/src/de/arnowelzel/android/periodical/MainActivity.java
+++ b/src/de/arnowelzel/android/periodical/MainActivity.java
@@ -245,10 +245,14 @@ void calendarUpdate() {
         int startofweek = Integer.parseInt(preferences.getString("startofweek", "0"));
         if(startofweek == 0) {
             ((TableRow)findViewById(R.id.rowcaldays0)).setVisibility(View.VISIBLE);
+            ((TableRow)findViewById(R.id.rowcaldays0_2)).setVisibility(View.VISIBLE);
             ((TableRow)findViewById(R.id.rowcaldays1)).setVisibility(View.GONE);
+            ((TableRow)findViewById(R.id.rowcaldays1_2)).setVisibility(View.GONE);
         } else {
             ((TableRow)findViewById(R.id.rowcaldays0)).setVisibility(View.GONE);
+            ((TableRow)findViewById(R.id.rowcaldays0_2)).setVisibility(View.GONE);
             ((TableRow)findViewById(R.id.rowcaldays1)).setVisibility(View.VISIBLE);
+            ((TableRow)findViewById(R.id.rowcaldays1_2)).setVisibility(View.VISIBLE);
         }
         
         // Output current year/month