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

Change dp to sp on fonts

This commit is contained in:
mmk2410 2015-02-15 02:29:22 +01:00
parent 38e17fa041
commit fb5123ffec
2 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
.idea/workspace.xml
View File

@ -34,17 +34,8 @@
<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="5f42ecb6-1f27-452b-9bea-873556b497b4" name="Default" comment="Finishing Materializing"> <list default="true" id="5f42ecb6-1f27-452b-9bea-873556b497b4" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" />
<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$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_morse.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_morse.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="Morse Converter.iws" /> <ignored path="Morse Converter.iws" />
@ -81,14 +72,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="fragment_main.xml" pinned="false" current="true" current-in-tab="true"> <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 editor-type-id="android-designer"> <provider editor-type-id="android-designer">
<state /> <state />
</provider> </provider>
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3321859" vertical-offset="1007" max-vertical-offset="1650"> <state vertical-scroll-proportion="-8.076923" vertical-offset="90" max-vertical-offset="1650">
<caret line="80" column="37" selection-start-line="80" selection-start-column="37" selection-end-line="80" selection-end-column="37" /> <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
<folding> <folding>
<element signature="e#3153#3176#0" expanded="true" /> <element signature="e#3153#3176#0" expanded="true" />
<element signature="e#3711#3734#0" expanded="true" /> <element signature="e#3711#3734#0" expanded="true" />
@ -174,14 +165,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="fragment_about.xml" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="fragment_about.xml" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml">
<provider editor-type-id="android-designer"> <provider editor-type-id="android-designer">
<state /> <state />
</provider> </provider>
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.423077" vertical-offset="677" max-vertical-offset="2865"> <state vertical-scroll-proportion="0.57239056" vertical-offset="0" max-vertical-offset="2865">
<caret line="58" column="33" selection-start-line="58" selection-start-column="33" selection-end-line="58" selection-end-column="33" /> <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
<folding> <folding>
<element signature="e#1715#1739#0" expanded="true" /> <element signature="e#1715#1739#0" expanded="true" />
<element signature="e#1984#2006#0" expanded="true" /> <element signature="e#1984#2006#0" expanded="true" />
@ -826,9 +817,9 @@
<option value="$PROJECT_DIR$/app/build.gradle" /> <option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" />
</list> </list>
</option> </option>
</component> </component>
@ -1217,7 +1208,11 @@
<created>1423935928483</created> <created>1423935928483</created>
<updated>1423935928483</updated> <updated>1423935928483</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="Finishing Materializing">
<created>1423963567259</created>
<updated>1423963567259</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
@ -1227,7 +1222,7 @@
<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="3" 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="3" 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.32838982" sideWeight="0.5" order="7" 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.32838982" 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="0" 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="0" side_tool="false" content_ui="tabs" />
@ -1298,6 +1293,7 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="myTodoPanelSettings"> <option name="myTodoPanelSettings">
<TodoPanelSettings /> <TodoPanelSettings />
</option> </option>
@ -1819,13 +1815,38 @@
</state> </state>
</provider> </provider>
</entry> </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="0.0" vertical-offset="0" max-vertical-offset="555">
<caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
<folding>
<element signature="e#643#678#0" expanded="true" />
<element signature="e#734#763#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider editor-type-id="android-designer">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-8.076923" vertical-offset="90" max-vertical-offset="1650">
<caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
<folding>
<element signature="e#3153#3176#0" expanded="true" />
<element signature="e#3711#3734#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml">
<provider editor-type-id="android-designer"> <provider editor-type-id="android-designer">
<state /> <state />
</provider> </provider>
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.423077" vertical-offset="677" max-vertical-offset="2865"> <state vertical-scroll-proportion="0.57239056" vertical-offset="0" max-vertical-offset="2865">
<caret line="58" column="33" selection-start-line="58" selection-start-column="33" selection-end-line="58" selection-end-column="33" /> <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
<folding> <folding>
<element signature="e#1715#1739#0" expanded="true" /> <element signature="e#1715#1739#0" expanded="true" />
<element signature="e#1984#2006#0" expanded="true" /> <element signature="e#1984#2006#0" expanded="true" />
@ -1847,31 +1868,6 @@
</state> </state>
</provider> </provider>
</entry> </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="0.0" vertical-offset="0" max-vertical-offset="555">
<caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
<folding>
<element signature="e#643#678#0" expanded="true" />
<element signature="e#734#763#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_main.xml">
<provider editor-type-id="android-designer">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3321859" vertical-offset="1007" max-vertical-offset="1650">
<caret line="80" column="37" selection-start-line="80" selection-start-column="37" selection-end-line="80" selection-end-column="37" />
<folding>
<element signature="e#3153#3176#0" expanded="true" />
<element signature="e#3711#3734#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

16
app/src/main/res/layout/fragment_about.xml
View File

@ -42,7 +42,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionVersion" android:text="@string/sectionVersion"
/> />
@ -61,7 +61,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionDeveloper" android:text="@string/sectionDeveloper"
/> />
@ -78,7 +78,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionWebsite" android:text="@string/sectionWebsite"
/> />
@ -95,7 +95,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionContact" android:text="@string/sectionContact"
/> />
@ -112,7 +112,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionLicense" android:text="@string/sectionLicense"
/> />
@ -129,7 +129,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionBug" android:text="@string/sectionBug"
/> />
@ -147,7 +147,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionHow" android:text="@string/sectionHow"
/> />
@ -165,7 +165,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16dp" android:textSize="16sp"
android:text="@string/sectionMissing" android:text="@string/sectionMissing"
/> />