mmk2410/morse-converter-android
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed BUG0001 and BUG0002

Browse source
This commit is contained in:
mmk2410 2015-01-04 20:50:43 +01:00
parent 330edfdb10
commit 18bb894aea
4 changed files with 135 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.idea/libraries/support_v4_19_1_0.xml
View file

@ -1,11 +1,11 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="support-v4-19.1.0"> <library name="support-v4-19.1.0">
<CLASSES> <CLASSES>
<root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0.jar!/" /> <root url="jar://$USER_HOME$/android-sdks/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0-sources.jar!/" /> <root url="jar://$USER_HOME$/android-sdks/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>

2
.idea/vcs.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

290
.idea/workspace.xml
View file

@ -35,7 +35,12 @@
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="app: de.marcelkapfer.morseconverter" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="app: de.marcelkapfer.morseconverter" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="14b6e9c6-62f7-494e-8b8f-1cc16107fd17" name="Default" comment="" /> <list default="true" id="14b6e9c6-62f7-494e-8b8f-1cc16107fd17" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_19_1_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_19_1_0.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="MorseConverter.iws" /> <ignored path="MorseConverter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@ -59,15 +64,15 @@
<leaf> <leaf>
<file leaf-file-name="fragment_main.xml" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="fragment_main.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider selected="true" editor-type-id="android-designer">
<state />
</provider>
<provider editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1116"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1116">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer">
<state />
</provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="themes.xml" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="themes.xml" pinned="false" current="false" current-in-tab="false">
@ -133,31 +138,33 @@
<file leaf-file-name="styles.xml" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="styles.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-v19/styles.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v19/styles.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3" max-vertical-offset="576"> <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="576">
<caret line="21" column="60" selection-start-line="21" selection-start-column="60" selection-end-line="21" selection-end-column="60" /> <caret line="21" column="60" selection-start-line="21" selection-start-column="60" selection-end-line="21" selection-end-column="60" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MainActivity.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="MainActivity.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="17802"> <state vertical-scroll-proportion="-2.142091" vertical-offset="17251" max-vertical-offset="18162">
<caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="4" /> <caret line="914" column="23" selection-start-line="914" selection-start-column="23" selection-end-line="914" selection-end-column="23" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#2810#2830#0" expanded="true" />
<element signature="e#2899#2920#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="DisplayMessageActivity.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="DisplayMessageActivity.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.43979058" vertical-offset="0" max-vertical-offset="1674"> <state vertical-scroll-proportion="0.0" vertical-offset="252" max-vertical-offset="1674">
<caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" /> <caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -754,12 +761,15 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="MavenProjectNavigator">
<option name="y" value="21" /> <treeState />
<option name="width" value="1366" />
<option name="height" value="715" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectFrameBounds">
<option name="y" value="31" />
<option name="width" value="1366" />
<option name="height" value="737" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" /> <OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" /> <OptionsSetting value="true" id="Checkout" />
@ -785,7 +795,9 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane" /> <pane id="ProjectPane" />
<pane id="PackagesPane" />
<pane id="AndroidView"> <pane id="AndroidView">
<subPane> <subPane>
<PATH> <PATH>
@ -794,172 +806,8 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="values" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="values" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="styles.xml" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="values" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="strings.xml" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layout" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="drawable" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ic_launcher.png" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="drawable" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="MorseConverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="morseconverter" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -979,6 +827,7 @@
<property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" /> <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" />
<property name="ExportApk.Flavors" value="" /> <property name="ExportApk.Flavors" value="" />
<property name="ExportApk.BuildType" value="release" /> <property name="ExportApk.BuildType" value="release" />
<property name="FullScreen" value="false" />
</component> </component>
<component name="RunManager" selected="Android Application.app"> <component name="RunManager" selected="Android Application.app">
<configuration default="true" type="JUnit" factoryName="JUnit"> <configuration default="true" type="JUnit" factoryName="JUnit">
@ -1151,25 +1000,26 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="21" width="1366" height="715" extended-state="6" /> <frame x="0" y="31" width="1366" height="737" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32885906" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32960597" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24924472" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Memory Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Memory Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@ -1179,7 +1029,6 @@
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@ -1230,32 +1079,53 @@
<option name="myTodoPanelSettings"> <option name="myTodoPanelSettings">
<TodoPanelSettings /> <TodoPanelSettings />
</option> </option>
<option name="LAST_COMMIT_MESSAGE" value="" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager /> <breakpoint-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java">
<provider selected="true" editor-type-id="android-designer"> <provider selected="true" editor-type-id="text-editor">
<state /> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="18090">
<caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2810#2830#0" expanded="true" />
<element signature="e#2899#2920#0" expanded="true" />
</folding>
</state>
</provider> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="252" max-vertical-offset="1674">
<caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml">
<provider editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider selected="true" editor-type-id="android-designer"> <provider selected="true" editor-type-id="android-designer">
<state /> <state />
</provider> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1116"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1116">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer">
<state />
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/themes.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/themes.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -1581,17 +1451,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="930">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/themes.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/themes.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="420"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="420">
@ -1639,20 +1498,33 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="17802"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="930">
<caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="4" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer">
<state />
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/DisplayMessageActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.43979058" vertical-offset="0" max-vertical-offset="1674"> <state vertical-scroll-proportion="0.0" vertical-offset="252" max-vertical-offset="1674">
<caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" /> <caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.142091" vertical-offset="17251" max-vertical-offset="18162">
<caret line="914" column="23" selection-start-line="914" selection-start-column="23" selection-end-line="914" selection-end-column="23" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2810#2830#0" expanded="true" />
<element signature="e#2899#2920#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

