Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update the demo gifs in readme.md #35

Open
wants to merge 60 commits into
base: light
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
bc78910
Update README.md
huangyz0918 Sep 23, 2018
237b623
Update README-CN.md
huangyz0918 Sep 23, 2018
014fab6
Update README.md
huangyz0918 Sep 23, 2018
5155750
🎉 init: add wikis.
huangyz0918 Sep 23, 2018
7966a13
🔨 refactor: move wikis.
huangyz0918 Sep 23, 2018
ba94ae6
Update WIKI.md
huangyz0918 Sep 23, 2018
9148a52
Update README.md
huangyz0918 Sep 23, 2018
035a41b
Update README.md
huangyz0918 Sep 23, 2018
5444b84
Update WIKI-CN.md
huangyz0918 Sep 23, 2018
4ab02d8
Update README-CN.md
huangyz0918 Sep 23, 2018
7658f46
✨ feat: fixed oom in LSB, fixed oom in FD and built new.
huangyz0918 Sep 24, 2018
03b4806
Merge branch 'master' of https://github.com/huangyz0918/AndroidWM
huangyz0918 Sep 24, 2018
d7d9af1
📝 docs:
huangyz0918 Sep 24, 2018
1380a7b
✨ feat: added a progress bar in sample.
huangyz0918 Sep 24, 2018
47e62e7
✨ feat: removed the fft library and use local codes.
huangyz0918 Sep 24, 2018
71be849
Update README.md
huangyz0918 Sep 27, 2018
28a5663
Update README-CN.md
huangyz0918 Sep 27, 2018
0623be6
🔨 refactor:
huangyz0918 Sep 28, 2018
47ce97e
👷 build: published a newer version: v0.2.3
huangyz0918 Sep 28, 2018
9d58c86
📝 docs: updated the readme
huangyz0918 Sep 28, 2018
e967153
Merge branch 'master' of https://github.com/huangyz0918/AndroidWM
huangyz0918 Sep 28, 2018
46954a2
Update README.md
huangyz0918 Sep 28, 2018
71522e0
Update README-CN.md
huangyz0918 Sep 28, 2018
835073d
✨ feat: added new logo
huangyz0918 Oct 3, 2018
1761433
Merge branch 'master' of https://github.com/huangyz0918/AndroidWM
huangyz0918 Oct 3, 2018
68969aa
✨ feat(added banner):
huangyz0918 Oct 3, 2018
cd5fd7f
✨ feat: added a banner
huangyz0918 Oct 3, 2018
38e419f
Update README.md
huangyz0918 Oct 3, 2018
05a29fd
Update README.md
huangyz0918 Oct 3, 2018
ed52ed6
Update README.md
huangyz0918 Oct 3, 2018
0fca65d
Update README.md
huangyz0918 Oct 3, 2018
fdd4e47
Update README.md
huangyz0918 Oct 3, 2018
a447700
Update README.md
huangyz0918 Oct 3, 2018
62527ed
Update README.md
huangyz0918 Oct 3, 2018
a43562f
Update README.md
huangyz0918 Oct 3, 2018
cf9a300
Update README-CN.md
huangyz0918 Oct 3, 2018
fea5e85
Update README.md
huangyz0918 Oct 5, 2018
c5a5264
Update README-CN.md
huangyz0918 Oct 5, 2018
bce68ba
🔨 refactor: refactored the DCT code.
huangyz0918 Oct 5, 2018
001319b
💤 chore:
huangyz0918 Oct 5, 2018
4a78558
💄 ui:
huangyz0918 Nov 30, 2018
53e31ae
👷 build: update the gradle file
huangyz0918 Jan 9, 2019
0c7dd44
Update README.md
huangyz0918 Jan 15, 2019
b3c76ae
Update gradle-wrapper.properties
huangyz0918 Jan 15, 2019
2c94da8
Update build.gradle
huangyz0918 Jan 15, 2019
d849d4d
Update README.md
huangyz0918 Jan 15, 2019
1bfca9b
Update README.md
huangyz0918 Jan 15, 2019
e96d626
fix typo
CubicPill Mar 2, 2019
0329cbb
add option for background image resize
CubicPill Mar 2, 2019
01e7ff4
Merge pull request #25 from CubicPill/master
huangyz0918 Mar 8, 2019
9769fd5
512 to 1024
Nov 29, 2019
b3225d7
Merge pull request #38 from ZhenghangXie/master
huangyz0918 Nov 29, 2019
99e9834
fix typo
huangyz0918 Apr 22, 2020
4cf980e
Update README.md
huangyz0918 Oct 29, 2020
a6cacfe
Upgrade gradle version, migrate to androidX
Feb 28, 2022
8750de0
Supports setting the align origin point of text/image, to make the te…
Feb 28, 2022
451091a
update readmes
Feb 28, 2022
f95b0cd
Update README.md
huangyz0918 Feb 24, 2023
21d4a23
Update README-CN.md
huangyz0918 Mar 25, 2024
6c52a8e
Merge pull request #53 from anyongjin/master
huangyz0918 May 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
**/.cxx

