From 86fe38e263cc0a4c9f80ab956a829c5ee97db6e7 Mon Sep 17 00:00:00 2001 From: mmk2410 Date: Mon, 16 Feb 2015 00:55:37 +0100 Subject: [PATCH] scrollable convert fragments --- .idea/workspace.xml | 755 ++++++++---------- .../morseconverter/MainActivity.java | 35 +- .../main/res/drawable/feature_graphics.png | Bin 4094 -> 3572 bytes app/src/main/res/layout/activity_main.xml | 11 - app/src/main/res/layout/fragment_main.xml | 110 ++- app/src/main/res/layout/fragment_morse.xml | 109 ++- app/src/main/res/menu/menu_main.xml | 6 - app/src/main/res/values-de/strings.xml | 3 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/styles.xml | 12 +- 10 files changed, 578 insertions(+), 466 deletions(-) delete mode 100644 app/src/main/res/layout/activity_main.xml delete mode 100644 app/src/main/res/menu/menu_main.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 721257e..95061b7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -18,11 +18,21 @@ + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -34,9 +44,15 @@ @@ -800,14 +813,24 @@ @@ -843,8 +866,6 @@ - - @@ -852,6 +873,10 @@ @@ -906,6 +931,14 @@ + + + + @@ -984,10 +1017,16 @@ + + + + @@ -1005,7 +1044,7 @@ - + @@ -1171,6 +1210,11 @@ + + + @@ -1204,7 +1248,15 @@ 1423963762218 1423963762218 - @@ -1232,7 +1284,7 @@ - + @@ -1241,11 +1293,11 @@ - + - + @@ -1305,6 +1357,7 @@ + @@ -1323,95 +1377,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1420,52 +1385,21 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1488,7 +1422,6 @@ - @@ -1516,52 +1449,21 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1582,43 +1484,28 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -1628,15 +1515,17 @@ + + + - + + + - - - @@ -1649,10 +1538,7 @@ - - - - + @@ -1673,43 +1559,28 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -1719,15 +1590,17 @@ + + + - + + + - - - @@ -1736,17 +1609,6 @@ - - - - - - - - - - - @@ -1758,21 +1620,6 @@ - - - - - - - - - - - - - - - @@ -1784,106 +1631,186 @@ - + - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + - - - - - - - - - - - - - - + + - - + + - + - - + + - - + + + + + + + + + + + + + - - + + + + + - - + + + + + + + + + + - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java index dd8c014..778b7eb 100644 --- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java +++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java @@ -4,7 +4,10 @@ import android.content.Intent; import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; +import android.support.v7.widget.CardView; import android.view.View; +import android.widget.EditText; +import android.widget.TextView; import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer; import it.neokree.materialnavigationdrawer.elements.MaterialSection; @@ -36,19 +39,43 @@ public class MainActivity extends MaterialNavigationDrawer { } public void normalMorseEncode(View view){ - + EditText text = (EditText) findViewById(R.id.editTextNormalMorse); + TextView test = (TextView) findViewById(R.id.outputNormalMorse); + CardView cardView = (CardView) findViewById(R.id.cardViewNormalMorseOutput); + if(cardView.getVisibility() == View.INVISIBLE){ + cardView.setVisibility(View.VISIBLE); + } + test.setText(text.getText()); } public void normalMorseDecode(View view){ - + EditText text = (EditText) findViewById(R.id.editTextNormalMorse); + TextView test = (TextView) findViewById(R.id.outputNormalMorse); + CardView cardView = (CardView) findViewById(R.id.cardViewNormalMorseOutput); + if(cardView.getVisibility() == View.INVISIBLE){ + cardView.setVisibility(View.VISIBLE); + } + test.setText(text.getText()); } public void writtenMorseEncode(View view){ - + EditText text = (EditText) findViewById(R.id.editTextWrittenMorse); + TextView test = (TextView) findViewById(R.id.outputWrittenMorse); + CardView cardView = (CardView) findViewById(R.id.cardViewWrittenMorseOutput); + if(cardView.getVisibility() == View.INVISIBLE){ + cardView.setVisibility(View.VISIBLE); + } + test.setText(text.getText()); } public void writtenMorseDecode(View view){ - + EditText text = (EditText) findViewById(R.id.editTextWrittenMorse); + TextView test = (TextView) findViewById(R.id.outputWrittenMorse); + CardView cardView = (CardView) findViewById(R.id.cardViewWrittenMorseOutput); + if(cardView.getVisibility() == View.INVISIBLE){ + cardView.setVisibility(View.VISIBLE); + } + test.setText(text.getText()); } //called when clicking on the version entry in the about fragment diff --git a/app/src/main/res/drawable/feature_graphics.png b/app/src/main/res/drawable/feature_graphics.png index 617ebc36d11bf0ff098f3e9ddae953331b73f673..5855cc0fb6f3956dbe4928b920cc19d75b10bfe1 100644 GIT binary patch literal 3572 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 DmZe2* diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index f7158b8..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 3a2bf9a..10baac2 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -20,15 +20,24 @@ Version 1.1.0 --> - + tools:context=".MainActivity" + android:animateLayoutChanges="true"> + + + - + android:minLines="5" + android:singleLine="false" + android:background="@color/cardview_light_background" + android:textCursorDrawable="@color/colorPrimary"/> + + @@ -88,4 +104,70 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_morse.xml b/app/src/main/res/layout/fragment_morse.xml index b2f0105..cb300ad 100644 --- a/app/src/main/res/layout/fragment_morse.xml +++ b/app/src/main/res/layout/fragment_morse.xml @@ -20,15 +20,26 @@ Version 1.1.0 --> - + tools:context=".MainActivity" + android:animateLayoutChanges="true" + android:scrollbars="vertical"> + + + + android:background="@color/cardview_light_background" + android:minLines="5" + android:textCursorDrawable="@color/colorPrimary"> + + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml deleted file mode 100644 index b1cb908..0000000 --- a/app/src/main/res/menu/menu_main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 600cb8f..69a8bb3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -47,4 +47,7 @@ Anleitung Lizens Fehlender Code + + TEILEN + KOPIEREN diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a9caa4..bb8fdd4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,4 +54,7 @@ About Normal Morse + + SHARE + COPY diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 881db53..3d87643 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -32,17 +32,21 @@