From eb322d94a26acab791280dbe5ab8e230f014267a Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Fri, 1 Jan 2016 15:35:16 +0100 Subject: [PATCH] Minor improvements and preparations for the release --- app/build.gradle | 11 ++- .../ch/dissem/apps/abit/SettingsFragment.java | 1 + app/src/main/res/layout/contact_row.xml | 2 +- .../res/layout/fragment_contact_detail.xml | 2 +- .../res/layout/fragment_message_detail.xml | 2 +- app/src/main/res/layout/message_row.xml | 2 +- app/src/main/res/layout/subscription_row.xml | 2 +- .../res/values-de/library_jabit_strings.xml | 7 ++ app/src/main/res/values-v21/styles.xml | 6 +- app/src/main/res/values/arrays.xml | 13 --- app/src/main/res/values/colors.xml | 19 ++--- .../main/res/values/library_jabit_strings.xml | 20 ++--- app/src/main/res/values/styles.xml | 20 ++--- gradle.properties | 13 ++- store/function_graphic.png | Bin 0 -> 3297 bytes store/function_graphic.svg | 68 ++++++++++++++++ store/icon.svg | 75 ++++++++++++++++++ 17 files changed, 208 insertions(+), 55 deletions(-) create mode 100644 app/src/main/res/values-de/library_jabit_strings.xml delete mode 100644 app/src/main/res/values/arrays.xml create mode 100644 store/function_graphic.png create mode 100644 store/function_graphic.svg create mode 100644 store/icon.svg diff --git a/app/build.gradle b/app/build.gradle index 99299a0..1b733ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,10 +12,19 @@ android { versionCode 1 versionName "1.0" } + signingConfigs { + release { + storeFile file(keyStoreFile) + storePassword keyStorePassword + keyAlias signingKeyAlias + keyPassword signingKeyPassword + } + } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } } @@ -42,7 +51,7 @@ dependencies { compile 'com.mikepenz:iconics:1.6.2@aar' compile 'com.mikepenz:community-material-typeface:1.1.71@aar' } -5 + idea.module { downloadJavadoc = true downloadSources = true diff --git a/app/src/main/java/ch/dissem/apps/abit/SettingsFragment.java b/app/src/main/java/ch/dissem/apps/abit/SettingsFragment.java index d92ac68..38ad512 100644 --- a/app/src/main/java/ch/dissem/apps/abit/SettingsFragment.java +++ b/app/src/main/java/ch/dissem/apps/abit/SettingsFragment.java @@ -33,6 +33,7 @@ public class SettingsFragment @Override public boolean onPreferenceClick(Preference preference) { new LibsBuilder() + .withActivityTitle(getActivity().getString(R.string.about)) .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR) .withAboutIconShown(true) .withAboutVersionShown(true) diff --git a/app/src/main/res/layout/contact_row.xml b/app/src/main/res/layout/contact_row.xml index b71f67e..0f6ad65 100644 --- a/app/src/main/res/layout/contact_row.xml +++ b/app/src/main/res/layout/contact_row.xml @@ -27,7 +27,7 @@ android:layout_alignParentTop="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:src="@color/accent" + android:src="@color/colorAccent" android:layout_margin="16dp"/> + android:src="@color/colorAccent" /> + + Über Abit + Ein Bitmessage-Client für Android + Open Source Abhängigkeiten. + Jabit hat das Ziel eine einfach zu benutzende Bitmessage-Bibliothek für Java-Entwickler zu sein, um schnell eigene Bitmessage-Anwendungen zu implementieren. + \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 9245277..72150b4 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -5,11 +5,11 @@ - @color/primary + @color/colorPrimary - @color/primary_dark + @color/colorPrimaryDark - @color/accent + @color/colorAccent true true diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml deleted file mode 100644 index 803fa88..0000000 --- a/app/src/main/res/values/arrays.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - full - trusted - offline - - - A full node, receiving and relaying objects all the time. - Connect to a trusted node from time to time to get new objects. - Don\'t connect to the network. - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2920668..8958204 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,18 +1,13 @@ - #FFC107 - #FFA000 - #DEFFFFFF - #FFECB3 - #607D8B - #212121 - #727272 + #FFC107 + #FFA000 + #DEFFFFFF + #FFECB3 + #607D8B + #212121 + #727272 #212121 #B6B6B6 - - - @color/primary - @color/primary_dark - @color/accent diff --git a/app/src/main/res/values/library_jabit_strings.xml b/app/src/main/res/values/library_jabit_strings.xml index bd4220c..4bd1769 100644 --- a/app/src/main/res/values/library_jabit_strings.xml +++ b/app/src/main/res/values/library_jabit_strings.xml @@ -1,20 +1,20 @@ - + - Christian Basler - dissem.ch + Christian Basler + dissem.ch - Jabit + Jabit Jabit strives to be an easy to use Bitmessage library for Java developers to quickly implement their own Bitmessage clients. - https://github.com/Dissem/Jabit/wiki - 1.0.0 + https://github.com/Dissem/Jabit/wiki + 1.0.0 - true - https://github.com/Dissem/Jabit + true + https://github.com/Dissem/Jabit - ch.dissem.bitmessage.BitmessageContext + ch.dissem.bitmessage.BitmessageContext - apache_2_0 + apache_2_0 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e0df448..090c4de 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,21 +3,21 @@ diff --git a/gradle.properties b/gradle.properties index 1d3591c..ab12df9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,15 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true + + + + +# Signing and encryption settings +# Don't change those parameters - override those properties in the +# gradle.properties file in your home directory instead +keyStoreFile= +keyStorePassword= +signingKeyAlias= +signingKeyPassword= \ No newline at end of file diff --git a/store/function_graphic.png b/store/function_graphic.png new file mode 100644 index 0000000000000000000000000000000000000000..8c281772568a119e18c6346d854f12610df21f16 GIT binary patch literal 3297 zcmeAS@N?(olHy`uVBq!ia0y~yU;#22zi_Ytsl{sX+CYk>*vT`50|;t3QaXTq&H|6f zVxao#Ak65bF}ngNC|TkfQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&15cc% zi(^Q|oVPa&c^eo64jf?D|1tegpEwh@7zgLx;0rrX+pMeIX8BwKXx@YJYwMYTbi;Q^ zAju$*03sb47(o;x$Z-rTAZ4Qxqd_v77)GmdKI;Vst0Qj)mv;Y7A literal 0 HcmV?d00001 diff --git a/store/function_graphic.svg b/store/function_graphic.svg new file mode 100644 index 0000000..7b4db20 --- /dev/null +++ b/store/function_graphic.svg @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/store/icon.svg b/store/icon.svg new file mode 100644 index 0000000..6e6d83b --- /dev/null +++ b/store/icon.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + +