aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-25 12:14:46 -0700
committerGitHub <noreply@github.com>2017-07-25 12:14:46 -0700
commitaaedf98c7c2eb9381c704367e040471cb2e9d094 (patch)
treec09a42f5357ba3a3452371018527b61939d76ec6
parent6eefe3f7c27bd388ea6eb312f056edad03175a63 (diff)
downloadkau-aaedf98c7c2eb9381c704367e040471cb2e9d094.tar.gz
kau-aaedf98c7c2eb9381c704367e040471cb2e9d094.tar.bz2
kau-aaedf98c7c2eb9381c704367e040471cb2e9d094.zip
Update dependencies and icons (#14)3.1.2
* Use kotlin color for sample * Add play store button * Update icon * Update build tools
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
-rw-r--r--core/build.gradle5
-rw-r--r--core/src/androidTest/java/ca/allanwang/kprefs/library/ExampleInstrumentedTest.java26
-rw-r--r--files/images/kau_round.svg60
-rw-r--r--files/images/kau_round_512.pngbin21202 -> 14099 bytes
-rw-r--r--gradle.properties6
-rw-r--r--sample/src/main/kotlin/ca/allanwang/kau/sample/KPrefSample.kt2
-rw-r--r--sample/src/main/res/mipmap-hdpi/ic_launcher.pngbin2316 -> 1900 bytes
-rw-r--r--sample/src/main/res/mipmap-xhdpi/ic_launcher.pngbin3053 -> 2517 bytes
-rw-r--r--sample/src/main/res/mipmap-xxhdpi/ic_launcher.pngbin4750 -> 3721 bytes
-rw-r--r--sample/src/main/res/mipmap-xxxhdpi/ic_launcher.pngbin6480 -> 5042 bytes
12 files changed, 35 insertions, 68 deletions
diff --git a/.travis.yml b/.travis.yml
index 5fb6eff..6b134ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ android:
components:
- tools
- platform-tools
- - build-tools-26.0.0
+ - build-tools-26.0.1
- android-26
- extra-android-support
- extra-android-m2repository
diff --git a/README.md b/README.md
index e2f359f..ee309a7 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ Kotlin Android Utils
This library contains small helper functions used throughout almost all of my other projects. The goal is to make common interactions executable in a single line.
+<a href='https://play.google.com/store/apps/details?id=ca.allanwang.kau.sample&utm_source=github'><img alt='Get it on Google Play' width="30%" src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
+
[Changelog](docs/Changelog.md)
------------
diff --git a/core/build.gradle b/core/build.gradle
index af36d80..ee413ba 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -4,21 +4,16 @@ apply from: '../android-lib.gradle'
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
testCompile 'junit:junit:4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support:support-v4:${ANDROID_SUPPORT_LIBS}"
compile "com.android.support:support-v13:${ANDROID_SUPPORT_LIBS}"
compile "com.android.support:design:${ANDROID_SUPPORT_LIBS}"
compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_LIBS}"
compile "com.android.support:cardview-v7:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support:animated-vector-drawable:${ANDROID_SUPPORT_LIBS}"
compile "com.android.support.constraint:constraint-layout:${CONSTRAINT_LAYOUT}"
compile "com.mikepenz:iconics-core:${ICONICS}@aar"
diff --git a/core/src/androidTest/java/ca/allanwang/kprefs/library/ExampleInstrumentedTest.java b/core/src/androidTest/java/ca/allanwang/kprefs/library/ExampleInstrumentedTest.java
deleted file mode 100644
index 6d80338..0000000
--- a/core/src/androidTest/java/ca/allanwang/kprefs/library/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package ca.allanwang.kprefs.library;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() throws Exception {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("ca.allanwang.kprefs.library.test", appContext.getPackageName());
- }
-}
diff --git a/files/images/kau_round.svg b/files/images/kau_round.svg
index e8892e6..14b1d67 100644
--- a/files/images/kau_round.svg
+++ b/files/images/kau_round.svg
@@ -9,9 +9,9 @@
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="160mm"
- height="160mm"
- viewBox="0 0 566.92911 566.92912"
+ width="142.56509mm"
+ height="142.56509mm"
+ viewBox="0 0 505.15188 505.15189"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
@@ -61,22 +61,22 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.49497475"
- inkscape:cx="335.78333"
- inkscape:cy="368.84238"
+ inkscape:zoom="0.7"
+ inkscape:cx="336.98994"
+ inkscape:cy="384.67178"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
showguides="false"
inkscape:window-width="1536"
inkscape:window-height="841"
- inkscape:window-x="-8"
+ inkscape:window-x="1528"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- fit-margin-top="9"
- fit-margin-left="20"
- fit-margin-right="20"
- fit-margin-bottom="20"
+ fit-margin-top="10"
+ fit-margin-left="10"
+ fit-margin-right="10"
+ fit-margin-bottom="10"
borderlayer="false"
inkscape:showpageshadow="true" />
<metadata
@@ -95,26 +95,22 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-103.41957,-202.20087)">
- <g
- id="g4324"
- transform="translate(-4.5444214,0)">
- <circle
- r="217.14285"
- cy="481.12094"
- cx="391.42856"
- id="path4136"
- style="opacity:1;fill:#ff8900;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- inkscape:connector-curvature="0"
- id="circle4211"
- d="m 274.76172,306.12695 0,357.85157 a 217.14285,217.14285 0 0 0 116.66601,34.28515 217.14285,217.14285 0 0 0 137.13672,-48.94531 L 274.76172,306.12695 Z"
- style="opacity:1;fill:#0086dc;fill-opacity:0.8627451;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- inkscape:connector-curvature="0"
- id="circle4206"
- d="m 391.42773,263.97852 a 217.14285,217.14285 0 0 0 -116.66601,34.04687 l 0,358.08984 253.79101,-343.17578 a 217.14285,217.14285 0 0 0 -137.125,-48.96093 z"
- style="opacity:1;fill:#00a9ff;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4312)" />
- </g>
+ transform="translate(-138.34882,-238.64655)">
+ <circle
+ style="opacity:1;fill:#ff8900;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4136"
+ cx="390.92474"
+ cy="491.22247"
+ r="217.14285" />
+ <path
+ style="fill:#0086dc;fill-opacity:0.86274511;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 104.13867 94.304688 A 217.14288 217.14288 0 0 0 104.00586 94.421875 L 104.00586 410.56836 A 217.14288 217.14288 0 0 0 252.57617 469.71875 A 217.14288 217.14288 0 0 0 410.76562 400.93359 L 104.13867 94.304688 z "
+ transform="translate(138.34882,238.64655)"
+ id="path4157-1" />
+ <path
+ style="opacity:1;fill:#00a9ff;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 252.57617 35.433594 A 217.14288 217.14288 0 0 0 104.00586 94.421875 L 104.00586 410.56836 A 217.14288 217.14288 0 0 0 104.20312 410.75 L 410.83008 104.12305 A 217.14288 217.14288 0 0 0 252.57617 35.433594 z "
+ transform="translate(138.34882,238.64655)"
+ id="circle4174" />
</g>
</svg>
diff --git a/files/images/kau_round_512.png b/files/images/kau_round_512.png
index 0fa7c94..f0854cb 100644
--- a/files/images/kau_round_512.png
+++ b/files/images/kau_round_512.png
Binary files differ
diff --git a/gradle.properties b/gradle.properties
index 7825465..084621b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,8 +20,8 @@ APP_GROUP=ca.allanwang
CORE_MIN_SDK=19
MIN_SDK=21
TARGET_SDK=26
-BUILD_TOOLS=26.0.0
-ANDROID_SUPPORT_LIBS=26.0.0-beta2
+BUILD_TOOLS=26.0.1
+ANDROID_SUPPORT_LIBS=26.0.0
KOTLIN=1.1.3-2
ABOUT_LIBRARIES=5.9.7
@@ -36,7 +36,7 @@ IICON_GOOGLE=3.0.1.1
MATERIAL_DIALOG=0.9.4.5
RX_ANDROID=2.0.1
RX_BINDING=2.0.0
-RX_JAVA=2.1.1
+RX_JAVA=2.1.2
RX_KOTLIN=2.1.0
TIMBER=4.5.1
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/KPrefSample.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/KPrefSample.kt
index 1bbcc47..fc4277f 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/KPrefSample.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/KPrefSample.kt
@@ -9,7 +9,7 @@ import ca.allanwang.kau.kpref.kpref
*/
object KPrefSample : KPref() {
var textColor: Int by kpref("TEXT_COLOR", Color.WHITE)
- var accentColor: Int by kpref("ACCENT_COLOR", 0xffff4081.toInt())
+ var accentColor: Int by kpref("ACCENT_COLOR", 0xffff8900.toInt())
var bgColor: Int by kpref("BG_COLOR", 0xff303030.toInt())
var check1: Boolean by kpref("check1", true)
var check2: Boolean by kpref("check2", false)
diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/sample/src/main/res/mipmap-hdpi/ic_launcher.png
index 9b9a9ef..ac31b6a 100644
--- a/sample/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/sample/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher.png
index 18b65ef..c0f1daa 100644
--- a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/sample/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 14f2082..7d87c43 100644
--- a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index fe0aa98..df1c72a 100644
--- a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