Skip to content

Commit

Permalink
fix: android api level compatible setting and docs (#117)
Browse files Browse the repository at this point in the history
Co-authored-by: JimmyDaddy <cjh269940@antgroup.com>
  • Loading branch information
JimmyDaddy and JimmyDaddy authored Sep 5, 2023
1 parent f586179 commit bea81ab
Show file tree
Hide file tree
Showing 18 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Add text or icon watermark to your images
| React Native Version | react-native-image-marker Version |
| ---------------------| --------------------------------- |
| < 0.60.0 | v0.5.2 or earlier |
| >= 0.60.0, iOS < 13, Android < N | v1.0.x |
| >= 0.60.0, iOS < 13, Android < N(API Level 24) | v1.0.x |
| >= 0.60.0, other cases | v1.1.0 or later |

> Note: This table is only applicable to major versions of react-native-image-marker. Patch versions should be backwards compatible.
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ImageMarker_kotlinVersion=1.7.0
ImageMarker_minSdkVersion=21
ImageMarker_minSdkVersion=24
ImageMarker_targetSdkVersion=31
ImageMarker_compileSdkVersion=31
ImageMarker_ndkversion=21.4.7075529
Expand Down
6 changes: 3 additions & 3 deletions docs/latest/classes/Marker.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h4>Hierarchy</h4>
<ul class="tsd-hierarchy">
<li><span class="target">Marker</span></li></ul></section><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L682">index.ts:682</a></li></ul></aside>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L682">index.ts:682</a></li></ul></aside>
<section class="tsd-panel-group tsd-index-group">
<section class="tsd-panel tsd-index-panel">
<details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary">
Expand Down Expand Up @@ -53,7 +53,7 @@ <h4>Example</h4><pre><code class="language-ts"><span class="hl-5">const</span><s
</code><button>Copy</button></pre>
</div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L835">index.ts:835</a></li></ul></aside></li></ul></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L835">index.ts:835</a></li></ul></aside></li></ul></section>
<section class="tsd-panel tsd-member"><a id="markText" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><code class="tsd-tag ts-flagStatic">Static</code> <span>mark<wbr/>Text</span><a href="#markText" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<ul class="tsd-signatures">
Expand All @@ -74,7 +74,7 @@ <h4>Example</h4><pre><code class="language-ts"><span class="hl-5">const</span><s
</code><button>Copy</button></pre>
</div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L767">index.ts:767</a></li></ul></aside></li></ul></section></section></div>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L767">index.ts:767</a></li></ul></aside></li></ul></section></section></div>
<div class="col-sidebar">
<div class="page-menu">
<div class="tsd-navigation settings">
Expand Down
8 changes: 4 additions & 4 deletions docs/latest/enums/ImageFormat.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>Enumeration ImageFormat</h1></div>
<h4>Description</h4><p>ImageFormat enum for save image format</p>
</div></section><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L38">index.ts:38</a></li></ul></aside>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L38">index.ts:38</a></li></ul></aside>
<section class="tsd-panel-group tsd-index-group">
<section class="tsd-panel tsd-index-panel">
<details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary">
Expand All @@ -38,17 +38,17 @@ <h2>Enumeration Members</h2>
<h3 class="tsd-anchor-link"><span>base64</span><a href="#base64" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><g stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" id="icon-anchor"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M10 14a3.5 3.5 0 0 0 5 0l4 -4a3.5 3.5 0 0 0 -5 -5l-.5 .5"></path><path d="M14 10a3.5 3.5 0 0 0 -5 0l-4 4a3.5 3.5 0 0 0 5 5l.5 -.5"></path></g></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">base64</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;base64&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L42">index.ts:42</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L42">index.ts:42</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="jpg" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>jpg</span><a href="#jpg" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">jpg</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;jpg&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L40">index.ts:40</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L40">index.ts:40</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="png" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>png</span><a href="#png" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">png</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;png&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L39">index.ts:39</a></li></ul></aside></section></section></div>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L39">index.ts:39</a></li></ul></aside></section></section></div>
<div class="col-sidebar">
<div class="page-menu">
<div class="tsd-navigation settings">
Expand Down
16 changes: 8 additions & 8 deletions docs/latest/enums/Position.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>Enumeration Position</h1></div>
<h4>Description</h4><p>Position enum for text watermark and image watermark</p>
</div></section><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L14">index.ts:14</a></li></ul></aside>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L14">index.ts:14</a></li></ul></aside>
<section class="tsd-panel-group tsd-index-group">
<section class="tsd-panel tsd-index-panel">
<details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary">
Expand All @@ -42,37 +42,37 @@ <h2>Enumeration Members</h2>
<h3 class="tsd-anchor-link"><span>bottom<wbr/>Center</span><a href="#bottomCenter" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><g stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" id="icon-anchor"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M10 14a3.5 3.5 0 0 0 5 0l4 -4a3.5 3.5 0 0 0 -5 -5l-.5 .5"></path><path d="M14 10a3.5 3.5 0 0 0 -5 0l-4 4a3.5 3.5 0 0 0 5 5l.5 -.5"></path></g></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">bottom<wbr/>Center</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;bottomCenter&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L19">index.ts:19</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L19">index.ts:19</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="bottomLeft" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>bottom<wbr/>Left</span><a href="#bottomLeft" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">bottom<wbr/>Left</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;bottomLeft&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L18">index.ts:18</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L18">index.ts:18</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="bottomRight" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>bottom<wbr/>Right</span><a href="#bottomRight" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">bottom<wbr/>Right</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;bottomRight&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L20">index.ts:20</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L20">index.ts:20</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="center" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>center</span><a href="#center" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">center</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;center&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L21">index.ts:21</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L21">index.ts:21</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="topCenter" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>top<wbr/>Center</span><a href="#topCenter" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">top<wbr/>Center</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;topCenter&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L16">index.ts:16</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L16">index.ts:16</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="topLeft" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>top<wbr/>Left</span><a href="#topLeft" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">top<wbr/>Left</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;topLeft&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L15">index.ts:15</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L15">index.ts:15</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="topRight" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>top<wbr/>Right</span><a href="#topRight" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">top<wbr/>Right</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;topRight&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L17">index.ts:17</a></li></ul></aside></section></section></div>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L17">index.ts:17</a></li></ul></aside></section></section></div>
<div class="col-sidebar">
<div class="page-menu">
<div class="tsd-navigation settings">
Expand Down
8 changes: 4 additions & 4 deletions docs/latest/enums/TextBackgroundType.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>Enumeration TextBackgroundType</h1></div>
<h4>Description</h4><p>TextBackgroundType enum for text watermark</p>
</div></section><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L28">index.ts:28</a></li></ul></aside>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L28">index.ts:28</a></li></ul></aside>
<section class="tsd-panel-group tsd-index-group">
<section class="tsd-panel tsd-index-panel">
<details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary">
Expand All @@ -38,17 +38,17 @@ <h2>Enumeration Members</h2>
<h3 class="tsd-anchor-link"><span>none</span><a href="#none" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><g stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" id="icon-anchor"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M10 14a3.5 3.5 0 0 0 5 0l4 -4a3.5 3.5 0 0 0 -5 -5l-.5 .5"></path><path d="M14 10a3.5 3.5 0 0 0 -5 0l-4 4a3.5 3.5 0 0 0 5 5l.5 -.5"></path></g></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">none</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;fit&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L31">index.ts:31</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L31">index.ts:31</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="stretchX" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>stretchX</span><a href="#stretchX" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">stretchX</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;stretchX&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L29">index.ts:29</a></li></ul></aside></section>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L29">index.ts:29</a></li></ul></aside></section>
<section class="tsd-panel tsd-member"><a id="stretchY" class="tsd-anchor"></a>
<h3 class="tsd-anchor-link"><span>stretchY</span><a href="#stretchY" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3>
<div class="tsd-signature"><span class="tsd-kind-enum-member">stretchY</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;stretchY&quot;</span></div><aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/08ed8cf/src/index.ts#L30">index.ts:30</a></li></ul></aside></section></section></div>
<li>Defined in <a href="https://github.com/JimmyDaddy/react-native-image-marker/blob/f586179/src/index.ts#L30">index.ts:30</a></li></ul></aside></section></section></div>
<div class="col-sidebar">
<div class="page-menu">
<div class="tsd-navigation settings">
Expand Down
2 changes: 1 addition & 1 deletion docs/latest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h2>image marker for rn</h2></div>
<td>v0.5.2 or earlier</td>
</tr>
<tr>
<td>&gt;= 0.60.0, iOS &lt; 13, Android &lt; N</td>
<td>&gt;= 0.60.0, iOS &lt; 13, Android &lt; N(API Level 24)</td>
<td>v1.0.x</td>
</tr>
<tr>
Expand Down
Loading

0 comments on commit bea81ab

Please sign in to comment.