Finishing Materializing

This commit is contained in:
mmk2410 2015-02-15 02:26:06 +01:00
parent e1e3b178e8
commit 38e17fa041
11 changed files with 785 additions and 305 deletions

View file

@ -0,0 +1,12 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
<inspection_tool class="AndroidLintRtlHardcoded" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="AndroidLintUnusedAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile>
</component>

View file

@ -0,0 +1,7 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>

File diff suppressed because it is too large Load diff

View file

@ -6,7 +6,7 @@ android {
defaultConfig { defaultConfig {
applicationId "de.marcelkapfer.morseconverter" applicationId "de.marcelkapfer.morseconverter"
minSdkVersion 10 minSdkVersion 11
targetSdkVersion 21 targetSdkVersion 21
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"

View file

@ -1,6 +1,8 @@
package de.marcelkapfer.morseconverter; package de.marcelkapfer.morseconverter;
import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer; import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
import it.neokree.materialnavigationdrawer.elements.MaterialSection; import it.neokree.materialnavigationdrawer.elements.MaterialSection;
@ -24,4 +26,11 @@ public class MainActivity extends MaterialNavigationDrawer {
allowArrowAnimation(); allowArrowAnimation();
this.disableLearningPattern(); this.disableLearningPattern();
} }
public void developerProfile(){
Intent gplusProfile = new Intent(Intent.ACTION_VIEW, Uri.parse("https://plus.google.com/+MarcelMichaelKapfer/posts"));
startActivity(gplusProfile);
}
} }

View file

@ -26,22 +26,160 @@
android:id="@+id/about" android:id="@+id/about"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin" android:background="#fff"
android:paddingLeft="@dimen/activity_horizontal_margin" tools:context=".AboutActivity$PlaceholderFragment">
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".AboutActivity$PlaceholderFragment" >
<ScrollView <ScrollView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/scrollView" > android:id="@+id/scrollView">
<LinearLayout
style="@style/LinearLayoutListContainer">
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionVersion"
/>
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aboutVersion" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList"
android:onClick="developerProfile">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionDeveloper"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aboutDeveloper" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionWebsite"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aboutWebsite" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionContact"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aboutContact" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionLicense"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aboutLicense" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionBug"
/>
<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/aboutBug" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionHow"
/>
<TextView
android:id="@+id/textView4"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/aboutHow" />
</LinearLayout>
<LinearLayout
style="@style/LinearLayoutList">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16dp"
android:text="@string/sectionMissing"
/>
<TextView
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/aboutMissing"/>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about1" />
</ScrollView> </ScrollView>
</RelativeLayout> </RelativeLayout>

View file

@ -69,7 +69,8 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:gravity="center" android:gravity="center"
android:layout_gravity="right" android:layout_gravity="right"
android:height="48dp"> android:height="48dp"
android:baselineAligned="false">
<Button <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -79,9 +80,10 @@
android:height="36dp" android:height="36dp"
android:onClick="decode" android:onClick="decode"
android:text="@string/button_decode" android:text="@string/button_decode"
android:background="@color/cardview_light_background"
android:textColor="#2196F3" android:textColor="#2196F3"
android:textColorLink="#2196F3" android:gravity="center|right"
android:gravity="center|right" /> style="?android:attr/borderlessButtonStyle" />
<Button <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -91,7 +93,9 @@
android:onClick="encode" android:onClick="encode"
android:text="@string/button_encode" android:text="@string/button_encode"
android:textColor="#2196F3" android:textColor="#2196F3"
android:gravity="center|right"/> android:gravity="center|right"
style="?android:attr/borderlessButtonStyle"
android:background="@color/cardview_light_background" />
</LinearLayout> </LinearLayout>

View file

@ -18,63 +18,88 @@
Marcel Michael Kapfer Marcel Michael Kapfer
marcelmichaelkapfer@yahoo.co.nz marcelmichaelkapfer@yahoo.co.nz
Version 1.0.1 Version 1.1.0
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/morse" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:gravity="center" android:gravity="top"
android:orientation="vertical" > android:orientation="vertical"
tools:context=".MainActivity">
<LinearLayout <android.support.v7.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
android:layout_gravity="top"
android:layout_margin="8dp"
card_view:cardCornerRadius="2dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content">
android:layout_above="@+id/linearLayout2" >
<EditText <LinearLayout
android:id="@+id/edit_message" android:id="@+id/linearLayout1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:ems="10" android:layout_marginLeft="16dp"
android:hint="@string/edit_message" android:layout_marginRight="16dp"
android:padding="10dp" android:layout_marginTop="24dp"
android:scrollbars="vertical" > android:layout_marginBottom="8dp"
</EditText> android:gravity="center"
</LinearLayout> android:minHeight="48dp"
android:orientation="vertical"
>
<LinearLayout <EditText
android:id="@+id/linearLayout2" android:id="@+id/edit_message"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:ems="10"
android:fitsSystemWindows="true" android:hint="@string/edit_message"
android:gravity="center" android:scrollbars="vertical"
android:minHeight="48dp" android:minLines="5">
android:orientation="horizontal" > </EditText>
<Button <LinearLayout
android:layout_width="wrap_content" android:orientation="horizontal"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="match_parent"
android:onClick="llm" android:layout_marginTop="16dp"
android:text="@string/button_decode" android:gravity="center"
android:textColor="#FFFFFF" android:layout_gravity="right"
android:textColorLink="#FFFFFF" /> android:height="48dp"
android:baselineAligned="false">
<Button <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="36dp"
android:layout_weight="1" android:layout_marginRight="8dp"
android:onClick="mll" android:minWidth="64dp"
android:text="@string/button_encode" android:height="36dp"
android:textColor="#FFFFFF" /> android:onClick="decode"
android:text="@string/button_decode"
android:background="@color/cardview_light_background"
android:textColor="#2196F3"
android:gravity="center|right"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout> <Button
android:layout_width="wrap_content"
android:layout_height="36dp"
android:minWidth="64dp"
android:height="36dp"
android:onClick="encode"
android:text="@string/button_encode"
android:textColor="#2196F3"
android:gravity="center|right"
style="?android:attr/borderlessButtonStyle"
android:background="@color/cardview_light_background" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout> </RelativeLayout>

