diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..2121c1f
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 15ae446..e889eee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,17 +10,41 @@
-
+
+
+
+
+ android-21
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
-
+
+
+
+
+
+
+
+
@@ -44,54 +68,67 @@
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -100,18 +137,38 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -119,28 +176,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -609,7 +670,7 @@
@@ -754,20 +815,20 @@
@@ -804,7 +865,6 @@
-
@@ -812,10 +872,6 @@
-
-
-
-
@@ -889,6 +945,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -934,6 +1008,7 @@
+
@@ -950,11 +1025,13 @@
-
+
+
+
@@ -1136,7 +1213,11 @@
1423935864836
1423935864836
-
+
+ 1423935928483
+ 1423935928483
+
+
@@ -1146,20 +1227,21 @@
-
+
+
-
+
-
+
@@ -1170,7 +1252,6 @@
-
@@ -1186,19 +1267,19 @@
-
+
-
+
-
+
-
+
@@ -1222,41 +1303,135 @@
-
+
+
+
-
-
- file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
- 15
-
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
- 16
-
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
- 17
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1310,34 +1485,51 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
@@ -1354,34 +1546,51 @@
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
+
+
+
-
-
-
@@ -1391,15 +1600,15 @@
+
+
+
-
-
-
@@ -1413,8 +1622,8 @@
-
-
+
+
@@ -1431,34 +1640,51 @@
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
+
+
+
-
-
-
@@ -1468,15 +1694,15 @@
+
+
+
-
-
-
@@ -1486,26 +1712,15 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1514,57 +1729,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1589,37 +1753,121 @@
-
+
-
-
+
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index c2adac0..618f29a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "de.marcelkapfer.morseconverter"
- minSdkVersion 10
+ minSdkVersion 11
targetSdkVersion 21
versionCode 1
versionName "1.0"
diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
index d080a9a..d8e39d4 100644
--- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
@@ -1,6 +1,8 @@
package de.marcelkapfer.morseconverter;
+import android.content.Intent;
import android.content.res.Resources;
+import android.net.Uri;
import android.os.Bundle;
import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
import it.neokree.materialnavigationdrawer.elements.MaterialSection;
@@ -24,4 +26,11 @@ public class MainActivity extends MaterialNavigationDrawer {
allowArrowAnimation();
this.disableLearningPattern();
}
+
+ public void developerProfile(){
+ Intent gplusProfile = new Intent(Intent.ACTION_VIEW, Uri.parse("https://plus.google.com/+MarcelMichaelKapfer/posts"));
+ startActivity(gplusProfile);
+ }
+
+
}
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 6e40a8f..823d755 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -26,22 +26,160 @@
android:id="@+id/about"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- tools:context=".AboutActivity$PlaceholderFragment" >
+ android:background="#fff"
+ tools:context=".AboutActivity$PlaceholderFragment">
+ android:id="@+id/scrollView">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index f0c21dc..32db7be 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -69,7 +69,8 @@
android:layout_marginTop="16dp"
android:gravity="center"
android:layout_gravity="right"
- android:height="48dp">
+ android:height="48dp"
+ android:baselineAligned="false">
+ android:gravity="center|right"
+ style="?android:attr/borderlessButtonStyle" />
+ android:gravity="center|right"
+ style="?android:attr/borderlessButtonStyle"
+ android:background="@color/cardview_light_background" />
diff --git a/app/src/main/res/layout/fragment_morse.xml b/app/src/main/res/layout/fragment_morse.xml
index 64d448c..63c8100 100644
--- a/app/src/main/res/layout/fragment_morse.xml
+++ b/app/src/main/res/layout/fragment_morse.xml
@@ -18,63 +18,88 @@
Marcel Michael Kapfer
marcelmichaelkapfer@yahoo.co.nz
- Version 1.0.1
-
+ Version 1.1.0
-->
-
+ android:layout_height="match_parent"
+ android:gravity="top"
+ android:orientation="vertical"
+ tools:context=".MainActivity">
-
-
+ android:layout_height="wrap_content">
-
-
-
+ android:layout_height="match_parent"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="8dp"
+ android:gravity="center"
+ android:minHeight="48dp"
+ android:orientation="vertical"
+ >
-
+
+
-
+
-
+
-
+
+
+
+
+
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3543255..a91e1b5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -35,15 +35,16 @@
Ihr Text
Teilen
Teilen Sie Ihren Text:
- Über
- Version
- Entwickler
- Spenden
- Über die App \nVersion: 1.0.1 05. Januar 2015 \Entwickler: Marcel Michael Kapfer \nWebsite: marcel-kapfer.de/projects/morse/ \nKontakt: marcelmichaelkapfer@yahoo.co.nz \nLizens: GNU GPL v3.0
- \n \nFehler \nWenn Du einen Fehler gefunden hast, schreibe mit bitte ein Email an marcelmichaelkapfer@yahoo.co.nz mit einer kurzen Problembeschreibung.
- \n \nVerwendung \nDu kannst eine ausführliche Anwendung auf marcel-kapfer.de/projects/morse/index.html#howto_android finden.
- \n \nFehlender Code \nWenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.
-
Über
Normales Morse
+ 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/projects/morse/index.html#howto_android finden.
+ Wenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.
+ 2.0 alpha \n14th February 2015
+ Fehler
+ Kontakt
+ Entwickler
+ Anleitung
+ Lizens
+ Fehlender Code
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae64a58..f7e84de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,14 +33,25 @@
Your Message
Share
Share your text:
- About Activity
- Version
- Developer
- Donate
- About \nVersion: 1.0.1 5th January 2015 \nDeveloper: Marcel Michael Kapfer \nWebsite: marcel-kapfer.de/projects/morse/ \nContact: marcelmichaelkapfer@yahoo.co.nz \nLicense: GNU GPL v3.0
- \n \nBug \nIf you found a bug, please write me a mail to marcelmichaelkapfer@yahoo.co.nz with a short description of the problem.
- \n \nHow to \nYou can find a detailed guide on marcel-kapfer.de/projects/morse/index.html#howto_android
- \n \nMissing Code \nIf you discovered, that code is missing, then write me a mail to marcelmichaelkapfer@yahoo.co.nz and tell me about it.
+
+ Version
+ Developer
+ Website
+ Contact
+ License
+ Bug
+ How to
+ Missing Code
+
+ 2.0 alpha \n14th February 2015
+ Marcel Michael Kapfer
+ marcel-kapfer.de/projects/morse/
+ marcelmichaelkapfer@yahoo.co.nz
+ GNU GPL v3.0
+ If you found a bug, please write me a mail to marcelmichaelkapfer@yahoo.co.nz with a short description of the problem.
+ You can find a detailed guide on marcel-kapfer.de/projects/morse/index.html#howto_android
+ If you discovered, that code is missing, then write me a mail to marcelmichaelkapfer@yahoo.co.nz and tell me about it.
+
About
Normal Morse
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 84c828d..1368c04 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,4 +9,29 @@
- @integer/DRAWERTYPE_IMAGE
-
+
+
+
+
+
+
+
\ No newline at end of file