the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating app version and renaming tableOddRowBackgroundColorOpacity

Browse Source
This commit is contained in:
nemanja_tomasevic 2021-04-16 09:55:19 +02:00
parent 9b6f3d06e1
commit 5e97486ce1
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Changelog # Changelog
# 4.6.3
#### Added
* `ext-tables` - `TableTheme.tableOddRowBackgroundColorAplha` which gives ability to change
alpha channel of table odd rows
# 4.6.2 # 4.6.2
#### Added #### Added

8
app-sample/build.gradle
View File

@ -60,7 +60,7 @@ android {
// do not sign in CI // do not sign in CI
if (!project.hasProperty('CI')) { if (!project.hasProperty('CI')) {
signingConfigs { /*signingConfigs {
config { config {
final def keystoreFile = project.file('keystore.jks') final def keystoreFile = project.file('keystore.jks')
@ -89,14 +89,14 @@ android {
keyAlias project[keystoreAlias] keyAlias project[keystoreAlias]
keyPassword project[keystoreAliasPassword] keyPassword project[keystoreAliasPassword]
} }
} }*/
buildTypes { buildTypes {
debug { debug {
signingConfig signingConfigs.config // signingConfig signingConfigs.config
} }
release { release {
signingConfig signingConfigs.config // signingConfig signingConfigs.config
} }
} }
} }

2
gradle.properties
View File

@ -8,7 +8,7 @@ android.enableJetifier=true
android.enableBuildCache=true android.enableBuildCache=true
android.buildCacheDir=build/pre-dex-cache android.buildCacheDir=build/pre-dex-cache
VERSION_NAME=4.6.2 VERSION_NAME=4.6.3
GROUP=io.noties.markwon GROUP=io.noties.markwon
POM_DESCRIPTION=Markwon markdown for Android POM_DESCRIPTION=Markwon markdown for Android

16
markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableTheme.java
View File

@ -48,7 +48,7 @@ public class TableTheme {
protected final int tableOddRowBackgroundColor; protected final int tableOddRowBackgroundColor;
// by default TABLE_ODD_ROW_DEF_ALPHA // by default TABLE_ODD_ROW_DEF_ALPHA
protected int tableOddRowBackgroundColorOpacity; protected int tableOddRowBackgroundColorAlpha;
// @since 1.1.1 // @since 1.1.1
// by default no background // by default no background
@ -66,10 +66,10 @@ public class TableTheme {
this.tableEvenRowBackgroundColor = builder.tableEvenRowBackgroundColor; this.tableEvenRowBackgroundColor = builder.tableEvenRowBackgroundColor;
this.tableHeaderRowBackgroundColor = builder.tableHeaderRowBackgroundColor; this.tableHeaderRowBackgroundColor = builder.tableHeaderRowBackgroundColor;
if(builder.tableOddRowBackgroundColorOpacity == -1) { if(builder.tableOddRowBackgroundColorAlpha == -1) {
this.tableOddRowBackgroundColorOpacity = TABLE_ODD_ROW_DEF_ALPHA; this.tableOddRowBackgroundColorAlpha = TABLE_ODD_ROW_DEF_ALPHA;
} else { } else {
this.tableOddRowBackgroundColorOpacity = builder.tableOddRowBackgroundColorOpacity; this.tableOddRowBackgroundColorAlpha = builder.tableOddRowBackgroundColorAlpha;
} }
} }
@ -119,7 +119,7 @@ public class TableTheme {
final int color; final int color;
if (tableOddRowBackgroundColor == 0) { if (tableOddRowBackgroundColor == 0) {
color = ColorUtils.applyAlpha(paint.getColor(), tableOddRowBackgroundColorOpacity); color = ColorUtils.applyAlpha(paint.getColor(), tableOddRowBackgroundColorAlpha);
} else { } else {
color = tableOddRowBackgroundColor; color = tableOddRowBackgroundColor;
} }
@ -150,7 +150,7 @@ public class TableTheme {
private int tableBorderColor; private int tableBorderColor;
private int tableBorderWidth = -1; private int tableBorderWidth = -1;
private int tableOddRowBackgroundColor; private int tableOddRowBackgroundColor;
private int tableOddRowBackgroundColorOpacity = -1; private int tableOddRowBackgroundColorAlpha = -1;
private int tableEvenRowBackgroundColor; // @since 1.1.1 private int tableEvenRowBackgroundColor; // @since 1.1.1
private int tableHeaderRowBackgroundColor; // @since 1.1.1 private int tableHeaderRowBackgroundColor; // @since 1.1.1
@ -179,8 +179,8 @@ public class TableTheme {
} }
@NonNull @NonNull
public Builder tableOddRowBackgroundColorOpacity(int tableOddRowBackgroundColorOpacity) { public Builder tableOddRowBackgroundColorAlpha(int tableOddRowBackgroundColorAlpha) {
this.tableOddRowBackgroundColorOpacity = tableOddRowBackgroundColorOpacity; this.tableOddRowBackgroundColorAlpha = tableOddRowBackgroundColorAlpha;
return this; return this;
} }

2
markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryTheme.java
View File

@ -52,7 +52,7 @@ public class TableEntryTheme extends TableTheme {
@ColorInt @ColorInt
public int tableOddRowBackgroundColor(@NonNull Paint paint) { public int tableOddRowBackgroundColor(@NonNull Paint paint) {
return tableOddRowBackgroundColor == 0 return tableOddRowBackgroundColor == 0
? ColorUtils.applyAlpha(paint.getColor(), tableOddRowBackgroundColorOpacity) ? ColorUtils.applyAlpha(paint.getColor(), tableOddRowBackgroundColorAlpha)
: tableOddRowBackgroundColor; : tableOddRowBackgroundColor;
} }