diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55243c77..42edba25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,4 +57,8 @@ new TextStyleBuilder()
## 1.0.0
- New : Migrating the support libraries to AndroidX
- New : Bumped target sdk version to 29
-- Test : Adding UI to test for the library
\ No newline at end of file
+- Test : Adding UI to test for the library
+
+## 1.1.0
+- Fixed : #263 and #57
+- New : Allowing `PhotoEditor` to extend with protected constructor.
\ No newline at end of file
diff --git a/README.md b/README.md
index 109f5805..f718963f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# PhotoEditor
[](https://circleci.com/gh/burhanrashid52/PhotoEditor)
-[](https://bintray.com/burhanrashid52/maven/photoeditor)  [](https://burhanrashid52.github.io/PhotoEditor/) [](https://www.uplabs.com/posts/photoeditor)
+[](https://bintray.com/burhanrashid52/maven/photoeditor)  [](https://burhanrashid52.github.io/PhotoEditor/) [](https://www.uplabs.com/posts/photoeditor)
[](https://android-arsenal.com/details/1/6736)
[](https://www.androiddevdigest.com/digest-185)
[](https://android.libhunt.com/newsletter/97)
@@ -38,7 +38,7 @@ PhotoEditor ```v.1.0.0``` is a migration to androidX and dropping the support of
## Getting Started
To start with this, we need to simply add the dependencies in the gradle file of our app module like this
```java
-implementation 'ja.burhanrashid52:photoeditor:1.0.0'
+implementation 'ja.burhanrashid52:photoeditor:1.1.0'
```
or we can also import the :photoeditor module from sample for further customization
@@ -261,6 +261,7 @@ No. Currently, the focus is on making the android library better. We don't have
### Who is using PhotoEditor?
1. [Best Quotes & Status 2019 (99000+ Collection)](https://play.google.com/store/apps/details?id=com.swastik.quotesandstatus&hl=en_US)
+2. [Pixxo](https://play.google.com/store/apps/details?id=com.pixxo.breezil.pixxo)
**Note**: I will be happy to add your app to the list. Please reach out to me with details. You know how to reach me :)
diff --git a/app/build.gradle b/app/build.gradle
index 11123383..a639d204 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.material:material:1.2.1'
- implementation 'ja.burhanrashid52:photoeditor:1.0.0'
+ implementation 'ja.burhanrashid52:photoeditor:1.1.0'
//implementation project(':photoeditor')
implementation 'androidx.cardview:cardview:1.0.0'
diff --git a/app/src/main/res/layout/fragment_bottom_properties_dialog.xml b/app/src/main/res/layout/fragment_bottom_properties_dialog.xml
index 23a92fee..7839f038 100644
--- a/app/src/main/res/layout/fragment_bottom_properties_dialog.xml
+++ b/app/src/main/res/layout/fragment_bottom_properties_dialog.xml
@@ -23,7 +23,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sbOpacity"
tools:background="@android:color/black"
- tools:listitem="@layout/color_picker_item_list" />
+ tools:listitem="@layout/color_picker_item_list"
+ android:layout_alignParentRight="true" />
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginLeft="8dp" />
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginRight="8dp" />
diff --git a/app/src/main/res/layout/layout_tools_paint.xml b/app/src/main/res/layout/layout_tools_paint.xml
index bb8f0ad1..93c34de8 100644
--- a/app/src/main/res/layout/layout_tools_paint.xml
+++ b/app/src/main/res/layout/layout_tools_paint.xml
@@ -70,6 +70,7 @@
android:layout_marginTop="8dp"
android:padding="4dp"
android:src="@drawable/ic_eraser"
+ app:layout_constraintTop_toTopOf="@+id/guideline"
app:layout_constraintEnd_toStartOf="@+id/imgSticker"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/imgText" />
@@ -83,6 +84,7 @@
android:src="@drawable/ic_sticker"
app:layout_constraintEnd_toStartOf="@+id/imgEmoji"
app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintTop_toTopOf="@+id/guideline"
app:layout_constraintStart_toEndOf="@+id/btnEraser" />
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cddd3f38..b02c3150 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
diff --git a/photoeditor/build.gradle b/photoeditor/build.gradle
index 4dfb945f..bd66e2a7 100644
--- a/photoeditor/build.gradle
+++ b/photoeditor/build.gradle
@@ -15,7 +15,7 @@ ext {
siteUrl = 'https://github.com/burhanrashid52/PhotoEditor'
gitUrl = 'https://github.com/burhanrashid52/PhotoEditor'
- libraryVersion = '1.0.0'
+ libraryVersion = '1.1.0'
developerId = 'burhanrashid52'
developerName = 'Burhanuddin Rashid'
@@ -33,8 +33,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 30
- versionCode 1
- versionName "1.0.0"
+ versionCode 2
+ versionName "1.1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@@ -55,7 +55,9 @@ android {
options.addStringOption('Xdoclint:none', '-quiet')
options.addStringOption('encoding', 'UTF-8')
options.addStringOption('charSet', 'UTF-8')
+ failOnError false
}
+
}
dependencies {
@@ -74,5 +76,5 @@ dependencies {
}
// Place it at the end of the file
-//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'