diff --git a/.idea/.name b/.idea/.name
index d48d100..6793bd0 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-MorseConverter
\ No newline at end of file
+Morse Converter
\ No newline at end of file
diff --git a/.idea/dictionaries/mmk.xml b/.idea/dictionaries/mmk.xml
new file mode 100644
index 0000000..2098411
--- /dev/null
+++ b/.idea/dictionaries/mmk.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 1310fcb..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/MaterialNavigationDrawer_1_3.xml b/.idea/libraries/MaterialNavigationDrawer_1_3.xml
new file mode 100644
index 0000000..d55b47a
--- /dev/null
+++ b/.idea/libraries/MaterialNavigationDrawer_1_3.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/android_ui_1_2.xml b/.idea/libraries/android_ui_1_2.xml
new file mode 100644
index 0000000..d0f587d
--- /dev/null
+++ b/.idea/libraries/android_ui_1_2.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_21_0_3.xml b/.idea/libraries/appcompat_v7_21_0_3.xml
new file mode 100644
index 0000000..886beda
--- /dev/null
+++ b/.idea/libraries/appcompat_v7_21_0_3.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/cardview_v7_21_0_3.xml b/.idea/libraries/cardview_v7_21_0_3.xml
new file mode 100644
index 0000000..9d418c5
--- /dev/null
+++ b/.idea/libraries/cardview_v7_21_0_3.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_21_0_3.xml b/.idea/libraries/support_annotations_21_0_3.xml
new file mode 100644
index 0000000..88e40e4
--- /dev/null
+++ b/.idea/libraries/support_annotations_21_0_3.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_19_1_0.xml b/.idea/libraries/support_v4_19_1_0.xml
deleted file mode 100644
index 76c7304..0000000
--- a/.idea/libraries/support_v4_19_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml
new file mode 100644
index 0000000..2b07d03
--- /dev/null
+++ b/.idea/libraries/support_v4_21_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cded496..edb7bc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,50 @@
-
+
+
+
+
+
+
+
+
+
+
+ Abstraction issues
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 83fdcf3..1b5bbbe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,56 +10,68 @@
-
-
-
-
-
-
-
-
-
- android-19
-
+
-
-
-
- @style/CustomActionBarTheme
-
-
-
-
- @style/CustomActionBarTheme
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
-
-
+
-
+
@@ -76,112 +88,122 @@
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -194,13 +216,13 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -548,6 +590,11 @@
+
+
+
+
+
@@ -628,7 +675,8 @@
diff --git a/app/build.gradle b/app/build.gradle
index a7f3f16..c2adac0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,23 +1,32 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 19
- buildToolsVersion "21.1.1"
+ compileSdkVersion 21
+ buildToolsVersion "21.1.2"
defaultConfig {
applicationId "de.marcelkapfer.morseconverter"
- minSdkVersion 14
- targetSdkVersion 19
+ minSdkVersion 10
+ targetSdkVersion 21
+ versionCode 1
+ versionName "1.0"
}
-
buildTypes {
release {
minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
-dependencies {
- compile 'com.android.support:support-v4:19.1.0'
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support:appcompat-v7:21.0.3'
+ compile 'it.neokree:MaterialNavigationDrawer:1.3'
+ compile 'com.android.support:cardview-v7:21.0.3'
+ compile 'com.android.support:support-v4:21.0.3'
}
diff --git a/app/lint.xml b/app/lint.xml
deleted file mode 100644
index 5eb30f7..0000000
--- a/app/lint.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt
deleted file mode 100644
index fb5d23a..0000000
--- a/app/manifest-merger-release-report.txt
+++ /dev/null
@@ -1,69 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from AndroidManifest.xml:2:1
- package
- ADDED from AndroidManifest.xml:2:11
- INJECTED from AndroidManifest.xml:0:0
- INJECTED from AndroidManifest.xml:0:0
- android:versionName
- ADDED from AndroidManifest.xml:4:5
- android:versionCode
- ADDED from AndroidManifest.xml:3:5
- INJECTED from AndroidManifest.xml:0:0
- INJECTED from AndroidManifest.xml:0:0
- xmlns:android
- ADDED from AndroidManifest.xml:4:31
-uses-sdk
-ADDED from AndroidManifest.xml:6:5
- android:targetSdkVersion
- ADDED from AndroidManifest.xml:8:9
- INJECTED from AndroidManifest.xml:0:0
- INJECTED from AndroidManifest.xml:0:0
- android:minSdkVersion
- ADDED from AndroidManifest.xml:7:9
- INJECTED from AndroidManifest.xml:0:0
- INJECTED from AndroidManifest.xml:0:0
-application
-ADDED from AndroidManifest.xml:10:5
- android:label
- ADDED from AndroidManifest.xml:13:9
- android:allowBackup
- ADDED from AndroidManifest.xml:11:9
- android:icon
- ADDED from AndroidManifest.xml:12:9
- android:theme
- ADDED from AndroidManifest.xml:14:9
-activity#de.marcelkapfer.morseconverter.MainActivity
-ADDED from AndroidManifest.xml:16:8
- android:label
- ADDED from AndroidManifest.xml:18:13
- android:windowSoftInputMode
- ADDED from AndroidManifest.xml:19:13
- android:name
- ADDED from AndroidManifest.xml:17:13
-intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:20:13
-action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:21:17
- android:name
- ADDED from AndroidManifest.xml:21:25
-category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:23:17
- android:name
- ADDED from AndroidManifest.xml:23:27
-activity#de.marcelkapfer.morseconverter.DisplayMessageActivity
-ADDED from AndroidManifest.xml:26:9
- android:label
- ADDED from AndroidManifest.xml:28:13
- android:parentActivityName
- ADDED from AndroidManifest.xml:29:13
- android:immersive
- ADDED from AndroidManifest.xml:29:86
- android:name
- ADDED from AndroidManifest.xml:27:13
-meta-data#android.support.PARENT_ACTIVITY
-ADDED from AndroidManifest.xml:30:13
- android:value
- ADDED from AndroidManifest.xml:32:17
- android:name
- ADDED from AndroidManifest.xml:31:17
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..124af58
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/mmk/android-sdks/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/app/src/androidTest/java/de/marcelkapfer/morseconverter/ApplicationTest.java b/app/src/androidTest/java/de/marcelkapfer/morseconverter/ApplicationTest.java
new file mode 100644
index 0000000..c2f6626
--- /dev/null
+++ b/app/src/androidTest/java/de/marcelkapfer/morseconverter/ApplicationTest.java
@@ -0,0 +1,13 @@
+package de.marcelkapfer.morseconverter;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bce11b9..188286e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,59 +1,21 @@
-
-
-
-
+
-
-
+
+ android:theme="@style/AppTheme">
-
-
-
diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java
deleted file mode 100644
index 70ae0a0..0000000
--- a/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This is a Android application for converting writtenMorse and normal morse code.
- * Copyright (C) 2014-2015 Marcel Michael Kapfer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * Marcel Michael Kapfer
- * marcelmichaelkapfer@yahoo.co.nz
- *
- * Version 1.0.1
- */
-
-package de.marcelkapfer.morseconverter;
-
-import android.app.Fragment;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-
-
-public class DisplayMessageActivity extends FragmentActivity {
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // Get the message from the intent
- Intent intent = getIntent();
- String message = intent.getStringExtra(MainActivity.EXTRA_MESSAGE);
-
- // Create the text view
- TextView textView = new TextView(this);
- textView.setTextSize(20);
- textView.setText(message);
- textView.setTextIsSelectable(true);
- textView.setPadding(10, 10, 10, 10);
-
-
- // Set the text view as the activity layout
- setContentView(textView);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu items for use in the action bar
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.display_message_activity_actions, menu);
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle presses on the action bar items
- switch (item.getItemId()) {
- case R.id.action_share:
- share();
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
-
-
- /**
- * A placeholder fragment containing a simple view.
- */
- public static class PlaceholderFragment extends Fragment {
-
- public PlaceholderFragment() {
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.fragment_display_message,
- container, false);
- return rootView;
- }
- }
-
-
- public void share(){
- Intent intent = getIntent();
- String message = intent.getStringExtra(MainActivity.EXTRA_MESSAGE);
- Intent sendIntent = new Intent();
- sendIntent.setAction(Intent.ACTION_SEND);
- sendIntent.putExtra(Intent.EXTRA_TEXT, message);
- sendIntent.setType("text/plain");
- startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_to)));
- }
-
-}
diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
index 83a99e2..91f9723 100644
--- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
@@ -1,1025 +1,19 @@
-/*
- * This is a Android application for converting writtenMorse and normal morse code.
- * Copyright (C) 2014-2015 Marcel Michael Kapfer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * Marcel Michael Kapfer
- * marcelmichaelkapfer@yahoo.co.nz
- *
- * Version 1.0.1
- */
-
package de.marcelkapfer.morseconverter;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Intent;
-import android.content.res.Configuration;
import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ListView;
+import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
+import it.neokree.materialnavigationdrawer.elements.MaterialSection;
-public class MainActivity extends FragmentActivity {
- private DrawerLayout mDrawerLayout;
- private ListView mDrawerList;
- private ActionBarDrawerToggle mDrawerToggle;
- private CharSequence mDrawerTitle;
- private CharSequence mTitle;
- private String[] mMenuTitles;
- public String[] fragments = new String[] {"R.id.main", "R.id.morse", "R.id.about"};
- private static int[] fragment = new int[] {R.layout.fragment_main, R.layout.fragment_morse, R.layout.fragment_about };
- public static int mainPosition;
+public class MainActivity extends MaterialNavigationDrawer {
- public final static String EXTRA_MESSAGE = "de.marcelkapfer.morseconverter.MESSAGE";
- public String tfOutput = "";
- public static int lastFragment = 0;
+ private MaterialSection writtenMorse;
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- mTitle = mDrawerTitle = getTitle();
- mMenuTitles = getResources().getStringArray(R.array.menu_array);
- mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
- mDrawerList = (ListView) findViewById(R.id.left_drawer);
-
- // set a custom shadow that overlays the main content when the drawer opens
- mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
- // set up the drawer's list view with items and click listener
- mDrawerList.setAdapter(new ArrayAdapter(this,
- R.layout.drawer_list_item, mMenuTitles));
- mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
-
- // enable ActionBar app icon to behave as action to toggle nav drawer
- getActionBar().setDisplayHomeAsUpEnabled(true);
- getActionBar().setHomeButtonEnabled(true);
-
- // ActionBarDrawerToggle ties together the the proper interactions
- // between the sliding drawer and the action bar app icon
- mDrawerToggle = new ActionBarDrawerToggle(
- this, /* host Activity */
- mDrawerLayout, /* DrawerLayout object */
- R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
- R.string.drawer_open, /* "open drawer" description for accessibility */
- R.string.drawer_close /* "close drawer" description for accessibility */
- ) {
-
- /** Called when a drawer has settled in a completely closed state. */
- public void onDrawerClosed(View view) {
- super.onDrawerClosed(view);
- getActionBar().setTitle(mTitle);
- }
-
- /** Called when a drawer has settled in a completely open state. */
- public void onDrawerOpened(View drawerView) {
- super.onDrawerOpened(drawerView);
- getActionBar().setTitle(mDrawerTitle);
- }
-
- };
- mDrawerLayout.setDrawerListener(mDrawerToggle);
-
-
- if(savedInstanceState == null) {
- changeFragment(lastFragment);
- }
+ public void init(Bundle savedInstanceState) {
+ writtenMorse = this.newSection("writtenMorse", new MainFragment());
+ this.addSection(writtenMorse);
+ this.setDrawerHeaderImage(this.getResources().getDrawable(R.drawable.feature_graphics));
+ allowArrowAnimation();
}
-
-
- /* The click listner for ListView in the navigation drawer */
- private class DrawerItemClickListener implements ListView.OnItemClickListener {
- @Override
- public void onItemClick(AdapterView parent, View view, int position, long id) {
-
- changeFragment(position);
- mainPosition = position;
- }
-
- }
-
-
- public void changeFragment(int position){
-
-
- fragment_main newFragment = new fragment_main();
- Bundle args = new Bundle();
- args.putInt(fragments[position], position);
- newFragment.setArguments(args);
-
- // Insert the fragment by replacing any existing fragment
- FragmentManager fragmentManager = getFragmentManager();
- fragmentManager.beginTransaction()
- .replace(R.id.container, newFragment).commit();
-
- mDrawerList.setItemChecked(position, true);
- setTitle(mMenuTitles[position]);
- mDrawerLayout.closeDrawer(mDrawerList);
-
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Pass the event to ActionBarDrawerToggle, if it returns
- // true, then it has handled the app icon touch event
- if (mDrawerToggle.onOptionsItemSelected(item)) {
- return true;
- }
- // Handle your other action bar items...
-
- return super.onOptionsItemSelected(item);
- }
-
-
- @Override
- public void setTitle(CharSequence title) {
- mTitle = title;
- getActionBar().setTitle(mTitle);
- }
-
- /**
- * When using the ActionBarDrawerToggle, you must call it during
- * onPostCreate() and onConfigurationChanged()...
- */
-
- @Override
- protected void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
- // Sync the toggle state after onRestoreInstanceState has occurred.
- mDrawerToggle.syncState();
- }
-
- @Override
- public void onConfigurationChanged(Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
- mDrawerToggle.onConfigurationChanged(newConfig);
- }
-
-
-
-
- public static class fragment_main extends Fragment {
- public static final String ARG_POSITION = "menu_number";
-
-
- public fragment_main() {
- // Empty subclass required for fragment subclass
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View rootView = inflater.inflate(fragment[MainActivity.mainPosition], container, false);
- //int i = getArguments().getInt(ARG_POSITION);
- //String menu = getResources().getStringArray(R.array.menu_array)[i];
- //getActivity().setTitle(menu);
- return rootView;
- }
- }
-
-
- /*
- * Code for converting latin letters into written morse
- */
- public void decode(View view) {
- EditText editText = (EditText) findViewById(R.id.edit_message);
- StringBuffer message = new StringBuffer(editText.getText());
- if (message.toString().endsWith(" ")){
- message = message.deleteCharAt(message.length() - 1);
- }
- // Variables
- StringBuffer input = new StringBuffer();
- input = input.replace(0, input.length(), message.toString().toUpperCase());
- StringBuffer output = new StringBuffer();
- if (input.toString().equals("")) {
- tfOutput = "Please enter at least one character";
- After(view);
- } else if (input.toString().equals("LETTERSPACE")) {
- tfOutput = "#";
- After(view);
- } else if (input.toString().equals("END OF WORK")) {
- tfOutput = "000101";
- After(view);
- } else if (input.toString().equals("ERROR")) {
- tfOutput = "00000000";
- After(view);
- } else if (input.toString().equals("STARTING SIGNAL")) {
- tfOutput = "10101";
- After(view);
- } else if (input.toString().equals("ENDING SIGNAL")) {
- tfOutput = "01010";
- After(view);
- } else if (input.toString().equals("UNDERSTOOD")) {
- tfOutput = "00010";
- After(view);
- } else if (input.toString().equals("WAIT")) {
- tfOutput = "01000";
- After(view);
- } else if (input.toString().equals("SOS")) {
- tfOutput = "000111000";
- After(view);
- } else if (input.toString().equals("LETTER SPACE")) {
- tfOutput = "#";
- After(view);
- } else if (input.toString().equals("WORD SPACE")) {
- tfOutput = "+";
- After(view);
- } else {
- for (int c = input.length(); c > 0; c--) {
-
- if (input.toString().startsWith(" ")) {
- if(output.toString().endsWith("#")){
- output.delete(output.length() -1 , output.length());
- }
- output.append("+");
- input.delete(0, 1);
- } else if (input.toString().startsWith("A")) {
- output.append("01#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("B")) {
- output.append("1000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("C")) {
- output.append("1010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("D")) {
- output.append("100#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("E")) {
- output.append("0#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("F")) {
- output.append("0010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("G")) {
- output.append("110#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("H")) {
- output.append("0000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("I")) {
- output.append("00#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("J")) {
- output.append("0111#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("K")) {
- output.append("101#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("L")) {
- output.append("0100#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("M")) {
- output.append("11#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("N")) {
- output.append("10#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("O")) {
- output.append("111#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("P")) {
- output.append("0110#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Q")) {
- output.append("1101#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("R")) {
- output.append("010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("S")) {
- output.append("000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("T")) {
- output.append("1#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("U")) {
- output.append("001#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("V")) {
- output.append("0001#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("W")) {
- output.append("011#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("X")) {
- output.append("1001#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Y")) {
- output.append("1011#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Z")) {
- output.append("1100#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("0")) {
- output.append("11111#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("1")) {
- output.append("01111#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("2")) {
- output.append("00111#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("3")) {
- output.append("00011#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("4")) {
- output.append("00001#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("5")) {
- output.append("00000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("6")) {
- output.append("10000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("7")) {
- output.append("11000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("8")) {
- output.append("11100#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("9")) {
- output.append("11110#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Ä")) {
- output.append("0101#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Ö")) {
- output.append("1110#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Ü")) {
- output.append("0011#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("ß")) {
- output.append("00011000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith(".")) {
- output.append("010101#");
- input.delete(0, 1);
- } else if (input.toString().startsWith(",")) {
- output.append("110011#");
- input.delete(0, 1);
- } else if (input.toString().startsWith(":")) {
- output.append("111000#");
- input.delete(0, 1);
- } else if (input.toString().startsWith(";")) {
- output.append("101010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("?")) {
- output.append("001100#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("!")) {
- output.append("101011#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("-")) {
- output.append("100001#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("_")) {
- output.append("001101#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("(")) {
- output.append("10110#");
- input.delete(0, 1);
- } else if (input.toString().startsWith(")")) {
- output.append("101101#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("=")) {
- output.append("10001#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("+")) {
- output.append("01010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("/")) {
- output.append("10010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("@")) {
- output.append("011010#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("'")) {
- output.append("011110#");
- input.delete(0, 1);
- } else if (input.toString().startsWith("$")) {
- output.append("0001001#");
- input.delete(0, 1);
- } else {
- tfOutput = "Code not listed or wrong.";
- }
- }
- if(output.toString().endsWith("#")){
- output.delete(output.length() -1 , output.length());
- }
- tfOutput = output.toString();
- lastFragment = 0;
- After(view);
- }
- }
-
- /*
- * Code for converting writtenMorse to latin letters
- */
- public void encode (View view) {
- EditText editText = (EditText) findViewById(R.id.edit_message);
- StringBuffer message = new StringBuffer(editText.getText());
- if (message.toString().endsWith(" ")){
- message = message.deleteCharAt(message.length() - 1);
- }
- // Variables
- String input;
- StringBuffer output = new StringBuffer();
- input = message.toString().toUpperCase() + "#";
- StringBuffer inputToSign = new StringBuffer(input);
- while (!inputToSign.toString().equals("#")) {
- int d = 0;
- boolean signFull = true;
- StringBuffer sign = new StringBuffer();
- while (signFull) {
- if (inputToSign.toString().charAt(d) == '+'
- || inputToSign.toString().charAt(d) == '#') {
- if (d == 0) {
- if (inputToSign.toString().startsWith("+")) {
- output.append(" ");
- }
- inputToSign.deleteCharAt(0);
- } else {
- sign.replace(0, sign.length(), inputToSign
- .toString().substring(0, d));
- inputToSign.delete(0, d);
- signFull = false;
- }
- } else {
- d++;
- }
- }
- if (input.equals("°")) {
- break;
- } else if (sign.toString().equals("01")) {
- output.append("A");
- } else if (sign.toString().equals("1000")) {
- output.append("B");
- } else if (sign.toString().equals("1010")) {
- output.append("C");
- } else if (sign.toString().equals("100")) {
- output.append("D");
- } else if (sign.toString().equals("0")) {
- output.append("E");
- } else if (sign.toString().equals("0010")) {
- output.append("F");
- } else if (sign.toString().equals("110")) {
- output.append("G");
- } else if (sign.toString().equals("0000")) {
- output.append("H");
- } else if (sign.toString().equals("00")) {
- output.append("I");
- } else if (sign.toString().equals("0111")) {
- output.append("J");
- } else if (sign.toString().equals("101")) {
- output.append("K");
- } else if (sign.toString().equals("0100")) {
- output.append("L");
- } else if (sign.toString().equals("11")) {
- output.append("M");
- } else if (sign.toString().equals("10")) {
- output.append("N");
- } else if (sign.toString().equals("111")) {
- output.append("O");
- } else if (sign.toString().equals("0110")) {
- output.append("P");
- } else if (sign.toString().equals("1101")) {
- output.append("Q");
- } else if (sign.toString().equals("010")) {
- output.append("R");
- } else if (sign.toString().equals("000")) {
- output.append("S");
- } else if (sign.toString().equals("1")) {
- output.append("T");
- } else if (sign.toString().equals("001")) {
- output.append("U");
- } else if (sign.toString().equals("0001")) {
- output.append("V");
- } else if (sign.toString().equals("011")) {
- output.append("W");
- } else if (sign.toString().equals("1001")) {
- output.append("X");
- } else if (sign.toString().equals("1011")) {
- output.append("Y");
- } else if (sign.toString().equals("1100")) {
- output.append("Z");
- } else if (sign.toString().equals("11111")) {
- output.append("0 (zero)");
- } else if (sign.toString().equals("01111")) {
- output.append("1");
- } else if (sign.toString().equals("00111")) {
- output.append("2");
- } else if (sign.toString().equals("00011")) {
- output.append("3");
- } else if (sign.toString().equals("00001")) {
- output.append("4");
- } else if (sign.toString().equals("00000")) {
- output.append("5");
- } else if (sign.toString().equals("10000")) {
- output.append("6");
- } else if (sign.toString().equals("11000")) {
- output.append("7");
- } else if (sign.toString().equals("11100")) {
- output.append("8");
- } else if (sign.toString().equals("11110")) {
- output.append("9");
- } else if (sign.toString().equals("0101")) {
- output.append("Ä");
- } else if (sign.toString().equals("1110")) {
- output.append("Ö");
- } else if (sign.toString().equals("0011")) {
- output.append("Ü");
- } else if (sign.toString().equals("00011000")) {
- output.append("ß");
- } else if (sign.toString().equals("1111")) {
- output.append("CH");
- } else if (sign.toString().equals("010101")) {
- output.append(".");
- } else if (sign.toString().equals("110011")) {
- output.append(",");
- } else if (sign.toString().equals("111000")) {
- output.append(":");
- } else if (sign.toString().equals("101010")) {
- output.append(";");
- } else if (sign.toString().equals("001100")) {
- output.append("?");
- } else if (sign.toString().equals("101011")) {
- output.append("!");
- } else if (sign.toString().equals("100001")) {
- output.append("-");
- } else if (sign.toString().equals("001101")) {
- output.append("_");
- } else if (sign.toString().equals("10110")) {
- output.append("(");
- } else if (sign.toString().equals("101101")) {
- output.append(")");
- } else if (sign.toString().equals("011110")) {
- output.append("'");
- } else if (sign.toString().equals("10001")) {
- output.append("=");
- } else if (sign.toString().equals("01010")) {
- output.append("+ or End of the signal");
- } else if (sign.toString().equals("10010")) {
- output.append("/");
- } else if (sign.toString().equals("011010")) {
- output.append("@");
- } else if (sign.toString().equals("10101")) {
- output.append("Begin of the signal");
- } else if (sign.toString().equals("10001")) {
- output.append("Wait");
- } else if (sign.toString().equals("00010")) {
- output.append("Understood");
- } else if (sign.toString().equals("000101")) {
- output.append("End of work");
- } else if (sign.toString().equals("000111000")) {
- output.append("SOS");
- } else if (sign.toString().equals("00000000")) {
- output.append("Error");
- } else {
- tfOutput = "Code not listed or wrong.";
- }
- }
- tfOutput = output.toString();
- lastFragment = 0;
- After(view);
- /*} catch (Exception e) {
- tfOutput.setText("Some error occured. I'm sorry!");
- }*/
- }
-
- /*
- * Code for converting normal letters into morse code
- */
-
- public void llm(View view) {
- EditText editText = (EditText) findViewById(R.id.edit_message);
- StringBuffer message = new StringBuffer(editText.getText());
- if (message.toString().endsWith(" ")){
- message = message.deleteCharAt(message.length() - 1);
- }
- // Variables
- // Variables
- StringBuffer input = new StringBuffer();
- input = input.replace(0, input.length(), message.toString().toUpperCase());
- StringBuffer output = new StringBuffer();
- if (input.toString().equals("")) {
- tfOutput = "Please enter at least one character";
- After(view);
- } else if (input.toString().equals("LETTERSPACE")) {
- tfOutput = " ";
- After(view);
- } else if (input.toString().equals("END OF WORK")) {
- tfOutput = "...-.-";
- After(view);
- } else if (input.toString().equals("ERROR")) {
- tfOutput = "........";
- After(view);
- } else if (input.toString().equals("STARTING SIGNAL")) {
- tfOutput = "-.-.-";
- After(view);
- } else if (input.toString().equals("ENDING SIGNAL")) {
- tfOutput = ".-.-.";
- After(view);
- } else if (input.toString().equals("UNDERSTOOD")) {
- tfOutput = "...-.";
- After(view);
- } else if (input.toString().equals("WAIT")) {
- tfOutput = ".-...";
- After(view);
- } else if (input.toString().equals("SOS")) {
- tfOutput = "...---...";
- After(view);
- } else if (input.toString().equals("LETTER SPACE")) {
- tfOutput = " ";
- After(view);
- } else if (input.toString().equals("WORD SPACE")) {
- tfOutput = " ";
- After(view);
- } else {
- for (int c = input.length(); c > 0; c--) {
- if (input.toString().startsWith(" ")) {
- if(output.toString().endsWith(" ")){
- output.delete(output.length() - 3 , output.length());
- }
- output.append(" ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("A")) {
- output.append(".- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("B")) {
- output.append("-... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("C")) {
- output.append("-.-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("D")) {
- output.append("-.. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("E")) {
- output.append(". ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("F")) {
- output.append("..-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("G")) {
- output.append("--. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("H")) {
- output.append(".... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("I")) {
- output.append(".. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("J")) {
- output.append(".--- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("K")) {
- output.append("-.- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("L")) {
- output.append(".-.. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("M")) {
- output.append("-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("N")) {
- output.append("-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("O")) {
- output.append("--- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("P")) {
- output.append(".--. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Q")) {
- output.append("--.- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("R")) {
- output.append(".-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("S")) {
- output.append("... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("T")) {
- output.append("- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("U")) {
- output.append("..- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("V")) {
- output.append("...- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("W")) {
- output.append(".-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("X")) {
- output.append("-..- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Y")) {
- output.append("-.-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Z")) {
- output.append("--.. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("0")) {
- output.append("----- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("1")) {
- output.append(".---- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("2")) {
- output.append("..--- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("3")) {
- output.append("...-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("4")) {
- output.append("....- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("5")) {
- output.append("..... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("6")) {
- output.append("-.... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("7")) {
- output.append("--... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("8")) {
- output.append("---.. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("9")) {
- output.append("----. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Ä")) {
- output.append(".-.- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Ö")) {
- output.append("---. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("Ü")) {
- output.append("..-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("ß")) {
- output.append("...--... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith(".")) {
- output.append(".-.-.- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith(",")) {
- output.append("--..-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith(":")) {
- output.append("---... ");
- input.delete(0, 1);
- } else if (input.toString().startsWith(";")) {
- output.append("-.-.-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("?")) {
- output.append("..--.. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("!")) {
- output.append("-.-.-- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("-")) {
- output.append("-....- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("_")) {
- output.append("..--.- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("(")) {
- output.append("-.--. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith(")")) {
- output.append("-.--.- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("=")) {
- output.append("-...- ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("+")) {
- output.append(".-.-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("/")) {
- output.append("-..-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("@")) {
- output.append(".--.-. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("'")) {
- output.append(".----. ");
- input.delete(0, 1);
- } else if (input.toString().startsWith("$")) {
- output.append("...-..- ");
- input.delete(0, 1);
- } else {
- tfOutput = "Code not listed or wrong.";
- }
- }
- if(output.toString().endsWith(" ")){
- output.delete(output.length() - 3 , output.length());
- }
- tfOutput = output.toString();
- lastFragment = 1;
- After(view);
- }
- }
-
- /*
- * Code for converting morse code into latin letters
- */
- public void mll(View view) {
- EditText editText = (EditText) findViewById(R.id.edit_message);
- StringBuffer message = new StringBuffer(editText.getText());
- if (message.toString().endsWith(" ")){
- message = message.deleteCharAt(message.length() - 1);
- }
- String input;
- StringBuffer output = new StringBuffer();
- input = message.toString().toUpperCase() + "#";
- StringBuffer inputToSign = new StringBuffer(input);
- while (!message.toString().equals(" ")) {
- int d = 0;
- boolean signFull = true;
- StringBuffer sign = new StringBuffer();
- while (signFull) {
- if (inputToSign.toString().startsWith(" ")) {
- output.append(" ");
- inputToSign.delete(d, d + 9);
- } else if (inputToSign.toString().substring(d, d + 3)
- .equals(" ")) {
- if (d == 0) {
- inputToSign.delete(0, 3);
- } else {
- sign.replace(0, sign.length(), inputToSign
- .toString().substring(0, d));
- inputToSign.delete(0, d);
- signFull = false;
- }
- } else {
- d++;
- }
- }
- if (sign.toString().equals(".-")) {
- output.append("A");
- } else if (sign.toString().equals("-...")) {
- output.append("B");
- } else if (sign.toString().equals("-.-.")) {
- output.append("C");
- } else if (sign.toString().equals("-..")) {
- output.append("D");
- } else if (sign.toString().equals(".")) {
- output.append("E");
- } else if (sign.toString().equals("..-.")) {
- output.append("F");
- } else if (sign.toString().equals("--.")) {
- output.append("G");
- } else if (sign.toString().equals("....")) {
- output.append("H");
- } else if (sign.toString().equals("..")) {
- output.append("I");
- } else if (sign.toString().equals(".---")) {
- output.append("J");
- } else if (sign.toString().equals("-.-")) {
- output.append("K");
- } else if (sign.toString().equals(".-..")) {
- output.append("L");
- } else if (sign.toString().equals("--")) {
- output.append("M");
- } else if (sign.toString().equals("-.")) {
- output.append("N");
- } else if (sign.toString().equals("---")) {
- output.append("O");
- } else if (sign.toString().equals(".--.")) {
- output.append("P");
- } else if (sign.toString().equals("--.-")) {
- output.append("Q");
- } else if (sign.toString().equals(".-.")) {
- output.append("R");
- } else if (sign.toString().equals("...")) {
- output.append("S");
- } else if (sign.toString().equals("-")) {
- output.append("T");
- } else if (sign.toString().equals("..-")) {
- output.append("U");
- } else if (sign.toString().equals("...-")) {
- output.append("V");
- } else if (sign.toString().equals(".--")) {
- output.append("W");
- } else if (sign.toString().equals("-..-")) {
- output.append("X");
- } else if (sign.toString().equals("-.--")) {
- output.append("Y");
- } else if (sign.toString().equals("--..")) {
- output.append("Z");
- } else if (sign.toString().equals("-----")) {
- output.append(". (zero)");
- } else if (sign.toString().equals(".----")) {
- output.append("-");
- } else if (sign.toString().equals("..---")) {
- output.append("2");
- } else if (sign.toString().equals("...--")) {
- output.append("3");
- } else if (sign.toString().equals("....-")) {
- output.append("4");
- } else if (sign.toString().equals(".....")) {
- output.append("5");
- } else if (sign.toString().equals("-....")) {
- output.append("6");
- } else if (sign.toString().equals("--...")) {
- output.append("7");
- } else if (sign.toString().equals("---..")) {
- output.append("8");
- } else if (sign.toString().equals("----.")) {
- output.append("9");
- } else if (sign.toString().equals(".-.-")) {
- output.append("Ä");
- } else if (sign.toString().equals("---.")) {
- output.append("Ö");
- } else if (sign.toString().equals("..--")) {
- output.append("Ü");
- } else if (sign.toString().equals("...--...")) {
- output.append("ß");
- } else if (sign.toString().equals("----")) {
- output.append("CH");
- } else if (sign.toString().equals(".-.-.-")) {
- output.append(".");
- } else if (sign.toString().equals("--..--")) {
- output.append(",");
- } else if (sign.toString().equals("---...")) {
- output.append(":");
- } else if (sign.toString().equals("-.-.-.")) {
- output.append(";");
- } else if (sign.toString().equals("..--..")) {
- output.append("?");
- } else if (sign.toString().equals("-.-.--")) {
- output.append("!");
- } else if (sign.toString().equals("-....-")) {
- output.append("-");
- } else if (sign.toString().equals("..--.-")) {
- output.append("_");
- } else if (sign.toString().equals("-.--.")) {
- output.append("(");
- } else if (sign.toString().equals("-.--.-")) {
- output.append(")");
- } else if (sign.toString().equals(".----.")) {
- output.append("'");
- } else if (sign.toString().equals("-...-")) {
- output.append("=");
- } else if (sign.toString().equals(".-.-.")) {
- output.append("+ or End of the signal");
- } else if (sign.toString().equals("-..-.")) {
- output.append("/");
- } else if (sign.toString().equals(".--.-.")) {
- output.append("@");
- } else if (sign.toString().equals("-.-.-")) {
- output.append("Begin of the signal");
- } else if (sign.toString().equals("-...-")) {
- output.append("Wait");
- } else if (sign.toString().equals("...-.")) {
- output.append("Understood");
- } else if (sign.toString().equals("...-.-")) {
- output.append("End of work");
- } else if (sign.toString().equals("...---...")) {
- output.append("SOS");
- } else if (sign.toString().equals("........")) {
- output.append("Error");
- } else {
- tfOutput = "Code not listed or wrong.";
- }
- }
- tfOutput = output.toString();
- lastFragment = 1;
- After(view);
- }
-
-
- public void After(View view){
- Intent intent = new Intent(this, DisplayMessageActivity.class);
- intent.putExtra(EXTRA_MESSAGE, tfOutput );
- startActivity(intent);
- tfOutput = "";
- }
}
diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainFragment.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainFragment.java
new file mode 100644
index 0000000..e37ffaa
--- /dev/null
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainFragment.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 MainFragment extends Fragment{
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+ return inflater.inflate(R.layout.fragment_main, container, false);
+ }
+}
diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
deleted file mode 100644
index 236bff5..0000000
Binary files a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index 772e359..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_share.png b/app/src/main/res/drawable-hdpi/ic_action_share.png
deleted file mode 100644
index a36464b..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index 264b087..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
deleted file mode 100644
index ffe3a28..0000000
Binary files a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index 4edb1ff..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_share.png b/app/src/main/res/drawable-mdpi/ic_action_share.png
deleted file mode 100644
index 7362f0d..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 5adf989..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
deleted file mode 100644
index fabe9d9..0000000
Binary files a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index 19658e4..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_share.png b/app/src/main/res/drawable-xhdpi/ic_action_share.png
deleted file mode 100644
index 40771e4..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index a548eeb..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
deleted file mode 100644
index b91e9d7..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png
deleted file mode 100644
index a108638..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_share.png
deleted file mode 100644
index 22ed428..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index c77bb2a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable/actionbar.png b/app/src/main/res/drawable/actionbar.png
deleted file mode 100644
index 84d7d9e..0000000
Binary files a/app/src/main/res/drawable/actionbar.png and /dev/null differ
diff --git a/app/src/main/res/drawable/feature_graphics.png b/app/src/main/res/drawable/feature_graphics.png
new file mode 100644
index 0000000..617ebc3
Binary files /dev/null and b/app/src/main/res/drawable/feature_graphics.png differ
diff --git a/app/src/main/res/layout/activity_display_message.xml b/app/src/main/res/layout/activity_display_message.xml
deleted file mode 100644
index 5bffc80..0000000
--- a/app/src/main/res/layout/activity_display_message.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5882dbf..f7158b8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,59 +1,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
deleted file mode 100644
index 8296b3d..0000000
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_display_message.xml b/app/src/main/res/layout/fragment_display_message.xml
deleted file mode 100644
index 11d19d0..0000000
--- a/app/src/main/res/layout/fragment_display_message.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 759cdbd..f0c21dc 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -18,63 +18,84 @@
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"
+ >
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
\ 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 d2f795f..64d448c 100644
--- a/app/src/main/res/layout/fragment_morse.xml
+++ b/app/src/main/res/layout/fragment_morse.xml
@@ -50,18 +50,15 @@
.
-
- Marcel Michael Kapfer
- marcelmichaelkapfer@yahoo.co.nz
-
- Version 1.0.1
-
--->
-
diff --git a/app/src/main/res/menu/display_message.xml b/app/src/main/res/menu/display_message.xml
deleted file mode 100644
index 566241b..0000000
--- a/app/src/main/res/menu/display_message.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
diff --git a/app/src/main/res/menu/display_message_activity_actions.xml b/app/src/main/res/menu/display_message_activity_actions.xml
deleted file mode 100644
index 8b99c23..0000000
--- a/app/src/main/res/menu/display_message_activity_actions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
deleted file mode 100644
index 2a160df..0000000
--- a/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
diff --git a/app/src/main/res/menu/main_activity_actions.xml b/app/src/main/res/menu/main_activity_actions.xml
deleted file mode 100644
index c1079ba..0000000
--- a/app/src/main/res/menu/main_activity_actions.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
new file mode 100644
index 0000000..b1cb908
--- /dev/null
+++ b/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,6 @@
+
diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
deleted file mode 100644
index 004567b..0000000
--- a/app/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/values-v19/styles.xml b/app/src/main/res/values-v19/styles.xml
deleted file mode 100644
index b24a5d7..0000000
--- a/app/src/main/res/values-v19/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index f3e7020..63fc816 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,10 +1,6 @@
-
-
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
64dp
-
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 55c1e59..47c8224 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,5 @@
-
16dp
16dp
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 965416a..09e29e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
@@ -44,13 +42,15 @@
\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.
About
-
Open navigation drawer
Close navigation drawer
+
- writtenMorse
- Normal Morse
- About
+ Hello blank fragment
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0309de5..fcbcd17 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,20 +1,12 @@
-
-
-
-
-
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
deleted file mode 100644
index 0d07e8e..0000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
index d728479..6356aab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
buildscript {
repositories {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0-rc4'
+ classpath 'com.android.tools.build:gradle:1.0.0'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
}
}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/import-summary.txt b/import-summary.txt
deleted file mode 100644
index dbd085b..0000000
--- a/import-summary.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-ECLIPSE ANDROID PROJECT IMPORT SUMMARY
-======================================
-
-Ignored Files:
---------------
-The following files were *not* copied into the new Gradle project; you
-should evaluate whether these are still needed in your project and if
-so manually move them:
-
-* ic_launcher-web.png
-* proguard-project.txt
-
-Replaced Jars with Dependencies:
---------------------------------
-The importer recognized the following .jar files as third party
-libraries and replaced them with Gradle dependencies instead. This has
-the advantage that more explicit version information is known, and the
-libraries can be updated automatically. However, it is possible that
-the .jar file in your project was of an older version than the
-dependency we picked, which could render the project not compileable.
-You can disable the jar replacement in the import wizard and try again:
-
-android-support-v4.jar => com.android.support:support-v4:19.1.0
-
-Moved Files:
-------------
-Android Gradle projects use a different directory structure than ADT
-Eclipse projects. Here's how the projects were restructured:
-
-* AndroidManifest.xml => app/src/main/AndroidManifest.xml
-* assets/ => app/src/main/assets/
-* lint.xml => app/lint.xml
-* res/ => app/src/main/res/
-* src/ => app/src/main/java/
-
-Next Steps:
------------
-You can now build the project. The Gradle project needs network
-connectivity to download dependencies.
-
-Bugs:
------
-If for some reason your project does not build, and you determine that
-it is due to a bug or limitation of the Eclipse to Gradle importer,
-please file a bug at http://b.android.com with category
-Component-Tools.
-
-(This import summary is for your information only, and can be deleted
-after import once you are satisfied with the results.)