# Built application files
*.apk
*.ap_
Expand Down
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 29 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

137 changes: 14 additions & 123 deletions README-CN.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
# AndroidWM
[ ![Download](https://api.bintray.com/packages/huangyz0918/androidwm/androidwm/images/download.svg) ](https://bintray.com/huangyz0918/androidwm/androidwm/_latestVersion) [![Build Status](https://travis-ci.org/huangyz0918/AndroidWM.svg?branch=master)](https://travis-ci.org/huangyz0918/AndroidWM) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7f8e55520309410a95f71b54cfe8c381)](https://app.codacy.com/app/huangyz0918/AndroidWM?utm_source=github.com&utm_medium=referral&utm_content=huangyz0918/AndroidWM&utm_campaign=Badge_Grade_Dashboard)
![progress](https://img.shields.io/badge/progress-developing-yellow.svg)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7f8e55520309410a95f71b54cfe8c381)](https://app.codacy.com/app/huangyz0918/AndroidWM?utm_source=github.com&utm_medium=referral&utm_content=huangyz0918/AndroidWM&utm_campaign=Badge_Grade_Dashboard)
[![wiki](https://img.shields.io/badge/wiki-chinese-blue.svg)](https://github.com/huangyz0918/AndroidWM/blob/master/wikis/WIKI-CN.md)


一个轻量级的 Android 图片水印框架,支持隐形数字水印。 [English version](./README.md)

![](https://i.loli.net/2018/09/11/5b97dddb4e407.png)
<!--- ![](https://i.loli.net/2018/09/01/5b8aa948a2020.png) -->
<!-- ![](https://github.com/huangyz0918/AndroidWM/blob/master/images/banner.svg) -->
![](https://github.com/huangyz0918/AndroidWM/blob/master/images/logo.svg)
<!--![](https://i.loli.net/2018/09/11/5b97dddb4e407.png) -->

# 下载与安装

### Gradle:
### Gradle
下载完整版本水印框架,支持隐形数字水印 (包大小: 1Mb):

```gradle
implementation 'com.huangyz0918:androidwm:0.2.2'
```
### Maven:

```xml
<dependency>
<groupId>com.huangyz0918</groupId>
<artifactId>androidwm</artifactId>
<version>0.2.2</version>
<type>pom</type>
</dependency>
implementation 'com.huangyz0918:androidwm:0.2.3'
```

### Lvy:
下载轻量级版本,只支持可见图像水印 (包大小: 28Kb):

```xml
<dependency org='com.huangyz0918' name='androidwm' rev='0.2.2'>
<artifact name='androidwm' ext='pom' ></artifact>
</dependency>
```gradle
implementation 'com.huangyz0918:androidwm-light:0.1.2'
```

# 快速入门
Expand All @@ -41,6 +32,7 @@ implementation 'com.huangyz0918:androidwm:0.2.2'
WatermarkText watermarkText = new WatermarkText(editText)
.setPositionX(0.5)
.setPositionY(0.5)
.setOrigin(new WatermarkPosition(0.5, 0.5))
.setTextColor(Color.WHITE)
.setTextFont(R.font.champagne)
.setTextShadow(0.1f, 5, 5, Color.BLUE)
Expand Down Expand Up @@ -172,109 +164,8 @@ LSB 隐形空域水印 Demo 动态图:
| :-------------: | :-------------: |
| 隐形文字水印 (LSB) | 隐形图像水印 (LSB) |

好啦!请尽情使用吧 :kissing_heart:


# 使用说明

## 水印位置
我们使用 `WatermarkPosition` 这个类的对象来控制具体水印出现的位置。

```java
WatermarkPosition watermarkPosition = new WatermarkPosition(double position_x, double position_y, double rotation);
WatermarkPosition watermarkPosition = new WatermarkPosition(double position_x, double position_y);
```

在函数构造器中,我们可以设定水印图片的横纵坐标,如果你想在构造器中初始化一个水印旋转角度也是可以的, 水印的坐标系以背景图片的左上角为原点,横轴向右,纵轴向下。

`WatermarkPosition` 同时也支持动态调整水印的位置,这样你就不需要一次又一次地初始化新的位置对象了, androidwm 提供了一些方法:

```java
watermarkPosition
.setPositionX(x)
.setPositionY(y)
.setRotation(rotation);
```
在全覆盖水印模式(Tile mode)下,关于水印位置的参数将会失效。

| ![](https://i.loli.net/2018/09/05/5b8f4a970a83e.png) | ![](https://i.loli.net/2018/09/05/5b8f4a9706788.png) |
| :-------------: | :-------------: |
| x = y = 0, rotation = 15 | x = y = 0.5, rotation = -15 |

横纵坐标都是一个从 0 到 1 的浮点数,代表着和背景图片的相对比例。


## 字体水印的颜色

你可以在 `WatermarkText` 中设置字体水印的颜色或者是其背景颜色:

```java
WatermarkText watermarkText = new WatermarkText(editText)
.setPositionX(0.5)
.setPositionY(0.5)
.setTextSize(30)
.setTextAlpha(200)
.setTextColor(Color.GREEN)
.setBackgroundColor(Color.WHITE); // 默认背景颜色是透明的
```

| ![](https://i.loli.net/2018/09/05/5b8f4ce0cf6ce.png) | ![](https://i.loli.net/2018/09/05/5b8f4ce11a28c.png) |
| :-------------: | :-------------: |
| color = green, background color = white | color = green, background color = default |

## 字体颜色的阴影和字体
你可以从软件资源中加载一种字体,也可以通过方法 `setTextShadow` 设置字体的阴影。

```java
WatermarkText watermarkText = new WatermarkText(editText)
.setPositionX(0.5)
.setPositionY(0.5)
.setTextSize(40)
.setTextAlpha(200)
.setTextColor(Color.GREEN)
.setTextFont(R.font.champagne)
.setTextShadow(0.1f, 5, 5, Color.BLUE);
```

| ![](https://i.loli.net/2018/09/05/5b8f5c48e2631.png) | ![](https://i.loli.net/2018/09/05/5b8f5c48e081c.png) |
| :-------------: | :-------------: |
| font = champagne | shadow = (0.1f, 5, 5, BLUE) |

阴影的四个参数分别为: `(blur radius, x offset, y offset, color)`.

## 字体大小和图片大小
好啦!请尽情使用吧 :kissing_heart: 关于具体的用法和原理介绍,可以查看 [Wiki](https://github.com/huangyz0918/AndroidWM/blob/master/wikis/WIKI-CN.md)

水印字体和水印图片大小的单位是不同的:
- 字体大小和系统布局中字体大小是类似的,取决于屏幕的分辨率和背景图片的像素,您可能需要动态调整。
- 图片大小是一个从 0 到 1 的浮点数,是水印图片的宽度占背景图片宽度的比例。

| ![](https://i.loli.net/2018/09/05/5b8f5eb1a7fb0.png) | ![](https://i.loli.net/2018/09/05/5b8f5eb24d0fd.png) |
| :-------------: | :-------------: |
| image size = 0.3 | text size = 40 |


## 方法列表
对于 `WatermarkText` 和 `WatermarkImage` 的定制化,我们提供了一些常用的方法:


| __方法名称__ | __备注__ | __默认值__ |
| ------------- | ------------- | ------------- |
| setPosition | 水印的位置类 `WatermarkPosition` | _null_ |
| setPositionX | 水印的横轴坐标,从背景图片左上角为(0,0) | _0_ |
| setPositionY | 水印的纵轴坐标,从背景图片左上角为(0,0) | _0_ |
| setRotation | 水印的旋转角度| _0_ |
| setTextColor (`WatermarkText`) | `WatermarkText` 的文字颜色 | _`Color.BLACK`_ |
| setTextStyle (`WatermarkText`) | `WatermarkText` 的文字样式| _`Paint.Style.FILL`_ |
| setBackgroundColor (`WatermarkText`) | `WatermarkText` 的背景颜色 | _null_ |
| setTextAlpha (`WatermarkText`) | `WatermarkText` 文字的透明度, 从 0 到 255 | _50_ |
| setImageAlpha (`WatermarkImage`) | `WatermarkImage` 图片的透明度, 从 0 到 255 | _50_ |
| setTextSize (`WatermarkText`) | `WatermarkText` 字体的大小,单位与系统 layout 相同 | _20_ |
| setSize (`WatermarkImage`)| `WatermarkImage` 水印图片的大小,从 0 到 1 (背景图片大小的比例) | _0.2_ |
| setTextFont (`WatermarkText`) | `WatermarkText` 的字体| _default_ |
| setTextShadow (`WatermarkText`)| `WatermarkText` 字体的阴影与圆角 | _(0, 0, 0)_ |
| setImageDrawable (`WatermarkImage`)| `WatermarkImage`的图片资源 | _null_ |

`WatermarkImage` 的一些基本属性和`WatermarkText` 的相同。

# 开源许可
```
Expand Down
Loading