Minor improvements and preparations for the release

This commit is contained in:
Christian Basler 2016-01-01 15:35:16 +01:00
parent 6d21a99b3d
commit eb322d94a2
17 changed files with 208 additions and 55 deletions

View File

@ -12,10 +12,19 @@ android {
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
signingConfigs {
release {
storeFile file(keyStoreFile)
storePassword keyStorePassword
keyAlias signingKeyAlias
keyPassword signingKeyPassword
}
}
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 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:iconics:1.6.2@aar'
compile 'com.mikepenz:community-material-typeface:1.1.71@aar' compile 'com.mikepenz:community-material-typeface:1.1.71@aar'
} }
5
idea.module { idea.module {
downloadJavadoc = true downloadJavadoc = true
downloadSources = true downloadSources = true

View File

@ -33,6 +33,7 @@ public class SettingsFragment
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
new LibsBuilder() new LibsBuilder()
.withActivityTitle(getActivity().getString(R.string.about))
.withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR) .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
.withAboutIconShown(true) .withAboutIconShown(true)
.withAboutVersionShown(true) .withAboutVersionShown(true)

View File

@ -27,7 +27,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@color/accent" android:src="@color/colorAccent"
android:layout_margin="16dp"/> android:layout_margin="16dp"/>
<TextView <TextView

View File

@ -26,7 +26,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@color/accent" android:src="@color/colorAccent"
android:layout_margin="16dp"/> android:layout_margin="16dp"/>
<EditText <EditText

View File

@ -38,7 +38,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/divider" android:layout_below="@+id/divider"
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@color/accent" /> android:src="@color/colorAccent" />
<TextView <TextView
android:id="@+id/sender" android:id="@+id/sender"

View File

@ -25,7 +25,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@color/accent" android:src="@color/colorAccent"
android:layout_margin="16dp"/> android:layout_margin="16dp"/>
<TextView <TextView

View File

@ -27,7 +27,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@color/accent" android:src="@color/colorAccent"
android:layout_margin="16dp"/> android:layout_margin="16dp"/>
<TextView <TextView

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="about">Über Abit</string>
<string name="about_app">Ein Bitmessage-Client für Android</string>
<string name="about_summary">Open Source Abhängigkeiten.</string>
<string name="library_jabit_libraryDescription">Jabit hat das Ziel eine einfach zu benutzende Bitmessage-Bibliothek für Java-Entwickler zu sein, um schnell eigene Bitmessage-Anwendungen zu implementieren.</string>
</resources>

View File

@ -5,11 +5,11 @@
<!-- Main theme colors --> <!-- Main theme colors -->
<!-- your app branding color for the app bar --> <!-- your app branding color for the app bar -->
<item name="android:colorPrimary">@color/primary</item> <item name="android:colorPrimary">@color/colorPrimary</item>
<!-- darker variant for the status bar and contextual app bars --> <!-- darker variant for the status bar and contextual app bars -->
<item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
<!-- theme UI controls like checkboxes and text fields --> <!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/accent</item> <item name="android:colorAccent">@color/colorAccent</item>
<item name="android:windowContentTransitions">true</item> <item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item> <item name="android:windowAllowEnterTransitionOverlap">true</item>

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="connection_modes">
<item>full</item>
<item>trusted</item>
<item>offline</item>
</string-array>
<string-array name="connection_mode_values">
<item>A full node, receiving and relaying objects all the time.</item>
<item>Connect to a trusted node from time to time to get new objects.</item>
<item>Don\'t connect to the network.</item>
</string-array>
</resources>

View File

@ -1,18 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Palette generated by Material Palette - materialpalette.com/blue-grey/orange --> <!-- Palette generated by Material Palette - materialpalette.com/blue-grey/orange -->
<resources> <resources>
<color name="primary">#FFC107</color> <color name="colorPrimary">#FFC107</color>
<color name="primary_dark">#FFA000</color> <color name="colorPrimaryDark">#FFA000</color>
<color name="primary_dark_text">#DEFFFFFF</color> <color name="colorPrimaryDarkText">#DEFFFFFF</color>
<color name="primary_light">#FFECB3</color> <color name="colorPrimaryLight">#FFECB3</color>
<color name="accent">#607D8B</color> <color name="colorAccent">#607D8B</color>
<color name="primary_text">#212121</color> <color name="colorPrimaryText">#212121</color>
<color name="secondary_text">#727272</color> <color name="colorSecondaryText">#727272</color>
<color name="icons">#212121</color> <color name="icons">#212121</color>
<color name="divider">#B6B6B6</color> <color name="divider">#B6B6B6</color>
<!-- Used for AboutLibraries -->
<color name="colorPrimary">@color/primary</color>
<color name="colorPrimaryDark">@color/primary_dark</color>
<color name="colorAccent">@color/accent</color>
</resources> </resources>

View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="define_jabit"></string> <string name="define_jabit" translatable="false"></string>
<!-- Author section --> <!-- Author section -->
<string name="library_jabit_author">Christian Basler</string> <string name="library_jabit_author" translatable="false">Christian Basler</string>
<string name="library_jabit_authorWebsite">dissem.ch</string> <string name="library_jabit_authorWebsite" translatable="false">dissem.ch</string>
<!-- Library section --> <!-- Library section -->
<string name="library_jabit_libraryName">Jabit</string> <string name="library_jabit_libraryName" translatable="false">Jabit</string>
<string name="library_jabit_libraryDescription">Jabit strives to be an easy to use Bitmessage library for Java developers to quickly implement their own Bitmessage clients.</string> <string name="library_jabit_libraryDescription">Jabit strives to be an easy to use Bitmessage library for Java developers to quickly implement their own Bitmessage clients.</string>
<string name="library_jabit_libraryWebsite">https://github.com/Dissem/Jabit/wiki</string> <string name="library_jabit_libraryWebsite" translatable="false">https://github.com/Dissem/Jabit/wiki</string>
<string name="library_jabit_libraryVersion">1.0.0</string> <string name="library_jabit_libraryVersion" translatable="false">1.0.0</string>
<!-- OpenSource section --> <!-- OpenSource section -->
<string name="library_jabit_isOpenSource">true</string> <string name="library_jabit_isOpenSource" translatable="false">true</string>
<string name="library_jabit_repositoryLink">https://github.com/Dissem/Jabit</string> <string name="library_jabit_repositoryLink" translatable="false">https://github.com/Dissem/Jabit</string>
<!-- ClassPath for autoDetect section --> <!-- ClassPath for autoDetect section -->
<string name="library_jabit_classPath">ch.dissem.bitmessage.BitmessageContext</string> <string name="library_jabit_classPath" translatable="false">ch.dissem.bitmessage.BitmessageContext</string>
<!-- License section --> <!-- License section -->
<string name="library_jabit_licenseId">apache_2_0</string> <string name="library_jabit_licenseId" translatable="false">apache_2_0</string>
<!-- Custom variables section --> <!-- Custom variables section -->
</resources> </resources>

View File

@ -3,21 +3,21 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme.Base" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus"> <style name="AppTheme.Base" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
<item name="android:activatedBackgroundIndicator">@color/primary_light</item> <item name="android:activatedBackgroundIndicator">@color/colorPrimaryLight</item>
<item name="android:textColor">@color/primary_text</item> <item name="android:textColor">@color/colorPrimaryText</item>
<item name="android:textColorSecondary">@color/secondary_text</item> <item name="android:textColorSecondary">@color/colorSecondaryText</item>
<!-- MaterialDrawer specific values --> <!-- MaterialDrawer specific values -->
<item name="material_drawer_background">@color/primary_dark</item> <item name="material_drawer_background">@color/colorPrimaryDark</item>
<item name="material_drawer_icons">@color/primary_text</item> <item name="material_drawer_icons">@color/colorPrimaryText</item>
<item name="material_drawer_primary_icon">@color/icons</item> <item name="material_drawer_primary_icon">@color/icons</item>
<item name="material_drawer_primary_text">@color/primary_text</item> <item name="material_drawer_primary_text">@color/colorPrimaryText</item>
<item name="material_drawer_secondary_text">@color/secondary_text</item> <item name="material_drawer_secondary_text">@color/colorSecondaryText</item>
<item name="material_drawer_hint_text">@color/secondary_text</item> <item name="material_drawer_hint_text">@color/colorSecondaryText</item>
<item name="material_drawer_divider">@color/divider</item> <item name="material_drawer_divider">@color/divider</item>
<item name="material_drawer_selected">@color/primary</item> <item name="material_drawer_selected">@color/primary</item>
<item name="material_drawer_selected_text">@color/primary_text</item> <item name="material_drawer_selected_text">@color/colorPrimaryText</item>
<item name="material_drawer_header_selection_text">@color/primary_text</item> <item name="material_drawer_header_selection_text">@color/colorPrimaryText</item>
</style> </style>

View File

@ -15,4 +15,15 @@
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # 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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # 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=

BIN
store/function_graphic.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1024"
height="500"
viewBox="0 0 1024 500.00001"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="function_graphic.svg"
inkscape:export-filename="C:\Users\chrig\Documents\Projekte\Abit\store\function_graphic.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="-249.28571"
inkscape:cy="520"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1280"
inkscape:window-height="657"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-552.36216)">
<rect
style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3336"
width="1024"
height="500"
x="2.8571429"
y="552.36218" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

