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 617ebc3..5855cc0 100644 Binary files a/app/src/main/res/drawable/feature_graphics.png and b/app/src/main/res/drawable/feature_graphics.png differ 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 @@