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

Release 2.3.0

Browse source
This commit is contained in:
mmk2410 2015-08-03 17:51:38 +02:00
parent a5202e89d5
commit 9c064db05d
4 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "de.marcelkapfer.morseconverter" applicationId "de.marcelkapfer.morseconverter"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 227 versionCode 230
versionName "2.2.7" versionName "2.3.0 beta"
} }
buildTypes { buildTypes {
release { release {

43
app/manifest-merger-release-report.txt
View file

@ -15,17 +15,16 @@ ADDED from AndroidManifest.xml:23:1
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
application application
ADDED from AndroidManifest.xml:26:5 ADDED from AndroidManifest.xml:26:5
MERGED from com.android.support:appcompat-v7:22.0.0:22:5 MERGED from com.android.support:appcompat-v7:22.2.1:22:5
MERGED from com.android.support:support-v4:22.0.0:22:5 MERGED from com.android.support:support-v4:22.2.1:22:5
MERGED from it.neokree:MaterialNavigationDrawer:1.3.3:14:5 MERGED from it.neokree:MaterialNavigationDrawer:1.3.3:14:5
MERGED from com.android.support:appcompat-v7:22.0.0:22:5 MERGED from com.android.support:appcompat-v7:22.2.1:22:5
MERGED from com.android.support:support-v4:22.0.0:22:5 MERGED from com.android.support:support-v4:22.2.1:22:5
MERGED from com.balysv:material-ripple:1.0.1:12:5 MERGED from com.balysv:material-ripple:1.0.1:12:5
MERGED from com.android.support:cardview-v7:21.0.3:16:5 MERGED from com.android.support:cardview-v7:22.2.1:22:5
MERGED from com.android.support:support-v4:22.0.0:22:5 MERGED from com.android.support:support-v4:22.2.1:22:5
MERGED from com.android.support:recyclerview-v7:21.0.3:17:5 MERGED from com.android.support:support-v4:22.2.1:22:5
MERGED from com.android.support:support-v4:22.0.0:22:5 MERGED from com.anjlab.android.iab.v3:library:1.0.26:13:5
MERGED from com.anjlab.android.iab.v3:library:1.0.24:13:5
android:label android:label
ADDED from AndroidManifest.xml:29:9 ADDED from AndroidManifest.xml:29:9
android:allowBackup android:allowBackup
@ -52,22 +51,22 @@ ADDED from AndroidManifest.xml:37:17
ADDED from AndroidManifest.xml:37:27 ADDED from AndroidManifest.xml:37:27
uses-permission#com.android.vending.BILLING uses-permission#com.android.vending.BILLING
ADDED from AndroidManifest.xml:42:5 ADDED from AndroidManifest.xml:42:5
MERGED from com.anjlab.android.iab.v3:library:1.0.24:11:5 MERGED from com.anjlab.android.iab.v3:library:1.0.26:11:5
android:name android:name
ADDED from AndroidManifest.xml:42:22 ADDED from AndroidManifest.xml:42:22
uses-sdk uses-sdk
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
MERGED from com.android.support:appcompat-v7:22.0.0:20:5 MERGED from com.android.support:appcompat-v7:22.2.1:20:5
MERGED from com.android.support:support-v4:22.0.0:20:5 MERGED from com.android.support:support-v4:22.2.1:20:5
MERGED from it.neokree:MaterialNavigationDrawer:1.3.3:8:5 MERGED from it.neokree:MaterialNavigationDrawer:1.3.3:8:5
MERGED from com.android.support:appcompat-v7:22.0.0:20:5 MERGED from com.android.support:appcompat-v7:22.2.1:20:5
MERGED from com.android.support:support-v4:22.0.0:20:5 MERGED from com.android.support:support-v4:22.2.1:20:5
MERGED from com.balysv:material-ripple:1.0.1:8:5 MERGED from com.balysv:material-ripple:1.0.1:8:5
MERGED from com.android.support:cardview-v7:21.0.3:15:5 MERGED from com.android.support:cardview-v7:22.2.1:20:5
MERGED from com.android.support:support-v4:22.0.0:20:5 MERGED from com.android.support:support-v4:22.2.1:20:5
MERGED from com.android.support:recyclerview-v7:21.0.3:15:5 MERGED from com.android.support:recyclerview-v7:22.2.1:20:5
MERGED from com.android.support:support-v4:22.0.0:20:5 MERGED from com.android.support:support-v4:22.2.1:20:5
MERGED from com.anjlab.android.iab.v3:library:1.0.24:7:5 MERGED from com.anjlab.android.iab.v3:library:1.0.26:7:5
tools:overrideLibrary tools:overrideLibrary
ADDED from it.neokree:MaterialNavigationDrawer:1.3.3:11:9 ADDED from it.neokree:MaterialNavigationDrawer:1.3.3:11:9
android:targetSdkVersion android:targetSdkVersion
@ -76,9 +75,3 @@ MERGED from com.anjlab.android.iab.v3:library:1.0.24:7:5
android:minSdkVersion android:minSdkVersion
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0 INJECTED from AndroidManifest.xml:0:0
activity#android.support.v7.widget.TestActivity
ADDED from com.android.support:recyclerview-v7:21.0.3:18:9
android:label
ADDED from com.android.support:recyclerview-v7:21.0.3:18:19
android:name
ADDED from com.android.support:recyclerview-v7:21.0.3:18:60

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

@ -25,7 +25,6 @@
<string name="app_name">Morse Converter</string> <string name="app_name">Morse Converter</string>
<string name="action_settings">Einstellungen</string> <string name="action_settings">Einstellungen</string>
<string name="edit_message">Geben Sie einen Text ein</string> <string name="edit_message">Geben Sie einen Text ein</string>
<string name="button_convert">UMWANDELN</string>
<string name="title_activity_display_message">Ihr Text</string> <string name="title_activity_display_message">Ihr Text</string>
<string name="hello_world">Hallo Welt</string> <string name="hello_world">Hallo Welt</string>
<string name="action_search">Suche</string> <string name="action_search">Suche</string>
@ -37,7 +36,7 @@
<string name="aboutBug">Wenn Du einen Fehler gefunden hast, schreibe mir bitte ein E-Mail an marcelmichaelkapfer@yahoo.co.nz</string> <string name="aboutBug">Wenn Du einen Fehler gefunden hast, schreibe mir bitte ein E-Mail an marcelmichaelkapfer@yahoo.co.nz</string>
<string name="aboutHow">Du kannst eine ausführliche Anleitung auf marcel-kapfer.de/writtenmorse/index.html#howto_android finden.</string> <string name="aboutHow">Du kannst eine ausführliche Anleitung 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 E-Mail an marcelmichaelkapfer@yahoo.co.nz.</string> <string name="aboutMissing">Wenn Du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine E-Mail an marcelmichaelkapfer@yahoo.co.nz.</string>
<string name="aboutVersion">2.2.7 \n01. Juni 2015</string> <string name="aboutVersion">2.3.0 \n03. August 2015</string>
<string name="sectionBug">Fehler</string> <string name="sectionBug">Fehler</string>
<string name="sectionContact">Kontakt</string> <string name="sectionContact">Kontakt</string>
<string name="sectionDeveloper">Entwickler</string> <string name="sectionDeveloper">Entwickler</string>

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

@ -25,7 +25,6 @@
<string name="app_name">Morse Converter</string> <string name="app_name">Morse Converter</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="edit_message">Enter a Message</string> <string name="edit_message">Enter a Message</string>
<string name="button_convert">CONVERT</string>
<string name="title_activity_display_message">Your Message</string> <string name="title_activity_display_message">Your Message</string>
<string name="hello_world">Hello world!</string> <string name="hello_world">Hello world!</string>
<string name="action_search">Search</string> <string name="action_search">Search</string>
@ -42,7 +41,7 @@
<string name="sectionHow">How to</string> <string name="sectionHow">How to</string>
<string name="sectionMissing">Missing Code</string> <string name="sectionMissing">Missing Code</string>
<!--About Texts--> <!--About Texts-->
<string name="aboutVersion">2.2.7 \n01 June 2015</string> <string name="aboutVersion">2.3.0 beta \n03 August 2015</string>
<string name="aboutDeveloper" translatable="false">Marcel Michael Kapfer</string> <string name="aboutDeveloper" translatable="false">Marcel Michael Kapfer</string>
<string name="aboutWebsite" translatable="false">marcel-kapfer.de/writtenmorse</string> <string name="aboutWebsite" translatable="false">marcel-kapfer.de/writtenmorse</string>
<string name="aboutContact" translatable="false">marcelmichaelkapfer@yahoo.co.nz</string> <string name="aboutContact" translatable="false">marcelmichaelkapfer@yahoo.co.nz</string>