75
store/icon.svg Normal file
View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="512"
height="512"
viewBox="0 0 512.00001 512.00001"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="icon.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="-330.71429"
inkscape:cy="520"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1280"
inkscape:window-height="657"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-540.36216)">
<path
sodipodi:type="star"
style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3343"
sodipodi:sides="7"
sodipodi:cx="254.65251"
sodipodi:cy="795.56248"
sodipodi:r1="231.12856"
sodipodi:r2="76.300064"
sodipodi:arg1="-1.4219063"
sodipodi:arg2="-0.97310738"
inkscape:flatsided="false"
inkscape:rounded="1.39"
inkscape:randomized="0"
d="m 288.93824,566.99107 c 227.8089,34.17135 -181.77145,35.86897 8.65088,165.49887 190.42233,129.6299 41.82424,-252.04738 157.14453,-52.63373 C 570.05394,879.26986 313.35752,560.1055 330.73516,789.8066 348.1128,1019.5077 553.87073,665.35713 469.86388,879.85055 385.85704,1094.344 475.34218,694.65489 306.58941,851.45756 137.83665,1008.2602 543.01068,948.319 322.93556,1016.3743 102.86045,1084.4295 471.14302,905.18976 243.33412,871.01841 15.525224,836.84705 315.01104,1116.2521 124.58871,986.62222 -65.833623,856.99233 303.92209,1033.1731 188.60181,833.75941 73.281523,634.34576 41.560203,1042.6994 24.182553,812.99831 6.804904,583.29722 99.600168,982.23077 183.60702,767.73737 267.61388,553.24396 -71.427781,783.04756 97.324978,626.24488 266.07773,469.4422 12.035822,790.72346 232.11094,722.66821 452.18606,654.61296 61.129346,532.81973 288.93824,566.99107 Z"
inkscape:transform-center-x="-12.36068"
inkscape:transform-center-y="-11.435089" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.1 KiB