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

How Can I Show Image with text in AreTextView, PLease #150

Open
wants to merge 111 commits into
base: toolbar-refa
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
6300e3a
Merge pull request #29 from chinalwb/toolbar-refa
chinalwb Aug 10, 2018
a0720e1
Merge pull request #30 from chinalwb/toolbar-refa
chinalwb Aug 10, 2018
a2bb400
Merge pull request #31 from chinalwb/toolbar-refa
chinalwb Aug 12, 2018
195f113
Merge pull request #32 from chinalwb/toolbar-refa
chinalwb Aug 12, 2018
f5ec601
Merge pull request #33 from chinalwb/toolbar-refa
chinalwb Aug 12, 2018
130d9f2
Added screenshots
chinalwb Aug 13, 2018
aceb0ed
Update README.md
chinalwb Aug 13, 2018
2ad7c2a
Merge pull request #34 from chinalwb/toolbar-refa
chinalwb Aug 17, 2018
60e6d03
Update README.md
chinalwb Aug 20, 2018
e5e7e57
Merge pull request #37 from chinalwb/toolbar-refa
chinalwb Aug 22, 2018
344e631
Update README.md
chinalwb Aug 22, 2018
8f80c11
Removed modules
chinalwb Aug 22, 2018
084d624
Updated readme
chinalwb Aug 22, 2018
138f509
New screenshots
chinalwb Aug 22, 2018
d6b70c7
New images
chinalwb Aug 22, 2018
561dafa
Added escapeCJK flag
chinalwb Aug 24, 2018
dd01640
Updated readme
chinalwb Aug 31, 2018
60f7156
Updated readme
chinalwb Aug 31, 2018
90cacfb
Updated readme
chinalwb Aug 31, 2018
9d94d87
Updated readme
chinalwb Aug 31, 2018
97a8b2c
Updated readme
chinalwb Aug 31, 2018
f249ccf
Update README.md
chinalwb Aug 31, 2018
4003143
Update README.md
chinalwb Sep 1, 2018
de7ed6a
Updated gradle
chinalwb Sep 10, 2018
3b4f13b
Merge pull request #5 from chinalwb/master
LinXueyuanStdio Sep 10, 2018
40180af
Create UndoRedoHelper
LinXueyuanStdio Sep 10, 2018
204f441
Remove movement method for AREditText
chinalwb Sep 10, 2018
6e5032c
Merge pull request #42 from LinXueyuanStdio/master
chinalwb Sep 10, 2018
bce3434
Move undo/redo helper to helper package
chinalwb Sep 10, 2018
c69c9f1
Change sample project use project
chinalwb Sep 20, 2018
989671d
Added fontsize
chinalwb Sep 30, 2018
89ef11a
Resolve conflict
chinalwb Sep 30, 2018
c59f99c
Resolve 51: theme color change #51
chinalwb Nov 23, 2018
bbe1633
Update README.md
chinalwb Nov 23, 2018
64f99f1
Update README.md
chinalwb Nov 23, 2018
efe693d
Update README.md
chinalwb Nov 29, 2018
45340e0
For 0.1.3
chinalwb Nov 29, 2018
93789af
Update README.md
chinalwb Nov 29, 2018
600025e
Update README.md
chinalwb Nov 29, 2018
d01427b
Fixed issue #49
chinalwb Dec 12, 2018
dd6d27b
Fixed cursor color
chinalwb Dec 12, 2018
343fafa
Merge branch 'master' of https://github.com/chinalwb/are
chinalwb Dec 12, 2018
39b0290
include all local changes
chinalwb Dec 14, 2018
a2414f4
release 0.1.4
chinalwb Dec 14, 2018
094fc69
Update README.md
chinalwb Dec 14, 2018
07fc166
Merge branch 'master' of https://github.com/chinalwb/are
chinalwb Dec 14, 2018
705ddfe
upload image
chinalwb Dec 17, 2018
aba83d3
Update README.md
chinalwb Dec 17, 2018
d092728
Update README.md
chinalwb Dec 17, 2018
63ca81e
added doc for image upload insert
chinalwb Dec 17, 2018
9c92a17
Use VideoStrategy in ARE_ToolItem_Video
chinalwb Apr 16, 2019
dfbf8b2
Added commented out code for Cut/Copy & Paste
chinalwb Apr 27, 2019
7299a7d
for are font color
chinalwb May 21, 2019
7388ec5
Finish font color
chinalwb May 22, 2019
f5d93cf
Wire up the span color and color picker window check statusw
chinalwb May 23, 2019
ba2d71d
Added background color
chinalwb May 23, 2019
ab45652
for release
chinalwb May 23, 2019
23375ac
sync up to server needs to build an apk
chinalwb May 23, 2019
7d411de
Update README.md
chinalwb May 23, 2019
8a28b77
Update README.md
chinalwb May 24, 2019
21c9794
update to glide 4.9.0
chinalwb Jul 8, 2019
2d83b49
Merge branch 'master' of https://github.com/chinalwb/Android-Rich-tex…
chinalwb Jul 8, 2019
fa0e639
for 0.1.7
chinalwb Jul 8, 2019
877e962
Update README.md
chinalwb Jul 8, 2019
fa9dfea
Update README.md
chinalwb Jul 8, 2019
8dc6d2d
Enable multiple ARE instances in one page
chinalwb Sep 8, 2019
2121edf
Update README.md
chinalwb Sep 8, 2019
7ce7515
Update AREditor.java
lfork May 4, 2020
2e7c644
Merge pull request #113 from lfork/master
chinalwb May 9, 2020
4f30da0
Formatted code
chinalwb May 9, 2020
0babcd1
Released 0.1.9
chinalwb May 9, 2020
542d365
Added a sample for changing the toolbar item icon
chinalwb Jun 15, 2020
b018973
Merge branch 'master' of https://github.com/chinalwb/Android-Rich-tex…
chinalwb Jun 15, 2020
1925e0a
A demo for customizing existing style icon
chinalwb Jun 21, 2020
a0da9b3
A demo for YouTube
chinalwb Jun 21, 2020
05f6957
Update README.md
chinalwb Jul 19, 2020
61b29dd
Update README.md
chinalwb Jul 19, 2020
7e77b83
Fixed the issue that the AreTextView ClickStrategy doesn't work
chinalwb Jul 29, 2020
ed7cab6
Merge remote-tracking branch 'origin/master'
chinalwb Jul 29, 2020
4fb0f8f
Update README.md
chinalwb Jul 29, 2020
58398c6
Update README.md
chinalwb Jul 30, 2020
1a9f7c1
Update README.md
chinalwb Jul 30, 2020
bc80621
Update README.md
chinalwb Jul 30, 2020
fac2314
Syntax issues (proposals)
kant Aug 18, 2020
dc64ff7
Merge pull request #119 from kant/patch-1
chinalwb Aug 19, 2020
c97d1c3
1. support library update -> AndroidX
TejNote Aug 20, 2020
ddcf471
Merge pull request #120 from TejNote/master
chinalwb Aug 23, 2020
248a82a
Minor update
chinalwb Aug 23, 2020
d756ad7
Update README.md
chinalwb Aug 23, 2020
4ce712e
remove .idea
chinalwb Aug 23, 2020
c676982
Merge branch 'master' of https://github.com/chinalwb/Android-Rich-tex…
chinalwb Aug 23, 2020
7fe161e
Removed .idea
chinalwb Aug 23, 2020
974ea32
Remove local.properties
starshipcoder Oct 1, 2020
8172fb4
Fix crash when casting class extending activity
starshipcoder Oct 1, 2020
4b6eb2f
Text Color icon change with the selected color
starshipcoder Oct 1, 2020
2349c16
Add possibility to specifie to FontColor a ColorPickerView declared i…
starshipcoder Oct 1, 2020
20cc2a4
Starting api 27, TYPE_TEXT_FLAG_NO_SUGGESTIONS not working, add TYPE_…
starshipcoder Oct 2, 2020
d18ce4b
Merge pull request #121 from starshipcoder/local_properties
chinalwb Oct 18, 2020
b2f604c
Merge pull request #122 from starshipcoder/fix_crash_cast_activity
chinalwb Oct 18, 2020
8a8c4e9
Merge pull request #123 from starshipcoder/colorpicker_in_xml
chinalwb Oct 18, 2020
48a29f9
Merge pull request #124 from starshipcoder/text_color_item
chinalwb Oct 18, 2020
b3cc651
Merge pull request #126 from starshipcoder/fix_suggestion
chinalwb Oct 18, 2020
d7de08d
Rollback PR 126
chinalwb Oct 18, 2020
6afaa44
Allow setting background color for ColorPickerWindow
chinalwb Dec 18, 2020
050e7cd
Update README.md
chinalwb Dec 18, 2020
0a16471
Update README.md
chinalwb Dec 18, 2020
469a557
Update README.md
chinalwb Dec 18, 2020
242318b
Update README.md
chinalwb Oct 27, 2021
2548094
Update README.md
chinalwb Mar 9, 2023
5108854
ISSUE: wrong numbering for nested Ordered list.
vishalx4 Oct 12, 2023
cd1c63d
Merge pull request #164 from vishalx4/vishalKK
chinalwb Oct 13, 2023
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
Binary file modified .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ARE/gen/com/chinalwb/are/R.java
ARE/bin/res/crunch/drawable-hdpi/image.png
ARE/bin/res/crunch/drawable-hdpi/ic_launcher.png
ARE/bin/*
ARE/local.properties
*.keystore
*/**/.DS_Store
ARE/.gradle
Expand Down
57 changes: 57 additions & 0 deletions ARE/android-release-aar.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// ./gradlew clean build generateRelease
apply plugin: 'maven'

