Skip to content

Commit 0b91cd4

Browse files
authored
feat: support multiple text and more style options (#104)
* feat: android support multiple text and more style options * feat: android generic font size * feat: refactor to use kotlin * chore: code opt * style: code style opt * feat: android image rotate support * fix: android rotate position fix * feat: ios support multiple lines text and more style options * chore: gh config * fix: ios base64 load * fix: iOS handle nullable value * fix: iOS mark position fix * fix: change TextBackgroundType.none value to fit * fix: iOS font nill crash * refactor: use swift * fix: rotate fix and transparent * fix: iOS text rotate * fix: iOS image rotate * fix: android image rotate * fix: ios text rotation * fix: android text rotate --------- Co-authored-by: JimmyDaddy <heyjimmygo@gmail.com>
1 parent 9e9de9e commit 0b91cd4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3986
-4066
lines changed

.github/workflows/jekyll-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Build with Jekyll
3434
uses: actions/jekyll-build-pages@v1
3535
with:
36-
source: ./
36+
source: ./docs
3737
destination: ./_site
3838
- name: Upload artifact
3939
uses: actions/upload-pages-artifact@v1

.release-it.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
theme: jekyll-theme-cayman
22
title: react native image marker
33
description: Add text or icon watermark to your images
4+
baseurl: /react-native-image-marker

android/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
buildscript {
2+
def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["ImageMarker_kotlinVersion"]
23
repositories {
34
google()
45
mavenCentral()
56
}
67

78
dependencies {
89
classpath "com.android.tools.build:gradle:7.2.1"
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
911
}
1012
}
1113

@@ -14,7 +16,7 @@ def isNewArchitectureEnabled() {
1416
}
1517

1618
apply plugin: "com.android.library"
17-
19+
apply plugin: "kotlin-android"
1820

1921
def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
2022

@@ -61,12 +63,14 @@ repositories {
6163
jcenter()
6264
}
6365

66+
def kotlin_version = getExtOrDefault("kotlinVersion")
6467

6568
dependencies {
6669
// For < 0.71, this will be from the local maven repo
6770
// For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
6871
//noinspection GradleDynamicVersion
6972
implementation "com.facebook.react:react-native:+"
73+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
7074
}
7175

7276
if (isNewArchitectureEnabled()) {

android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.jimmydaddy.imagemarker">
3-
2+
package="com.jimmydaddy.imagemarker">
43
</manifest>

0 commit comments

Comments
 (0)