Skip to content

Commit f625b8e

Browse files
authored
Merge pull request #11 from Mindinventory/develop
Transaction issue solved
2 parents ab68174 + 5e970a5 commit f625b8e

File tree

6 files changed

+49
-5
lines changed

6 files changed

+49
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
3838
```groovy
3939
dependencies {
4040
...
41-
implementation 'com.github.Mindinventory:Lassi:0.0.9'
41+
implementation 'com.github.Mindinventory:Lassi:0.1.0'
4242
}
4343
```
4444
@@ -99,6 +99,7 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
9999
* [Glide](https://github.com/bumptech/glide)
100100
* [CameraView](https://github.com/natario1/CameraView)
101101
* [Android-Image-Cropper](https://github.com/ArthurHub/Android-Image-Cropper)
102+
* [Bridge] (https://github.com/livefront/bridge)
102103
103104
### ProGaurd rules
104105

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ buildscript {
55
repositories {
66
google()
77
jcenter()
8+
maven { url "https://jitpack.io" }
89
}
910
dependencies {
1011
classpath 'com.android.tools.build:gradle:3.4.1'
@@ -19,6 +20,7 @@ allprojects {
1920
repositories {
2021
google()
2122
jcenter()
23+
maven { url "https://jitpack.io" }
2224
}
2325
}
2426

lassi/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
defaultConfig {
1313
minSdkVersion 17
1414
targetSdkVersion 29
15-
versionCode 9
16-
versionName "0.0.9"
15+
versionCode 10
16+
versionName "0.1.0"
1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
vectorDrawables.useSupportLibrary = true
1919
}
@@ -45,6 +45,7 @@ dependencies {
4545
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
4646
implementation "androidx.recyclerview:recyclerview:1.0.0"
4747
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
48+
implementation 'com.github.livefront:bridge:v1.2.0'
4849
testImplementation 'junit:junit:4.12'
4950

5051
// Rx
@@ -57,9 +58,7 @@ dependencies {
5758
// glide
5859
implementation 'com.github.bumptech.glide:glide:4.9.0'
5960
kapt 'com.github.bumptech.glide:compiler:4.9.0'
60-
6161
implementation 'androidx.exifinterface:exifinterface:1.0.0'
62-
6362
}
6463
repositories {
6564
mavenCentral()

lassi/src/main/java/com/lassi/presentation/common/LassiBaseActivity.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.lassi.presentation.common
33
import android.os.Bundle
44
import androidx.annotation.CallSuper
55
import androidx.appcompat.app.AppCompatActivity
6+
import com.livefront.bridge.Bridge
67
import io.reactivex.disposables.CompositeDisposable
78
import io.reactivex.disposables.Disposable
89

@@ -19,6 +20,7 @@ abstract class LassiBaseActivity : AppCompatActivity() {
1920
getBundle()
2021
setContentView(getContentResource())
2122
initViews()
23+
Bridge.restoreInstanceState(this, savedInstanceState)
2224
}
2325

2426
@CallSuper
@@ -30,4 +32,15 @@ abstract class LassiBaseActivity : AppCompatActivity() {
3032
fun hasExtra(key: String): Boolean {
3133
return intent.hasExtra(key)
3234
}
35+
36+
override fun onSaveInstanceState(outState: Bundle) {
37+
super.onSaveInstanceState(outState)
38+
Bridge.saveInstanceState(this, outState)
39+
outState.clear()
40+
}
41+
42+
override fun onDestroy() {
43+
super.onDestroy()
44+
Bridge.clear(this)
45+
}
3346
}

lassi/src/main/java/com/lassi/presentation/common/LassiBaseFragment.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.view.View
66
import android.view.ViewGroup
77
import androidx.annotation.CallSuper
88
import androidx.fragment.app.Fragment
9+
import com.livefront.bridge.Bridge
910
import io.reactivex.disposables.CompositeDisposable
1011
import io.reactivex.disposables.Disposable
1112

@@ -37,4 +38,20 @@ abstract class LassiBaseFragment : Fragment() {
3738

3839
protected fun Disposable.collect() = compositeDisposable.add(this)
3940

41+
override fun onCreate(savedInstanceState: Bundle?) {
42+
super.onCreate(savedInstanceState)
43+
Bridge.restoreInstanceState(this, savedInstanceState)
44+
savedInstanceState?.clear()
45+
}
46+
47+
override fun onSaveInstanceState(outState: Bundle) {
48+
super.onSaveInstanceState(outState)
49+
Bridge.saveInstanceState(this, outState)
50+
outState.clear()
51+
}
52+
53+
override fun onDestroy() {
54+
super.onDestroy()
55+
Bridge.clear(this)
56+
}
4057
}

lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.content.Intent
55
import android.graphics.drawable.ColorDrawable
66
import android.net.Uri
77
import android.os.Build
8+
import android.os.Bundle
89
import android.view.Menu
910
import android.view.MenuItem
1011
import android.view.WindowManager
@@ -26,6 +27,10 @@ import com.lassi.presentation.cropper.CropImage
2627
import com.lassi.presentation.docs.DocsFragment
2728
import com.lassi.presentation.media.SelectedMediaViewModel
2829
import com.lassi.presentation.videopreview.VideoPreviewActivity
30+
import com.livefront.bridge.Bridge
31+
import com.livefront.bridge.SavedStateHandler
32+
import io.reactivex.annotations.NonNull
33+
import io.reactivex.annotations.Nullable
2934
import kotlinx.android.synthetic.main.activity_media_picker.*
3035
import java.io.File
3136

@@ -52,6 +57,13 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
5257

5358
override fun initViews() {
5459
super.initViews()
60+
Bridge.initialize(applicationContext, object : SavedStateHandler {
61+
override fun saveInstanceState(@NonNull target: Any, @NonNull state: Bundle) {
62+
}
63+
64+
override fun restoreInstanceState(@NonNull target: Any, @Nullable state: Bundle?) {
65+
}
66+
})
5567
setToolbarTitle(LassiConfig.getConfig().selectedMedias)
5668
setSupportActionBar(toolbar)
5769
supportActionBar?.setDisplayHomeAsUpEnabled(true)

0 commit comments

Comments
 (0)