def groupId = project.PUBLISH_GROUP_ID
def artifactId = project.PUBLISH_ARTIFACT_ID
def version = project.PUBLISH_VERSION

def localReleaseDest = "${buildDir}/release/${version}"

task androidJavadocs(type: Javadoc) {
failOnError = false
source = android.sourceSets.main.java.srcDirs
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
classpath += files(ext.androidJar)
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
classifier = 'javadoc'
from androidJavadocs.destinationDir
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.srcDirs
}

uploadArchives {
repositories.mavenDeployer {
pom.groupId = groupId
pom.artifactId = artifactId
pom.version = version
// Add other pom properties here if you want (developer details / licenses)
repository(url: "file://${localReleaseDest}")
}
}

task zipRelease(type: Zip) {
from localReleaseDest
destinationDir buildDir
archiveName "release-${version}.zip"
}

task generateRelease {
doLast {
println "Release ${version} can be found at ${localReleaseDest}/"
println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
}
}

generateRelease.dependsOn(uploadArchives)
generateRelease.dependsOn(zipRelease)


artifacts {
archives androidSourcesJar
archives androidJavadocsJar
}
13 changes: 8 additions & 5 deletions ARE/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 27
compileSdkVersion 29
defaultConfig {
applicationId "com.chinalwb.are.demo"
minSdkVersion 15
targetSdkVersion 27
targetSdkVersion 29
}