View file

@ -35,15 +35,16 @@
<string name="output_message">Ihr Text</string> <string name="output_message">Ihr Text</string>
<string name="share">Teilen</string> <string name="share">Teilen</string>
<string name="send_to">Teilen Sie Ihren Text:</string> <string name="send_to">Teilen Sie Ihren Text:</string>
<string name="title_activity_about">Über</string>
<string name="title_section1">Version</string>
<string name="title_section2">Entwickler</string>
<string name="title_section3">Spenden</string>
<string name="about1">Über die App \nVersion: 1.0.1 05. Januar 2015 \Entwickler: Marcel Michael Kapfer \nWebsite: marcel-kapfer.de/projects/morse/ \nKontakt: marcelmichaelkapfer@yahoo.co.nz \nLizens: GNU GPL v3.0
\n \nFehler \nWenn Du einen Fehler gefunden hast, schreibe mit bitte ein Email an marcelmichaelkapfer@yahoo.co.nz mit einer kurzen Problembeschreibung.
\n \nVerwendung \nDu kannst eine ausführliche Anwendung auf marcel-kapfer.de/projects/morse/index.html#howto_android finden.
\n \nFehlender Code \nWenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.</string>
<string name="about">Über</string> <string name="about">Über</string>
<string name="normalMorse">Normales Morse</string> <string name="normalMorse">Normales Morse</string>
<string name="aboutBug">Wenn Du einen Fehler gefunden hast, schreibe mit bitte ein Email an marcelmichaelkapfer@yahoo.co.nz</string>
<string name="aboutHow">Du kannst eine ausführliche Anwendung auf marcel-kapfer.de/projects/morse/index.html#howto_android finden.</string>
<string name="aboutMissing">Wenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.</string>
<string name="aboutVersion">2.0 alpha \n14th February 2015</string>
<string name="sectionBug">Fehler</string>
<string name="sectionContact">Kontakt</string>
<string name="sectionDeveloper">Entwickler</string>
<string name="sectionHow">Anleitung</string>
<string name="sectionLicense">Lizens</string>
<string name="sectionMissing">Fehlender Code</string>
</resources> </resources>

View file

@ -33,14 +33,25 @@
<string name="output_message">Your Message</string> <string name="output_message">Your Message</string>
<string name="share">Share</string> <string name="share">Share</string>
<string name="send_to">Share your text:</string> <string name="send_to">Share your text:</string>
<string name="title_activity_about">About Activity</string> <!--About Section Names-->
<string name="title_section1">Version</string> <string name="sectionVersion" translatable="false">Version</string>
<string name="title_section2">Developer</string> <string name="sectionDeveloper">Developer</string>
<string name="title_section3">Donate</string> <string name="sectionWebsite" translatable="false">Website</string>
<string name="about1">About \nVersion: 1.0.1 5th January 2015 \nDeveloper: Marcel Michael Kapfer \nWebsite: marcel-kapfer.de/projects/morse/ \nContact: marcelmichaelkapfer@yahoo.co.nz \nLicense: GNU GPL v3.0 <string name="sectionContact">Contact</string>
\n \nBug \nIf you found a bug, please write me a mail to marcelmichaelkapfer@yahoo.co.nz with a short description of the problem. <string name="sectionLicense">License</string>
\n \nHow to \nYou can find a detailed guide on marcel-kapfer.de/projects/morse/index.html#howto_android <string name="sectionBug">Bug</string>
\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.</string> <string name="sectionHow">How to</string>
<string name="sectionMissing">Missing Code</string>
<!--About Texts-->
<string name="aboutVersion">2.0 alpha \n14th February 2015</string>
<string name="aboutDeveloper" translatable="false">Marcel Michael Kapfer</string>
<string name="aboutWebsite" translatable="false">marcel-kapfer.de/projects/morse/</string>
<string name="aboutContact" translatable="false">marcelmichaelkapfer@yahoo.co.nz</string>
<string name="aboutLicense" translatable="false">GNU GPL v3.0</string>
<string name="aboutBug">If you found a bug, please write me a mail to marcelmichaelkapfer@yahoo.co.nz with a short description of the problem.</string>
<string name="aboutHow">You can find a detailed guide on marcel-kapfer.de/projects/morse/index.html#howto_android</string>
<string name="aboutMissing">If you discovered, that code is missing, then write me a mail to marcelmichaelkapfer@yahoo.co.nz and tell me about it.</string>
<!--Drawer Titles-->
<string name="about">About</string> <string name="about">About</string>
<string name="normalMorse">Normal Morse</string> <string name="normalMorse">Normal Morse</string>
</resources> </resources>

View file

@ -9,4 +9,29 @@
<item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
</style> </style>
</resources> <style name="LinearLayoutList">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingTop">16dp</item>
<item name="android:paddingBottom">20dp</item>
<item name="android:gravity">center</item>
<item name="android:orientation">vertical</item>
</style>
<style name="LinearLayoutListContainer">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:layout_marginBottom">8dp</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
</style>
<style name="Divider">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">0.5dp</item>
<item name="android:background">@color/ripple_material_dark</item>
</style>
</resources>