From 436be22132c8755308252f5dc6da89e3dde64013 Mon Sep 17 00:00:00 2001
From: mmk2410 <marcelmichaelkapfer@yahoo.co.nz>
Date: Wed, 27 May 2015 00:08:06 +0200
Subject: [PATCH] Version 2.2.5: Design fixes for new about section; better
 tablet recognization; bug fixes (api up to 18)

---
 .../morseconverter/MainActivity.java          |  10 +-
 .../res/drawable-hdpi/blue_background.xml     |   9 +
 .../res/drawable-ldpi/blue_background.xml     |   9 +
 .../res/drawable-mdpi/blue_background.xml     |   9 +
 .../res/drawable-tvdpi/blue_background.xml    |   9 +
 .../res/drawable-xhdpi/blue_background.xml    |   9 +
 .../res/drawable-xxhdpi/blue_background.xml   |   9 +
 .../res/drawable-xxxhdpi/blue_background.xml  |   9 +
 app/src/main/res/drawable/blue_background.xml |   9 +
 .../res/layout-large-land/fragment_about.xml  |   8 +-
 .../fragment_written_morse_list.xml           |   8 +-
 .../main/res/layout-v19/fragment_about.xml    | 194 ++++++++++++++++++
 app/src/main/res/layout/fragment_about.xml    |  24 ++-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 15 files changed, 296 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable-ldpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable-mdpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable-tvdpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable-xhdpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable-xxhdpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable-xxxhdpi/blue_background.xml
 create mode 100644 app/src/main/res/drawable/blue_background.xml
 create mode 100644 app/src/main/res/layout-v19/fragment_about.xml

diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
index 3abf282..b51c7f1 100644
--- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
@@ -25,7 +25,6 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
@@ -104,14 +103,9 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
         setBackPattern(MaterialNavigationDrawer.BACKPATTERN_BACK_TO_FIRST);
 
         Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
