diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1b5bbbe..a90636b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -17,58 +17,10 @@ @@ -845,7 +803,7 @@ - + @@ -1146,12 +1104,12 @@ - + - + @@ -1160,7 +1118,7 @@ - + @@ -1178,6 +1136,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1203,7 +1194,9 @@ - + + + @@ -1279,7 +1272,9 @@ - + + + @@ -1444,7 +1439,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -1453,9 +1468,11 @@ - - - + + + + + diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/AboutFragment.java b/app/src/main/java/de/marcelkapfer/morseconverter/AboutFragment.java new file mode 100644 index 0000000..2fb10c0 --- /dev/null +++ b/app/src/main/java/de/marcelkapfer/morseconverter/AboutFragment.java @@ -0,0 +1,17 @@ +package de.marcelkapfer.morseconverter; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * Created by mmk on 2/14/15. + */ +public class AboutFragment extends Fragment{ + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){ + return inflater.inflate(R.layout.fragment_about, container, false); + } +} diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java index 91f9723..61319a3 100644 --- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java +++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java @@ -7,13 +7,18 @@ import it.neokree.materialnavigationdrawer.elements.MaterialSection; public class MainActivity extends MaterialNavigationDrawer { - private MaterialSection writtenMorse; + private MaterialSection writtenMorse, normalMorse, about; @Override public void init(Bundle savedInstanceState) { writtenMorse = this.newSection("writtenMorse", new MainFragment()); + normalMorse = this.newSection("Normal Morse", new MorseFragment()); + about = this.newSection("About", new AboutFragment()); this.addSection(writtenMorse); + this.addSection(normalMorse); + this.addBottomSection(about); this.setDrawerHeaderImage(this.getResources().getDrawable(R.drawable.feature_graphics)); allowArrowAnimation(); + this.disableLearningPattern(); } } diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MorseFragment.java b/app/src/main/java/de/marcelkapfer/morseconverter/MorseFragment.java new file mode 100644 index 0000000..ba168cd --- /dev/null +++ b/app/src/main/java/de/marcelkapfer/morseconverter/MorseFragment.java @@ -0,0 +1,17 @@ +package de.marcelkapfer.morseconverter; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * Created by mmk on 2/14/15. + */ +public class MorseFragment extends Fragment{ + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){ + return inflater.inflate(R.layout.fragment_morse, container, false); + } +} \ No newline at end of file