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

Version 2.2.4: New Design for writtenMorse list and about; Fixed links

Browse source
This commit is contained in:
mmk2410 2015-05-20 12:22:51 +02:00
parent 12d2f20dad
commit 5d2e0cc9fc
7 changed files with 69 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,11 +25,15 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.CardView;
import android.view.Display;
import android.view.Surface;
import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.TextView;
@ -99,6 +103,19 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
this.disableLearningPattern(); //Doesn't open the drawer always when the app starts
setBackPattern(MaterialNavigationDrawer.BACKPATTERN_BACK_TO_FIRST);
Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
int screenSize = getResources().getConfiguration().screenLayout &
Configuration.SCREENLAYOUT_SIZE_MASK;
if(!((screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE ||
screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE) &&
(display.getRotation() == Surface.ROTATION_90 ||
display.getRotation() == Surface.ROTATION_270))){
enableToolbarElevation();
}
mDrawerToggle = new MaterialActionBarDrawerToggle(this, null, null, 0, 0){
public void onDrawerClosed(View view){
@ -262,10 +279,10 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
}
//called when clicking on the website entry in the about fragment
//opens marcel-kapfer.de/projects/morse/
//opens marcel-kapfer.de/writtenmorse
public void websiteEntry(View view){
try{
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/projects/morse/"));
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/writtenmorse/"));
startActivity(browserIntent);
} catch(Exception e){
e.printStackTrace();
@ -309,7 +326,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
//opens the howto webpage
public void howtoEntry(View view){
try{
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/projects/morse/index.html#howto_android"));
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://marcel-kapfer.de/writtenmorse/#howto_android"));
startActivity(browserIntent);
} catch(Exception e){
e.printStackTrace();

32
app/src/main/res/layout-large-land/fragment_about.xml
View file

@ -24,18 +24,35 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/about"
android:layout_width="wrap_content"
android:paddingRight="150dp"
android:paddingLeft="150dp"
android:layout_height="match_parent"
android:background="#fff"
tools:context=".AboutActivity$PlaceholderFragment">
<RelativeLayout
android:id="@+id/wml_back"
android:layout_width="match_parent"
android:layout_height="400px"
android:background="@color/colorPrimary" />
<LinearLayout
style="@style/LinearLayoutListContainer"
android:background="@color/white"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginTop="30dp"
android:layout_marginRight="125dp"
android:layout_marginBottom="50dp"
android:layout_marginLeft="125dp"
android:layout_gravity="top"
android:elevation="2dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/scrollView">
android:layout_height="match_parent">
<LinearLayout
style="@style/LinearLayoutListContainer">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
style="@style/LinearLayoutList"
@ -185,9 +202,10 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</RelativeLayout>

25
app/src/main/res/layout-large-land/fragment_written_morse_list.xml
View file

@ -1,14 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingRight="150dp"
android:paddingLeft="150dp">
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/wml_back"
android:layout_width="match_parent"
android:layout_height="400px"
android:background="@color/colorPrimary" />
<android.support.v7.widget.RecyclerView
android:id="@+id/wm_recycler"
android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginTop="30dp"
android:layout_marginRight="125dp"
android:layout_marginBottom="50dp"
android:layout_marginLeft="125dp"
android:layout_gravity="top"
android:elevation="2dp"/>
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/values-de/strings.xml
View file

@ -38,7 +38,7 @@
<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/writtenmorse/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.2.1 \n16. Mai 2015</string>
<string name="aboutVersion">2.2.4 \n20. Mai 2015</string>
<string name="sectionBug">Fehler</string>
<string name="sectionContact">Kontakt</string>
<string name="sectionDeveloper">Entwickler</string>

1
app/src/main/res/values-v19/styles.xml
View file

@ -30,7 +30,6 @@
<item name="colorAccent">@color/colorPrimary</item>
<item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
<item name="rippleBackport">true</item>
<item name="toolbarElevation">true</item>
<item name="android:windowTranslucentStatus">true</item>
</style>

2
app/src/main/res/values/strings.xml
View file

@ -43,7 +43,7 @@
<string name="sectionHow">How to</string>
<string name="sectionMissing">Missing Code</string>
<!--About Texts-->
<string name="aboutVersion">2.2.1 \n16 May 2015</string>
<string name="aboutVersion">2.2.4 \n20 May 2015</string>
<string name="aboutDeveloper" translatable="false">Marcel Michael Kapfer</string>
<string name="aboutWebsite" translatable="false">marcel-kapfer.de/writtenmorse</string>
<string name="aboutContact" translatable="false">marcelmichaelkapfer@yahoo.co.nz</string>

6
app/src/main/res/values/styles.xml
View file

@ -30,7 +30,6 @@
<item name="colorAccent">@color/colorPrimary</item>
<item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
<item name="rippleBackport">true</item>
<item name="toolbarElevation">true</item>
</style>
<style name="LinearLayoutList">
@ -40,7 +39,6 @@
<item name="android:paddingBottom">20dp</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:gravity">center</item>
<item name="android:orientation">vertical</item>
<item name="android:background">@drawable/linearlayout_action</item>
<item name="android:src">@color/white</item>
@ -50,8 +48,8 @@
<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:layout_marginTop">50dp</item>
<item name="android:layout_marginBottom">50dp</item>
</style>
<style name="Divider">