buildTypes {
Expand All @@ -17,8 +19,9 @@ android {
}

dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:design:27.1.0'
compile 'com.android.support:appcompat-v7:27.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.2.0'
implementation project(':are')
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
Binary file added ARE/app/release/app-release.apk
Binary file not shown.
39 changes: 22 additions & 17 deletions ARE/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.chinalwb.are.demo"
android:versionCode="1"
android:versionName="1.0">

<uses-sdk
android:minSdkVersion="15"
android:targetSdkVersion="21" />
package="com.chinalwb.are.demo">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />

<!-- android:windowSoftInputMode="stateVisible|adjustResize" -->
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
android:theme="@style/AppTheme">
<activity
android:name=".ARE_MultiInstanceActivity"
android:windowSoftInputMode="adjustResize"></activity>
<activity
android:name=".IndexActivity"
android:label="@string/app_name">
Expand All @@ -36,19 +32,28 @@
<activity android:name=".TextViewActivity" />
<activity
android:name=".ARE_FullBottomActivity"
android:label="@string/title_activity_are__full_bottom" />
android:label="@string/title_activity_are__full_bottom"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ARE_FullTopActivity"
android:label="@string/title_activity_are__full_top" />
android:label="@string/title_activity_are__full_top"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ARE_MinBottomActivity"
android:label="@string/title_activity_are__min_bottom" />
<activity android:name=".ARE_MinTopActivity"
android:label="@string/title_activity_are__min_top" />
<activity android:name=".ARE_MinHideActivity"
android:label="@string/title_activity_are__min_hide" />
<activity android:name=".ARE_DefaultToolbarActivity"
android:label="@string/title_activity_are__default_toolbar" />
android:label="@string/title_activity_are__min_bottom"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ARE_MinTopActivity"
android:label="@string/title_activity_are__min_top"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ARE_MinHideActivity"
android:label="@string/title_activity_are__min_hide"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ARE_DefaultToolbarActivity"
android:label="@string/title_activity_are__default_toolbar"
android:windowSoftInputMode="adjustResize" />
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
package com.chinalwb.are.demo;

import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.net.Uri;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.ImageView;

import com.chinalwb.are.AREditText;
import com.chinalwb.are.demo.helpers.DemoImageStrategy;
import com.chinalwb.are.demo.toolitems.ARE_ToolItem_MyBold;
import com.chinalwb.are.demo.toolitems.ARE_ToolItem_Youtube;
import com.chinalwb.are.strategies.ImageStrategy;
import com.chinalwb.are.strategies.VideoStrategy;
import com.chinalwb.are.styles.toolbar.ARE_ToolbarDefault;
import com.chinalwb.are.styles.toolbar.IARE_Toolbar;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_AlignmentCenter;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_AlignmentLeft;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_AlignmentRight;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_At;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_Bold;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_BackgroundColor;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_FontColor;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_FontSize;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_Hr;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_Image;
import com.chinalwb.are.styles.toolitems.ARE_ToolItem_Italic;
Expand All @@ -41,6 +49,30 @@ public class ARE_DefaultToolbarActivity extends AppCompatActivity {

private boolean scrollerAtEnd;

private ImageStrategy imageStrategy = new DemoImageStrategy();

private VideoStrategy mVideoStrategy = new VideoStrategy() {
@Override
public String uploadVideo(Uri uri) {
try {
Thread.sleep(3000); // Do upload here
} catch (Exception e) {
e.printStackTrace();
}
return "http://www.xx.com/x.mp4";
}

@Override
public String uploadVideo(String videoPath) {
try {
Thread.sleep(3000);
} catch (Exception e) {
e.printStackTrace();
}
return "http://www.xx.com/x.mp4";
}
};

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -52,10 +84,14 @@ protected void onCreate(Bundle savedInstanceState) {

private void initToolbar() {
mToolbar = this.findViewById(R.id.areToolbar);
IARE_ToolItem bold = new ARE_ToolItem_Bold();
IARE_ToolItem bold = new ARE_ToolItem_MyBold();
IARE_ToolItem youtube = new ARE_ToolItem_Youtube();
IARE_ToolItem italic = new ARE_ToolItem_Italic();
IARE_ToolItem underline = new ARE_ToolItem_Underline();
IARE_ToolItem strikethrough = new ARE_ToolItem_Strikethrough();
IARE_ToolItem fontSize = new ARE_ToolItem_FontSize();
IARE_ToolItem fontColor = new ARE_ToolItem_FontColor();
IARE_ToolItem backgroundColor = new ARE_ToolItem_BackgroundColor();
IARE_ToolItem quote = new ARE_ToolItem_Quote();
IARE_ToolItem listNumber = new ARE_ToolItem_ListNumber();
IARE_ToolItem listBullet = new ARE_ToolItem_ListBullet();
Expand All @@ -69,10 +105,15 @@ private void initToolbar() {
IARE_ToolItem image = new ARE_ToolItem_Image();
IARE_ToolItem video = new ARE_ToolItem_Video();
IARE_ToolItem at = new ARE_ToolItem_At();

mToolbar.addToolbarItem(bold);
mToolbar.addToolbarItem(youtube);
mToolbar.addToolbarItem(italic);
mToolbar.addToolbarItem(underline);
mToolbar.addToolbarItem(strikethrough);
mToolbar.addToolbarItem(fontSize);
mToolbar.addToolbarItem(fontColor);
mToolbar.addToolbarItem(backgroundColor);
mToolbar.addToolbarItem(quote);
mToolbar.addToolbarItem(listNumber);
mToolbar.addToolbarItem(listBullet);
Expand All @@ -89,10 +130,30 @@ private void initToolbar() {

mEditText = this.findViewById(R.id.arEditText);
mEditText.setToolbar(mToolbar);
mEditText.setImageStrategy(imageStrategy);
mEditText.setVideoStrategy(mVideoStrategy);


setHtml();

initToolbarArrow();
}

private void setHtml() {
String html = "<p style=\"text-align: center;\"><strong>New Feature in 0.1.4</strong></p>\n" +
"<p style=\"text-align: center;\">&nbsp;</p>\n" +
"<p style=\"text-align: left;\"><span style=\"color: #3366ff;\">In this release, you have a new usage with ARE.</span></p>\n" +
"<p style=\"text-align: left;\">&nbsp;</p>\n" +
"<p style=\"text-align: left;\"><span style=\"color: #3366ff;\">AREditText + ARE_Toolbar, you are now able to control the position of the input area and where to put the toolbar at and, what ToolItems you'd like to have in the toolbar. </span></p>\n" +
"<p style=\"text-align: left;\">&nbsp;</p>\n" +
"<p style=\"text-align: left;\"><span style=\"color: #3366ff;\">You can not only define the Toolbar (and it's style), you can also add your own ARE_ToolItem with your style into ARE.</span></p>\n" +
"<p style=\"text-align: left;\">&nbsp;</p>\n" +
"<p style=\"text-align: left;\"><span style=\"color: #3366ff;\">Fixed app color override bug; edit mode click picture won't open keyboard.</span></p>\n" +
"<p style=\"text-align: left;\">&nbsp;</p>\n" +
"<p style=\"text-align: left;\"><span style=\"color: #ff00ff;\"><em><strong>Why not give it a try now?</strong></em></span></p>";
mEditText.fromHtml(html);
}

private void initToolbarArrow() {
final ImageView imageView = this.findViewById(R.id.arrow);
if (this.mToolbar instanceof ARE_ToolbarDefault) {
Expand Down Expand Up @@ -156,6 +217,7 @@ public boolean onOptionsItemSelected(MenuItem item) {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
mToolbar.onActivityResult(requestCode, resultCode, data);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;

import com.chinalwb.are.AREditor;
import com.chinalwb.are.strategies.VideoStrategy;
Expand Down Expand Up @@ -62,6 +58,7 @@ private void initView() {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
this.arEditor.onActivityResult(requestCode, resultCode, data);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -56,6 +56,7 @@ private void initView() {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
this.arEditor.onActivityResult(requestCode, resultCode, data);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -55,6 +55,7 @@ private void initView() {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
this.arEditor.onActivityResult(requestCode, resultCode, data);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -72,6 +72,7 @@ public void onClick(View v) {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
this.arEditor.onActivityResult(requestCode, resultCode, data);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -55,6 +55,7 @@ private void initView() {

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
this.arEditor.onActivityResult(requestCode, resultCode, data);
}

Expand Down
Loading