80
app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
View file

@ -226,8 +226,12 @@ public class MainActivity extends FragmentActivity {
After(view); After(view);
} else { } else {
for (int c = input.length(); c > 0; c--) { for (int c = input.length(); c > 0; c--) {
if (input.toString().startsWith(" ")) { if (input.toString().startsWith(" ")) {
output.append("+"); if(output.toString().endsWith("#")){
output.delete(output.length() -1 , output.length());
}
output.append("+");
input.delete(0, 1); input.delete(0, 1);
} else if (input.toString().startsWith("A")) { } else if (input.toString().startsWith("A")) {
output.append("01#"); output.append("01#");
@ -401,10 +405,9 @@ public class MainActivity extends FragmentActivity {
tfOutput = "Code not listed or wrong."; tfOutput = "Code not listed or wrong.";
} }
} }
if (output.toString().endsWith("#") if(output.toString().endsWith("#")){
&& (output.toString().equals("#") == false)) { output.delete(output.length() -1 , output.length());
output.delete(output.length() - 1, output.length()); }
}
tfOutput = output.toString(); tfOutput = output.toString();
lastFragment = 0; lastFragment = 0;
After(view); After(view);
@ -631,12 +634,15 @@ public class MainActivity extends FragmentActivity {
tfOutput = " "; tfOutput = " ";
After(view); After(view);
} else if (input.toString().equals("WORD SPACE")) { } else if (input.toString().equals("WORD SPACE")) {
tfOutput = " "; tfOutput = " ";
After(view); After(view);
} else { } else {
for (int c = input.length(); c > 0; c--) { for (int c = input.length(); c > 0; c--) {
if (input.toString().startsWith(" ")) { if (input.toString().startsWith(" ")) {
output.append(" "); if(output.toString().endsWith(" ")){
output.delete(output.length() - 3 , output.length());
}
output.append(" ");
input.delete(0, 1); input.delete(0, 1);
} else if (input.toString().startsWith("A")) { } else if (input.toString().startsWith("A")) {
output.append(".- "); output.append(".- ");
@ -810,10 +816,9 @@ public class MainActivity extends FragmentActivity {
tfOutput = "Code not listed or wrong."; tfOutput = "Code not listed or wrong.";
} }
} }
if (output.toString().endsWith(" ") if(output.toString().endsWith(" ")){
&& (output.toString().equals(" ") == false)) { output.delete(output.length() - 3 , output.length());
output.delete(output.length() - 3, output.length()); }
}
tfOutput = output.toString(); tfOutput = output.toString();
lastFragment = 1; lastFragment = 1;
After(view); After(view);
@ -829,33 +834,32 @@ public class MainActivity extends FragmentActivity {
if (message.toString().endsWith(" ")){ if (message.toString().endsWith(" ")){
message = message.deleteCharAt(message.length() - 1); message = message.deleteCharAt(message.length() - 1);
} }
// Variables String input;
String input; StringBuffer output = new StringBuffer();
StringBuffer output = new StringBuffer(); input = message.toString().toUpperCase() + "#";
input = message.toString().toUpperCase() + "#"; StringBuffer inputToSign = new StringBuffer(input);
StringBuffer inputToSign = new StringBuffer(input); while (!message.toString().equals(" ")) {
while (inputToSign.toString().equals("#") == false) { int d = 0;
int d = 0; boolean signFull = true;
boolean signFull = true; StringBuffer sign = new StringBuffer();
StringBuffer sign = new StringBuffer(); while (signFull) {
while (signFull) { if (inputToSign.toString().startsWith(" ")) {
if (inputToSign.toString().charAt(d) == '+' output.append(" ");
|| inputToSign.toString().charAt(d) == '#') { inputToSign.delete(d, d + 9);
if (d == 0) { } else if (inputToSign.toString().substring(d, d + 3)
if (inputToSign.toString().startsWith("+")) { .equals(" ")) {
output.append(" "); if (d == 0) {
} inputToSign.delete(0, 3);
inputToSign.deleteCharAt(0); } else {
} else { sign.replace(0, sign.length(), inputToSign
sign.replace(0, sign.length(), inputToSign .toString().substring(0, d));
.toString().substring(0, d)); inputToSign.delete(0, d);
inputToSign.delete(0, d); signFull = false;
signFull = false; }
} } else {
} else { d++;
d++; }
} }
}
if (sign.toString().equals(".-")) { if (sign.toString().equals(".-")) {
output.append("A"); output.append("A");
} else if (sign.toString().equals("-...")) { } else if (sign.toString().equals("-...")) {