-        int screenSize = getResources().getConfiguration().screenLayout &
-                Configuration.SCREENLAYOUT_SIZE_MASK;
-
-        if(!((screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE ||
-                screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE) &&
-                (display.getRotation() == Surface.ROTATION_90 ||
-                display.getRotation() == Surface.ROTATION_270))){
 
+        if(display.getRotation() == Surface.ROTATION_90 ||
+                display.getRotation() == Surface.ROTATION_270){
             enableToolbarElevation();
 
         }
diff --git a/app/src/main/res/drawable-hdpi/blue_background.xml b/app/src/main/res/drawable-hdpi/blue_background.xml
new file mode 100644
index 0000000..21b0696
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary"></solid>
+            <size android:height="150dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-ldpi/blue_background.xml b/app/src/main/res/drawable-ldpi/blue_background.xml
new file mode 100644
index 0000000..370f198
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary"></solid>
+            <size android:height="80dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-mdpi/blue_background.xml b/app/src/main/res/drawable-mdpi/blue_background.xml
new file mode 100644
index 0000000..832f2e3
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary"></solid>
+            <size android:height="130dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-tvdpi/blue_background.xml b/app/src/main/res/drawable-tvdpi/blue_background.xml
new file mode 100644
index 0000000..fc5d61f
--- /dev/null
+++ b/app/src/main/res/drawable-tvdpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary"></solid>
+            <size android:height="140dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/blue_background.xml b/app/src/main/res/drawable-xhdpi/blue_background.xml
new file mode 100644
index 0000000..a636359
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape>
+            <solid android:color="@color/colorPrimary"/>
+            <size android:height="200dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/blue_background.xml b/app/src/main/res/drawable-xxhdpi/blue_background.xml
new file mode 100644
index 0000000..40fb227
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape>
+            <solid android:color="@color/colorPrimary"/>
+            <size android:height="250dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxxhdpi/blue_background.xml b/app/src/main/res/drawable-xxxhdpi/blue_background.xml
new file mode 100644
index 0000000..08dd115
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape>
+            <solid android:color="@color/colorPrimary"/>
+            <size android:height="300dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/blue_background.xml b/app/src/main/res/drawable/blue_background.xml
new file mode 100644
index 0000000..9d15c4f
--- /dev/null
+++ b/app/src/main/res/drawable/blue_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape>
+            <solid android:color="@color/colorPrimary"/>
+            <size android:height="120dp"></size>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large-land/fragment_about.xml b/app/src/main/res/layout-large-land/fragment_about.xml
index d6c82fd..0e147f2 100644
--- a/app/src/main/res/layout-large-land/fragment_about.xml
+++ b/app/src/main/res/layout-large-land/fragment_about.xml
@@ -30,10 +30,10 @@
     <RelativeLayout
         android:id="@+id/wml_back"
         android:layout_width="match_parent"
-        android:layout_height="400px"
-        android:background="@color/colorPrimary" />
+        android:layout_height="wrap_content"
+        android:background="@drawable/blue_background" />
 
-        <LinearLayout
+        <RelativeLayout
             style="@style/LinearLayoutListContainer"
             android:background="@color/white"
             android:layout_width="fill_parent"
@@ -206,6 +206,6 @@
 
             </ScrollView>
 
-        </LinearLayout>
+        </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout-large-land/fragment_written_morse_list.xml b/app/src/main/res/layout-large-land/fragment_written_morse_list.xml
index 0a53582..89377ef 100644
--- a/app/src/main/res/layout-large-land/fragment_written_morse_list.xml
+++ b/app/src/main/res/layout-large-land/fragment_written_morse_list.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
 
     <RelativeLayout
         android:id="@+id/wml_back"
         android:layout_width="match_parent"
-        android:layout_height="400px"
-        android:background="@color/colorPrimary" />
+        android:layout_height="wrap_content"
+        android:background="@drawable/blue_background" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/wm_recycler"
diff --git a/app/src/main/res/layout-v19/fragment_about.xml b/app/src/main/res/layout-v19/fragment_about.xml
new file mode 100644
index 0000000..6af0fa4
--- /dev/null
+++ b/app/src/main/res/layout-v19/fragment_about.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This is a Android application for converting writtenMorse and normal morse code.
+    Copyright (C) 2014-2015  Marcel Michael Kapfer
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    Marcel Michael Kapfer
+    marcelmichaelkapfer@yahoo.co.nz
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/about"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#fff"
+    tools:context=".AboutActivity$PlaceholderFragment">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/scrollView">
+
+        <LinearLayout
+            style="@style/LinearLayoutListContainer"
+            android:layout_height="fill_parent"
+            android:layout_gravity="top">
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="versionEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionVersion"
+                    />
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aboutVersion" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="developerEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionDeveloper"
+                    />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aboutDeveloper" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="websiteEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionWebsite"
+                    />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aboutWebsite" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="contactEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionContact"
+                    />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aboutContact" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="licenseEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionLicense"
+                    />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aboutLicense" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="bugEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionBug"
+                    />
+
+                <TextView
+                    android:id="@+id/textView3"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/aboutBug" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="howtoEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionHow"
+                    />
+
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/aboutHow" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/LinearLayoutList"
+                android:onClick="missingCodeEntry">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="16sp"
+                    android:text="@string/sectionMissing"
+                    />
+
+                <TextView
+                    android:id="@+id/textView5"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/aboutMissing"/>
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 9bd893d..8de66ba 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -20,20 +20,29 @@
     marcelmichaelkapfer@yahoo.co.nz
 
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/about"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:background="#fff"
+
+    android:layout_gravity="top"
+    android:layout_alignParentTop="true"
+    android:layout_alignTop="@id/about"
+    android:layout_alignWithParentIfMissing="true"
+    android:layout_marginTop="-50dp"
     tools:context=".AboutActivity$PlaceholderFragment">
 
     <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:id="@+id/scrollView">
+
         <LinearLayout
-            style="@style/LinearLayoutListContainer">
+            style="@style/LinearLayoutListContainer"
+            android:layout_height="fill_parent"
+            android:layout_gravity="top">
 
             <LinearLayout
                 style="@style/LinearLayoutList"
@@ -166,6 +175,7 @@
 
             <LinearLayout
                 style="@style/LinearLayoutList"
+                android:paddingBottom="70dp"
                 android:onClick="missingCodeEntry">
 
                 <TextView
@@ -188,4 +198,4 @@
 
     </ScrollView>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6f2148a..31f838f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -38,7 +38,7 @@
     <string name="aboutBug">Wenn Du einen Fehler gefunden hast, schreibe mit bitte ein Email an marcelmichaelkapfer@yahoo.co.nz</string>
     <string name="aboutHow">Du kannst eine ausführliche Anwendung auf marcel-kapfer.de/writtenmorse/index.html#howto_android finden.</string>
     <string name="aboutMissing">Wenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.</string>
-    <string name="aboutVersion">2.2.4 \n20. Mai 2015</string>
+    <string name="aboutVersion">2.2.5 \n27. Mai 2015</string>
     <string name="sectionBug">Fehler</string>
     <string name="sectionContact">Kontakt</string>
     <string name="sectionDeveloper">Entwickler</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f652d40..5fd3b34 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
     <string name="sectionHow">How to</string>
     <string name="sectionMissing">Missing Code</string>
     <!--About Texts-->
-    <string name="aboutVersion">2.2.4 \n20 May 2015</string>
+    <string name="aboutVersion">2.2.5 \n27 May 2015</string>
     <string name="aboutDeveloper" translatable="false">Marcel Michael Kapfer</string>
     <string name="aboutWebsite" translatable="false">marcel-kapfer.de/writtenmorse</string>
     <string name="aboutContact" translatable="false">marcelmichaelkapfer@yahoo.co.nz</string>