aboutsummaryrefslogtreecommitdiff
path: root/about
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-09 00:46:24 -0700
committerAllan Wang <me@allanwang.ca>2017-07-09 00:46:24 -0700
commit2bf5e9efde28cce8186b2cdf75d8fafb6c9125ad (patch)
tree6a80d38c0bd949685ee014b81e07c45b60becec7 /about
parent40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 (diff)
downloadkau-2bf5e9efde28cce8186b2cdf75d8fafb6c9125ad.tar.gz
kau-2bf5e9efde28cce8186b2cdf75d8fafb6c9125ad.tar.bz2
kau-2bf5e9efde28cce8186b2cdf75d8fafb6c9125ad.zip
Clean up and optimize
Diffstat (limited to 'about')
-rw-r--r--about/build.gradle11
-rw-r--r--about/progress-proguard.txt4
-rw-r--r--about/src/androidTest/java/ca/allanwang/kau/ExampleInstrumentedTest.java26
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt1
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt1
-rw-r--r--about/src/main/res/values/strings_about.xml27
-rw-r--r--about/src/test/java/ca/allanwang/kau/ExampleUnitTest.java17
7 files changed, 31 insertions, 56 deletions
diff --git a/about/build.gradle b/about/build.gradle
index 6718145..bb51f9f 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -1,22 +1,13 @@
-apply from: '../android.gradle'
+apply from: '../android-lib.gradle'
android {
resourcePrefix "kau_"
}
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 project(':core-ui')
compile project(':adapter')
- compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
- testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
-
compile("com.mikepenz:aboutlibraries:${ABOUT_LIBRARIES}@aar") {
transitive = true
}
diff --git a/about/progress-proguard.txt b/about/progress-proguard.txt
index 8b13789..cfa4747 100644
--- a/about/progress-proguard.txt
+++ b/about/progress-proguard.txt
@@ -1 +1,3 @@
-
+-keepclasseswithmembers class **.R$* {
+ public static final int define_*;
+}
diff --git a/about/src/androidTest/java/ca/allanwang/kau/ExampleInstrumentedTest.java b/about/src/androidTest/java/ca/allanwang/kau/ExampleInstrumentedTest.java
deleted file mode 100644
index 7b079b2..0000000
--- a/about/src/androidTest/java/ca/allanwang/kau/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package ca.allanwang.kau;
-
-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.*;
-
-/**
- * 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.kau.test", appContext.getPackageName());
- }
-}
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt
index 9a4f6bf..1ba5815 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt
@@ -2,7 +2,6 @@ package ca.allanwang.kau.about
import android.support.v7.widget.RecyclerView
import android.view.View
-import ca.allanwang.kau.about.R
import ca.allanwang.kau.adapters.ThemableIItem
import ca.allanwang.kau.adapters.ThemableIItemDelegate
import ca.allanwang.kau.ui.views.CutoutView
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
index 82d71dc..b5e2c28 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
@@ -6,7 +6,6 @@ import android.support.v7.widget.RecyclerView
import android.text.Html
import android.view.View
import android.widget.TextView
-import ca.allanwang.kau.about.R
import ca.allanwang.kau.adapters.ThemableIItem
import ca.allanwang.kau.adapters.ThemableIItemDelegate
import ca.allanwang.kau.utils.bindView
diff --git a/about/src/main/res/values/strings_about.xml b/about/src/main/res/values/strings_about.xml
new file mode 100644
index 0000000..35ffeb2
--- /dev/null
+++ b/about/src/main/res/values/strings_about.xml
@@ -0,0 +1,27 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+ <string name="library_kau_libraryVersion">1.5</string>
+
+ <string name="define_kau"/>
+ <!-- Author section -->
+ <string name="library_kau_author">Allan Wang</string>
+ <string name="library_kau_authorWebsite">https://www.allanwang.ca/dev/</string>
+ <!-- Library section -->
+ <string name="library_kau_libraryName">KAU</string>
+ <string name="library_kau_libraryDescription">
+ <![CDATA[
+ An extensive collection of Kotlin Android Utilities.
+ <br/><br/>
+ KAU aims to make many common functions executable in one line. It adds numerous extensions to match Kotlin\'s DSL,
+ and supports completely customizable view groups that are used in almost any app project.
+ ]]>
+ </string>
+ <string name="library_kau_libraryWebsite">https://allanwang.github.io/KAU/</string>
+ <!-- OpenSource section -->
+ <string name="library_kau_isOpenSource">true</string>
+ <string name="library_kau_repositoryLink">https://github.com/AllanWang/KAU</string>
+ <!-- ClassPath for autoDetect section -->
+ <string name="library_kau_classPath">ca.allanwang.kau</string>
+ <!-- License section -->
+ <string name="library_kau_licenseId">apache_2_0</string>
+ <!-- Custom variables section -->
+</resources> \ No newline at end of file
diff --git a/about/src/test/java/ca/allanwang/kau/ExampleUnitTest.java b/about/src/test/java/ca/allanwang/kau/ExampleUnitTest.java
deleted file mode 100644
index a29b447..0000000
--- a/about/src/test/java/ca/allanwang/kau/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ca.allanwang.kau;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() throws Exception {
- assertEquals(4, 2 + 2);
- }
-} \ No newline at end of file