aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-19 20:06:32 -0700
committerAllan Wang <me@allanwang.ca>2017-06-19 20:06:32 -0700
commit1e10288d5e05f81b727db57f638f83b1702caa69 (patch)
treed8c6a3778b91c16154dbefd16cb42af15f5f95d6
parentde0836ae903ccd6ee75d27e4c7e59fbcc1eb364c (diff)
downloadkau-1e10288d5e05f81b727db57f638f83b1702caa69.tar.gz
kau-1e10288d5e05f81b727db57f638f83b1702caa69.tar.bz2
kau-1e10288d5e05f81b727db57f638f83b1702caa69.zip
Misc fixes and changelog
-rw-r--r--.idea/misc.xml2
-rw-r--r--library/src/main/kotlin/ca/allanwang/kau/changelog/Changelog.kt2
-rw-r--r--library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefHeader.kt2
-rw-r--r--library/src/main/res/xml/kau_changelog.xml2
-rw-r--r--sample/src/main/res/xml/changelog.xml24
5 files changed, 18 insertions, 14 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7319f02..085136f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/library/src/main/kotlin/ca/allanwang/kau/changelog/Changelog.kt b/library/src/main/kotlin/ca/allanwang/kau/changelog/Changelog.kt
index 58ba3f3..d2ea985 100644
--- a/library/src/main/kotlin/ca/allanwang/kau/changelog/Changelog.kt
+++ b/library/src/main/kotlin/ca/allanwang/kau/changelog/Changelog.kt
@@ -51,7 +51,7 @@ internal fun parse(context: Context, @XmlRes xmlRes: Int): List<Pair<String, Cha
}
internal enum class ChangelogType(val tag: String, val attr: String, @LayoutRes val layout: Int) {
- TITLE("titleRes", "version", R.layout.kau_changelog_title),
+ TITLE("title", "version", R.layout.kau_changelog_title),
ITEM("item", "text", R.layout.kau_changelog_content);
companion object {
diff --git a/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefHeader.kt b/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefHeader.kt
index 294aec0..c50556d 100644
--- a/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefHeader.kt
+++ b/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefHeader.kt
@@ -7,7 +7,7 @@ import ca.allanwang.kau.R
* Created by Allan Wang on 2017-06-07.
*
* Header preference
- * This view just holds a titleRes and is not clickable. It is styled using the accent color
+ * This view just holds a title and is not clickable. It is styled using the accent color
*/
class KPrefHeader(builder: CoreContract) : KPrefItemCore(builder) {
diff --git a/library/src/main/res/xml/kau_changelog.xml b/library/src/main/res/xml/kau_changelog.xml
index e778b5f..e570995 100644
--- a/library/src/main/res/xml/kau_changelog.xml
+++ b/library/src/main/res/xml/kau_changelog.xml
@@ -4,7 +4,7 @@
<!--This is a template-->
<!--
- <version titleRes="v"/>
+ <version title="v"/>
<item text="" />
-->
diff --git a/sample/src/main/res/xml/changelog.xml b/sample/src/main/res/xml/changelog.xml
index 5ded21e..b758d42 100644
--- a/sample/src/main/res/xml/changelog.xml
+++ b/sample/src/main/res/xml/changelog.xml
@@ -2,19 +2,23 @@
<resources>
<!--
- <version titleRes="v"/>
+ <version title="v"/>
<item text="" />
-->
- <version title="v0.1" />
- <item text="Initial Changelog" />
- <item text="" />
- <item text="" />
- <item text="" />
- <item text="" />
- <item text="" />
- <item text="" />
- <item text="" />
+ <version title="v0.2"/>
+ <item text="Created kprefs" />
+ <item text="Created kpref items" />
+ <item text="Attached source files" />
+ <item text="Created color dialog" />
+ <item text="Added more utilities" />
+ <item text="Fixed stack clearing when starting activity" />
<item text="" />
<item text="" />
+
+ <version title="v0.1" />
+ <item text="Initial Changelog" />
+ <item text="Created many extension functions" />
+ <item text="Ported changelog builer" />
+ <item text="Ported ripple canvas" />
</resources> \ No newline at end of file