Skip to content

Commit 1a92230

Browse files
committed
2021/11/15
added new image editor
1 parent 15a9548 commit 1a92230

31 files changed

+598
-144
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 16 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

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

SmartFileBrowser/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
}
66

77
android {
8-
compileSdkVersion 29
9-
buildToolsVersion "30.0.3"
8+
compileSdkVersion 31
9+
buildToolsVersion '31.0.0'
1010

1111
defaultConfig {
1212
minSdkVersion 19
13-
targetSdkVersion 29
13+
targetSdkVersion 31
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -44,20 +44,22 @@ dependencies {
4444

4545
implementation 'androidx.appcompat:appcompat:1.3.1'
4646
implementation 'com.google.android.material:material:1.4.0'
47-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
48-
implementation 'com.github.bumptech.glide:glide:4.11.0'
47+
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
48+
implementation 'com.github.bumptech.glide:glide:4.12.0'
4949
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
5050
// implementation 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:3.0.0'
5151
implementation 'com.aurelhubert:ahbottomnavigation:2.3.4'
5252
// implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
53-
def lifecycle_version = "2.3.1"
53+
def lifecycle_version = "2.4.0"
5454
// ViewModel
5555
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
5656
// LiveData
5757
implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
5858
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
5959
implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
60-
implementation 'com.github.iamutkarshtiwari:Ananas:1.2.4'
60+
// implementation 'com.github.iamutkarshtiwari:Ananas:1.2.4'
61+
// implementation 'com.github.smartdevelopers-ir:PhotoEditor:1.0.4'
62+
implementation 'ir.smartdevelopers:photo-editor:1.0.8'
6163
}
6264
afterEvaluate{
6365
publishing {

SmartFileBrowser/src/main/AndroidManifest.xml

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,40 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="ir.smartdevelopers.smartfilebrowser">
55

6+
<uses-feature
7+
android:name="android.hardware.camera.any"
8+
android:required="false" />
69

7-
<uses-feature android:name="android.hardware.camera.any"
8-
android:required="false"/>
9-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
10+
<uses-permission
11+
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
1012
tools:ignore="ScopedStorage" />
11-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
12-
<application
13-
android:requestLegacyExternalStorage="true">
14-
<activity android:name=".acitivties.FileBrowserMainActivity"
15-
android:theme="@style/sfb_AppTheme"
16-
android:configChanges="keyboard|orientation"
17-
/>
13+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
14+
15+
<application android:requestLegacyExternalStorage="true">
1816
<activity
19-
android:name="iamutkarshtiwari.github.io.ananas.editimage.EditImageActivity"
20-
android:exported="true"
21-
android:label="@string/sfb_image_editor_label"
17+
android:name=".acitivties.PhotoEditorActivity"
18+
android:exported="false"
2219
android:theme="@style/sfb_EditorTheme"
23-
tools:replace="android:label" />
20+
/>
21+
<activity
22+
android:name=".acitivties.FileBrowserMainActivity"
23+
android:configChanges="keyboard|orientation"
24+
android:theme="@style/sfb_AppTheme" />
25+
<!-- <activity-->
26+
<!-- android:name="iamutkarshtiwari.github.io.ananas.editimage.EditImageActivity"-->
27+
<!-- android:exported="true"-->
28+
<!-- android:label="@string/sfb_image_editor_label"-->
29+
<!-- android:theme="@style/sfb_EditorTheme"-->
30+
<!-- tools:replace="android:label" />-->
31+
2432
<provider
25-
android:authorities="${applicationId}.sfb_provider"
2633
android:name=".customClasses.SmartFileProvider"
34+
android:authorities="${applicationId}.sfb_provider"
2735
android:exported="false"
2836
android:grantUriPermissions="true">
2937
<meta-data
3038
android:name="android.support.FILE_PROVIDER_PATHS"
31-
android:resource="@xml/sfb_provider_paths"/>
39+
android:resource="@xml/sfb_provider_paths" />
3240
</provider>
3341
</application>
3442

0 commit comments

Comments
 (0)