From 38e17fa0410dc75e669f3e1a928d68d406f197c1 Mon Sep 17 00:00:00 2001 From: mmk2410 Date: Sun, 15 Feb 2015 02:26:06 +0100 Subject: [PATCH] Finishing Materializing --- .idea/inspectionProfiles/Project_Default.xml | 12 + .../inspectionProfiles/profiles_settings.xml | 7 + .idea/workspace.xml | 700 ++++++++++++------ app/build.gradle | 2 +- .../morseconverter/MainActivity.java | 9 + app/src/main/res/layout/fragment_about.xml | 160 +++- app/src/main/res/layout/fragment_main.xml | 12 +- app/src/main/res/layout/fragment_morse.xml | 115 +-- app/src/main/res/values-de/strings.xml | 19 +- app/src/main/res/values/strings.xml | 27 +- app/src/main/res/values/styles.xml | 27 +- 11 files changed, 785 insertions(+), 305 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml 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 @@ + + + + + + + + + + + @@ -950,11 +1025,13 @@ - + + + @@ -1136,7 +1213,11 @@ 1423935864836 1423935864836 - @@ -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">