Merge branch 'develop'

126 files changed, 3132 insertions, 190 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d45c2b562..14dc0417a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 274
-        versionName "2.2.0"
+        versionCode 276
+        versionName "2.3.0"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
@@ -102,4 +102,6 @@ dependencies {
     implementation 'com.github.stom79:horizontalbargraph:1.5'
     implementation 'jp.wasabeef:glide-transformations:4.0.0'
     playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
+    implementation 'ja.burhanrashid52:photoeditor:0.3.3'
+    implementation 'com.github.yalantis:ucrop:2.2.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b8b38b663..71c438373 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -161,6 +161,15 @@
             android:label="@string/app_name"
             android:configChanges="keyboardHidden|orientation|screenSize"
             />
+        <activity android:name="app.fedilab.android.activities.PhotoEditorActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            />
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
         <activity android:name="app.fedilab.android.activities.WebviewActivity"
             android:label="@string/app_name"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/app/src/main/assets/emojione-android.ttf b/app/src/main/assets/emojione-android.ttf
new file mode 100644
index 000000000..4cd640d09
--- /dev/null
+++ b/app/src/main/assets/emojione-android.ttf
diff --git a/app/src/main/assets/filters/auto_fix.png b/app/src/main/assets/filters/auto_fix.png
new file mode 100644
index 000000000..ce6b07fc8
--- /dev/null
+++ b/app/src/main/assets/filters/auto_fix.png
diff --git a/app/src/main/assets/filters/b_n_w.png b/app/src/main/assets/filters/b_n_w.png
new file mode 100644
index 000000000..500b3ca97
--- /dev/null
+++ b/app/src/main/assets/filters/b_n_w.png
diff --git a/app/src/main/assets/filters/brightness.png b/app/src/main/assets/filters/brightness.png
new file mode 100644
index 000000000..6b829d309
--- /dev/null
+++ b/app/src/main/assets/filters/brightness.png
diff --git a/app/src/main/assets/filters/contrast.png b/app/src/main/assets/filters/contrast.png
new file mode 100644
index 000000000..6c6bb2845
--- /dev/null
+++ b/app/src/main/assets/filters/contrast.png
diff --git a/app/src/main/assets/filters/cross_process.png b/app/src/main/assets/filters/cross_process.png
new file mode 100644
index 000000000..379cf5ada
--- /dev/null
+++ b/app/src/main/assets/filters/cross_process.png
diff --git a/app/src/main/assets/filters/documentary.png b/app/src/main/assets/filters/documentary.png
new file mode 100644
index 000000000..0c39eac9a
--- /dev/null
+++ b/app/src/main/assets/filters/documentary.png
diff --git a/app/src/main/assets/filters/dual_tone.png b/app/src/main/assets/filters/dual_tone.png
new file mode 100644
index 000000000..93cc08845
--- /dev/null
+++ b/app/src/main/assets/filters/dual_tone.png
diff --git a/app/src/main/assets/filters/fill_light.png b/app/src/main/assets/filters/fill_light.png
new file mode 100644
index 000000000..98543a190
--- /dev/null
+++ b/app/src/main/assets/filters/fill_light.png
diff --git a/app/src/main/assets/filters/fish_eye.png b/app/src/main/assets/filters/fish_eye.png
new file mode 100644
index 000000000..60fec8b74
--- /dev/null
+++ b/app/src/main/assets/filters/fish_eye.png
diff --git a/app/src/main/assets/filters/flip_horizental.png b/app/src/main/assets/filters/flip_horizental.png
new file mode 100644
index 000000000..ffa8aead5
--- /dev/null
+++ b/app/src/main/assets/filters/flip_horizental.png
diff --git a/app/src/main/assets/filters/flip_vertical.png b/app/src/main/assets/filters/flip_vertical.png
new file mode 100644
index 000000000..91f2e1bdd
--- /dev/null
+++ b/app/src/main/assets/filters/flip_vertical.png
diff --git a/app/src/main/assets/filters/grain.png b/app/src/main/assets/filters/grain.png
new file mode 100644
index 000000000..77ee526e2
--- /dev/null
+++ b/app/src/main/assets/filters/grain.png
diff --git a/app/src/main/assets/filters/gray_scale.png b/app/src/main/assets/filters/gray_scale.png
new file mode 100644
index 000000000..c427f8e85
--- /dev/null
+++ b/app/src/main/assets/filters/gray_scale.png