aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--artifacts.gradle27
-rw-r--r--core-ui/src/main/res-public/values/public.xml2
-rw-r--r--core/src/main/res-public/values/public.xml2
-rw-r--r--docs/Changelog.md4
4 files changed, 23 insertions, 12 deletions
diff --git a/artifacts.gradle b/artifacts.gradle
index ab291f7..4471d37 100644
--- a/artifacts.gradle
+++ b/artifacts.gradle
@@ -31,16 +31,23 @@ artifacts {
// We assume resources within res-public are public
task generatepublicxml {
- def resDir = project.projectDir.absolutePath + "/src/main/res-public"
-
- def publicFolder = file(resDir + "/values")
- if (!publicFolder.exists()) publicFolder.mkdirs()
+ def resDir = project.projectDir.absolutePath + "/src/main/res"
+ def publicDir = resDir + "-public"
+ def resFolder = file(resDir + "/values")
+ def publicFolder = file(publicDir + "/values")
+ if (!publicFolder.exists()) {
+ // No res; no need for contents
+ if (!resFolder.exists()) {
+ return
+ }
+ publicFolder.mkdirs()
+ }
// Include the desired res types
// Note: we don't need the qualified resource directories,
// since those resources will already be defined in the unqualified directories
// however, there are special cases like transition-v21 that is only available on lollipop and up
- def tree = fileTree(dir: resDir,
+ def tree = fileTree(dir: publicDir,
includes: ['**/anim/*.xml',
'**/color/*.xml',
'**/drawable/*.xml',
@@ -54,12 +61,12 @@ task generatepublicxml {
println "Generating public XML: ${project.name}"
// Create new public.xml with writer
- file(resDir + "/values/public.xml").withWriter { writer ->
+ file(publicDir + "/values/public.xml").withWriter { writer ->
// Create MarkupBuilder with 4 space indent
- def destXml = new MarkupBuilder(new IndentPrinter(writer, " ", true));
- def destXmlMkp = destXml.getMkp();
+ def destXml = new MarkupBuilder(new IndentPrinter(writer, " ", true))
+ def destXmlMkp = destXml.getMkp()
- // GIST NOTE: our project needed the ResourceName suppression, but its not needed in general
+ // GIST NOTE: our project needed the ResourceName suppression, but it's not needed in general
destXml.resources(
'xmlns:tools': 'http://schemas.android.com/tools',
'tools:ignore': 'ResourceName'
@@ -74,7 +81,7 @@ task generatepublicxml {
tree.each { resFile ->
// use the directory name to get the type
- def type = resFile.getParentFile().getName()
+ String type = resFile.getParentFile().getName()
if (type == "values") {
// Resource files under values. Parse the file, and pull out the resource definitions
diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml
index f46b3eb..af7ce44 100644
--- a/core-ui/src/main/res-public/values/public.xml
+++ b/core-ui/src/main/res-public/values/public.xml
@@ -1,5 +1,5 @@
<resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
-<!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
+<!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
<public name='kau_recycler_detached_background' type='layout' />
<public name='kau_elastic_recycler_activity' type='layout' />
<public name='kau_recycler_textslider' type='layout' />
diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml
index ea8ed73..9761199 100644
--- a/core/src/main/res-public/values/public.xml
+++ b/core/src/main/res-public/values/public.xml
@@ -1,5 +1,5 @@
<resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
-<!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
+<!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
<public name='kau_slide_in_top' type='anim' />
<public name='kau_slide_in_left' type='anim' />
<public name='kau_slide_out_right' type='anim' />
diff --git a/docs/Changelog.md b/docs/Changelog.md
index a2c38e1..61e5fb7 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,9 @@
# Changelog
+## v5.0.0
+* :core: Update Material Dialogs to 3.x
+* :colorpicker: Strip down to just the interface; unless you require the accent palette, it may be fine to just use MD's color extension
+
## v4.1.0
* :core: Deprecate NetworkUtils, as the underlying functions are deprecated
* :core: Permission manager no longer synchronized, as all actions should occur in the main thread