diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
index cea23af..3abf282 100644
--- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
@@ -25,11 +25,15 @@ 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;
import android.support.v7.widget.CardView;
+import android.view.Display;
+import android.view.Surface;
import android.view.View;
+import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.TextView;
@@ -99,6 +103,19 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
this.disableLearningPattern(); //Doesn't open the drawer always when the app starts
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))){
+
+ enableToolbarElevation();
+
+ }
+
mDrawerToggle = new MaterialActionBarDrawerToggle(this, null, null, 0, 0){
public void onDrawerClosed(View view){
@@ -262,10 +279,10 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
}
//called when clicking on the website entry in the about fragment
- //opens marcel-kapfer.de/projects/morse/
+ //opens marcel-kapfer.de/writtenmorse
public void websiteEntry(View view){
try{
- Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/projects/morse/"));
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/writtenmorse/"));
startActivity(browserIntent);
} catch(Exception e){
e.printStackTrace();
@@ -309,7 +326,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
//opens the howto webpage
public void howtoEntry(View view){
try{
- Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/projects/morse/index.html#howto_android"));
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/writtenmorse/#howto_android"));
startActivity(browserIntent);
} catch(Exception e){
e.printStackTrace();
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 0e14e46..d6c82fd 100644
--- a/app/src/main/res/layout-large-land/fragment_about.xml
+++ b/app/src/main/res/layout-large-land/fragment_about.xml
@@ -24,18 +24,35 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/about"
android:layout_width="wrap_content"
- android:paddingRight="150dp"
- android:paddingLeft="150dp"
android:layout_height="match_parent"
- android:background="#fff"
tools:context=".AboutActivity$PlaceholderFragment">
-
+ android:layout_height="400px"
+ android:background="@color/colorPrimary" />
+
+ style="@style/LinearLayoutListContainer"
+ android:background="@color/white"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_marginTop="30dp"
+ android:layout_marginRight="125dp"
+ android:layout_marginBottom="50dp"
+ android:layout_marginLeft="125dp"
+ android:layout_gravity="top"
+ android:elevation="2dp">
+
+
+
+
+
+
+
-
-
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 93f5b6c..0a53582 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,25 @@
-
+ android:layout_height="match_parent">
+
+
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_marginTop="30dp"
+ android:layout_marginRight="125dp"
+ android:layout_marginBottom="50dp"
+ android:layout_marginLeft="125dp"
+ android:layout_gravity="top"
+ android:elevation="2dp"/>
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2a84ee2..6f2148a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -38,7 +38,7 @@
Wenn Du einen Fehler gefunden hast, schreibe mit bitte ein Email an marcelmichaelkapfer@yahoo.co.nz
Du kannst eine ausführliche Anwendung auf marcel-kapfer.de/writtenmorse/index.html#howto_android finden.
Wenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.
- 2.2.1 \n16. Mai 2015
+ 2.2.4 \n20. Mai 2015
Fehler
Kontakt
Entwickler
diff --git a/app/src/main/res/values-v19/styles.xml b/app/src/main/res/values-v19/styles.xml
index ea541f5..f5fb926 100644
--- a/app/src/main/res/values-v19/styles.xml
+++ b/app/src/main/res/values-v19/styles.xml
@@ -30,7 +30,6 @@
- @color/colorPrimary
- @integer/DRAWERTYPE_IMAGE
- true
- - true
- true
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9d8d81..f652d40 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
How to
Missing Code
- 2.2.1 \n16 May 2015
+ 2.2.4 \n20 May 2015
Marcel Michael Kapfer
marcel-kapfer.de/writtenmorse
marcelmichaelkapfer@yahoo.co.nz
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index caf2827..699b035 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,7 +30,6 @@
- @color/colorPrimary
- @integer/DRAWERTYPE_IMAGE
- true
- - true