Preparing for release v2.1.0

sjwall · Sep 6, 2017 · 252dca5 · 252dca5
1 parent d078a31
commit 252dca5
Show file tree

Hide file tree

Showing 20 changed files with 239 additions and 106 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,25 @@
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## v2.0.1 (2017-07-08)
+## v2.1.0 (2017-09-06)
+
+### Features
+
+* Added support for primary and secondary text being CharSequence. ([#82](https://github.com/sjwall/MaterialTapTargetPrompt/pull/82))
+* Added STATE_FINISHING for state change after the finish method has been called.
+* Added STATE_NON_FOCAL_PRESSED for state change after the user has pressed the prompt somewhere other than the target or the system back button has been pressed.
+
+### Bug Fixes
+
+* Fixed STATE_DISMISSING state change incorrectly occurring when auto dismiss is disabled. Fixes null pointer exception in sample. ([#82](https://github.com/sjwall/MaterialTapTargetPrompt/pull/82))
+
+## v2.0.1 (2017-08-08)
 
 ### Bug Fixes
 
-* Fix user being unable to leave Activity with back button if setAutoDismiss(false) #81
+* Fix user being unable to leave Activity with back button if setAutoDismiss(false) ([#81](https://github.com/sjwall/MaterialTapTargetPrompt/pull/81))
 
-## v2.0.0 (2017-07-07)
+## v2.0.0 (2017-08-07)
 
 * Minimum sdk is now 14.
 * Back button dismiss is now enabled by default.
@@ -35,7 +47,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * `builder.setPrimaryTextColourFromRes(int)` - Use a constructor with a theme for example `Builder(Activity, int)`
 * `builder.setSecondaryTextColourFromRes(int)` - Use a constructor with a theme for example `Builder(Activity, int)`
 
-## v1.12.1 (2017-07-05)
+## v1.12.1 (2017-08-05)
 
 ### Bug Fixes
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    compile 'uk.co.samuelwall:material-tap-target-prompt:2.0.1'
+    compile 'uk.co.samuelwall:material-tap-target-prompt:2.1.0'
 }
 ```
 Supports minSdkVersion 14

diff --git a/build.gradle b/build.gradle
@@ -54,6 +54,6 @@ ext {
     targetSdkVersion = 26
     compileSdkVersion = 26
 
-    versionCode = 35
-    versionName = '2.0.1'
+    versionCode = 36
+    versionName = '2.1.0'
 }
diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>All Classes (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>All Classes (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>All Classes (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>All Classes (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/docs/constant-values.html b/docs/constant-values.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>Constant Field Values (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>Constant Field Values (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="Constant Field Values (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {
@@ -110,12 +110,26 @@ <h2 title="uk.co">uk.co.*</h2>
 <td class="colLast"><code>4</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_FINISHING">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_FINISHING">STATE_FINISHING</a></code></td>
+<td class="colLast"><code>7</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_FOCAL_PRESSED">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_FOCAL_PRESSED">STATE_FOCAL_PRESSED</a></code></td>
 <td class="colLast"><code>3</code></td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_NON_FOCAL_PRESSED">STATE_NON_FOCAL_PRESSED</a></code></td>
+<td class="colLast"><code>8</code></td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a name="uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.STATE_REVEALED">
 <!--   -->

diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>Deprecated List (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>Deprecated List (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="Deprecated List (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/help-doc.html b/docs/help-doc.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>API Help (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>API Help (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="API Help (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/index-all.html b/docs/index-all.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>Index (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>Index (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="Index (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {
@@ -372,6 +372,10 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Set the primary text to the given string</div>
 </dd>
+<dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html#setPrimaryText-java.lang.CharSequence-">setPrimaryText(CharSequence)</a></span> - Method in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt.Builder</a></dt>
+<dd>
+<div class="block">Set the primary text to the given CharSequence.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html#setPrimaryTextColour-int-">setPrimaryTextColour(int)</a></span> - Method in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt.Builder</a></dt>
 <dd>
 <div class="block">Set the primary text colour.</div>
@@ -408,6 +412,10 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Set the secondary text.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html#setSecondaryText-java.lang.CharSequence-">setSecondaryText(CharSequence)</a></span> - Method in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt.Builder</a></dt>
+<dd>
+<div class="block">Set the secondary text.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html#setSecondaryTextColour-int-">setSecondaryTextColour(int)</a></span> - Method in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.Builder.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt.Builder</a></dt>
 <dd>
 <div class="block">Set the secondary text colour.</div>
@@ -484,17 +492,24 @@ <h2 class="title">S</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_DISMISSING">STATE_DISMISSING</a></span> - Static variable in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt</a></dt>
 <dd>
-<div class="block">The prompt has been pressed somewhere outside the focal area or the system back button has
- been pressed.</div>
+<div class="block">The <a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#dismiss--"><code>MaterialTapTargetPrompt.dismiss()</code></a> method has been called and the prompt is being removed from view.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_FINISHED">STATE_FINISHED</a></span> - Static variable in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt</a></dt>
 <dd>
 <div class="block">The prompt has been removed from view after the prompt has been pressed in the focal area.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_FINISHING">STATE_FINISHING</a></span> - Static variable in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt</a></dt>
+<dd>
+<div class="block">The <a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#finish--"><code>MaterialTapTargetPrompt.finish()</code></a> method has been called and the prompt is being removed from view.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_FOCAL_PRESSED">STATE_FOCAL_PRESSED</a></span> - Static variable in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt</a></dt>
 <dd>
 <div class="block">The prompt target has been pressed in the focal area.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_NON_FOCAL_PRESSED">STATE_NON_FOCAL_PRESSED</a></span> - Static variable in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt</a></dt>
+<dd>
+<div class="block">The prompt has been pressed outside the focal area.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html#STATE_REVEALED">STATE_REVEALED</a></span> - Static variable in class uk.co.samuelwall.materialtaptargetprompt.<a href="uk/co/samuelwall/materialtaptargetprompt/MaterialTapTargetPrompt.html" title="class in uk.co.samuelwall.materialtaptargetprompt">MaterialTapTargetPrompt</a></dt>
 <dd>
 <div class="block">Prompt reveal animation has finished and the prompt is displayed.</div>

diff --git a/docs/index.html b/docs/index.html
@@ -2,8 +2,8 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>material-tap-target-prompt 2.0.1 API</title>
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>material-tap-target-prompt 2.1.0 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")

diff --git a/docs/overview-tree.html b/docs/overview-tree.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>Class Hierarchy (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>Class Hierarchy (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="Class Hierarchy (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/uk/co/samuelwall/materialtaptargetprompt/ActivityResourceFinder.html b/docs/uk/co/samuelwall/materialtaptargetprompt/ActivityResourceFinder.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>ActivityResourceFinder (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>ActivityResourceFinder (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActivityResourceFinder (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="ActivityResourceFinder (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/uk/co/samuelwall/materialtaptargetprompt/DialogResourceFinder.html b/docs/uk/co/samuelwall/materialtaptargetprompt/DialogResourceFinder.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Tue Aug 08 12:50:08 BST 2017 -->
-<title>DialogResourceFinder (material-tap-target-prompt 2.0.1 API)</title>
-<meta name="date" content="2017-08-08">
+<!-- Generated by javadoc (1.8.0_131) on Wed Sep 06 18:39:58 BST 2017 -->
+<title>DialogResourceFinder (material-tap-target-prompt 2.1.0 API)</title>
+<meta name="date" content="2017-09-06">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DialogResourceFinder (material-tap-target-prompt 2.0.1 API)";
+            parent.document.title="DialogResourceFinder (material-tap-target-prompt 2.1.0 API)";
         }
     }
     catch(err) {