From 33320451932ea90b43c7ba8bdf55d30d7c02be6b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 12 Mar 2018 18:41:38 -0700 Subject: [PATCH] (currently hidden) option to save image to gallery --- qksms/src/main/java/interactor/SaveImage.kt | 42 +++++++++++++++++++ .../feature/gallery/GalleryActivity.kt | 15 +++++++ .../feature/gallery/GalleryView.kt | 1 + .../feature/gallery/GalleryViewModel.kt | 21 ++++++++-- qksms/src/main/res/menu/gallery.xml | 27 ++++++++++++ qksms/src/main/res/values/strings.xml | 3 ++ 6 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 qksms/src/main/java/interactor/SaveImage.kt create mode 100644 qksms/src/main/res/menu/gallery.xml diff --git a/qksms/src/main/java/interactor/SaveImage.kt b/qksms/src/main/java/interactor/SaveImage.kt new file mode 100644 index 00000000..21184bd5 --- /dev/null +++ b/qksms/src/main/java/interactor/SaveImage.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package interactor + +import android.content.Context +import android.provider.MediaStore +import androidx.net.toUri +import data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class SaveImage @Inject constructor( + private val context: Context, + private val messageRepo: MessageRepository +) : Interactor() { + + override fun buildObservable(params: Long): Flowable<*> { + return Flowable.just(params) + .map { partId -> messageRepo.getPart(partId) } + .map { part -> part.image } + .map { uriString -> uriString.toUri() } + .map { uri -> MediaStore.Images.Media.getBitmap(context.contentResolver, uri) } + .doOnNext { bitmap -> MediaStore.Images.Media.insertImage(context.contentResolver, bitmap, "title", "description") } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt index b45efcd0..cea213b6 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt @@ -22,10 +22,14 @@ import android.os.Bundle import android.transition.ChangeBounds import android.transition.ChangeImageTransform import android.transition.TransitionSet +import android.view.Menu +import android.view.MenuItem import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import common.util.GlideApp import common.util.extensions.setVisible +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.gallery_activity.* import presentation.common.GlideCompletionListener import presentation.common.base.QkActivity @@ -34,6 +38,7 @@ class GalleryActivity : QkActivity(), GalleryView { override val viewModelClass = GalleryViewModel::class override val screenTouchedIntent by lazy { image.clicks() } + override val optionsItemSelectedIntent: Subject = PublishSubject.create() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -89,4 +94,14 @@ class GalleryActivity : QkActivity(), GalleryView { } } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + menuInflater.inflate(R.menu.gallery, menu) + return super.onCreateOptionsMenu(menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + optionsItemSelectedIntent.onNext(item.itemId) + return true + } + } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryView.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryView.kt index 37851f05..c88535f8 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryView.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryView.kt @@ -24,5 +24,6 @@ import presentation.common.base.QkView interface GalleryView : QkView { val screenTouchedIntent: Observable + val optionsItemSelectedIntent: Observable } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt index 4507572a..3c508b76 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt @@ -18,12 +18,16 @@ */ package presentation.feature.gallery +import android.content.Context import android.content.Intent +import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent +import common.util.extensions.makeToast import common.util.extensions.mapNotNull import data.repository.MessageRepository +import interactor.SaveImage import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom @@ -32,15 +36,17 @@ import javax.inject.Inject class GalleryViewModel(intent: Intent) : QkViewModel(GalleryState()) { + @Inject lateinit var context: Context @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var saveImage: SaveImage + + private val partIdFlowable = Flowable.just(intent) + .map { it.getLongExtra("partId", 0L) } + .filter { partId -> partId != 0L } init { appComponent.inject(this) - val partIdFlowable = Flowable.just(intent) - .map { it.getLongExtra("partId", 0L) } - .filter { partId -> partId != 0L } - disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getPart(partId) } .mapNotNull { part -> part.image } @@ -61,6 +67,13 @@ class GalleryViewModel(intent: Intent) : QkViewModel( .map { navigationVisible -> !navigationVisible } .autoDisposable(view.scope()) .subscribe { navigationVisible -> newState { it.copy(navigationVisible = navigationVisible) } } + + // Save image to device + view.optionsItemSelectedIntent + .filter { itemId -> itemId == R.id.save } + .withLatestFrom(partIdFlowable.toObservable(), { _, partId -> partId }) + .autoDisposable(view.scope()) + .subscribe { partId -> saveImage.execute(partId) { context.makeToast(R.string.gallery_toast_saved) } } } } \ No newline at end of file diff --git a/qksms/src/main/res/menu/gallery.xml b/qksms/src/main/res/menu/gallery.xml new file mode 100644 index 00000000..b55b4594 --- /dev/null +++ b/qksms/src/main/res/menu/gallery.xml @@ -0,0 +1,27 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 8e9f5424..c076c544 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ Archive conversation Remove from archive Delete + Save image Optimizing database, this might take a minute… @@ -74,6 +75,8 @@ Unblock Delete conversation + Saved image + Default SMS app QKSMS is your default SMS app Set QKSMS as your default SMS app