From e48a43edd5644d84b1340f740acd7ecc209d5f5e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 13 Feb 2018 18:59:00 -0500 Subject: [PATCH] Tap image to view fullscreen --- build.gradle | 1 + qksms/build.gradle | 1 + qksms/src/main/AndroidManifest.xml | 1 + qksms/src/main/java/common/di/AppComponent.kt | 6 +- .../common/util/extensions/RxExtensions.kt | 5 ++ .../java/data/repository/MessageRepository.kt | 12 ++-- .../java/presentation/common/Navigator.kt | 9 +++ .../common/widget/MmsPreviewView.kt | 14 +++++ .../feature/gallery/GalleryActivity.kt | 52 ++++++++++++++++ .../feature/gallery/GalleryState.kt | 24 ++++++++ .../feature/gallery/GalleryView.kt | 28 +++++++++ .../feature/gallery/GalleryViewModel.kt | 60 +++++++++++++++++++ .../src/main/res/layout/gallery_activity.xml | 47 +++++++++++++++ qksms/src/main/res/values/colors.xml | 1 + 14 files changed, 256 insertions(+), 5 deletions(-) create mode 100644 qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt create mode 100644 qksms/src/main/java/presentation/feature/gallery/GalleryState.kt create mode 100644 qksms/src/main/java/presentation/feature/gallery/GalleryView.kt create mode 100644 qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt create mode 100644 qksms/src/main/res/layout/gallery_activity.xml diff --git a/build.gradle b/build.gradle index f7bc8a48..13671802 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + maven { url "https://jitpack.io" } maven { url 'https://maven.google.com' } mavenCentral() } diff --git a/qksms/build.gradle b/qksms/build.gradle index 4157ce82..3cbfe857 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -56,6 +56,7 @@ dependencies { compile 'com.android.support.constraint:constraint-layout:1.1.0-beta4' compile 'com.android.support:design:27.0.2' compile 'com.bugsnag:bugsnag-android:4.1.1' + compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3' compile 'com.github.bumptech.glide:glide:4.3.0' compile 'com.google.android:flexbox:0.3.1' diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index ab8f3d07..19f22a70 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -62,6 +62,7 @@ + diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt index d8b9bd67..27172e13 100644 --- a/qksms/src/main/java/common/di/AppComponent.kt +++ b/qksms/src/main/java/common/di/AppComponent.kt @@ -22,10 +22,11 @@ import common.QKApplication import common.util.ContactImageLoader import dagger.Component import presentation.common.widget.* -import presentation.receiver.NightModeReceiver import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel import presentation.feature.compose.DetailedChipView +import presentation.feature.gallery.GalleryActivity +import presentation.feature.gallery.GalleryViewModel import presentation.feature.main.MainActivity import presentation.feature.main.MainViewModel import presentation.feature.plus.PlusActivity @@ -48,6 +49,7 @@ interface AppComponent { fun inject(activity: MainActivity) fun inject(activity: SetupActivity) fun inject(activity: ComposeActivity) + fun inject(activity: GalleryActivity) fun inject(activity: PlusActivity) fun inject(activity: SettingsActivity) fun inject(activity: ThemePickerActivity) @@ -66,6 +68,7 @@ interface AppComponent { fun inject(view: AvatarView) fun inject(view: DetailedChipView) + fun inject(view: MmsPreviewView) fun inject(view: PagerTitleView) fun inject(view: PreferenceView) fun inject(view: QkEditText) @@ -76,6 +79,7 @@ interface AppComponent { fun inject(viewModel: MainViewModel) fun inject(viewModel: SetupViewModel) fun inject(viewModel: ComposeViewModel) + fun inject(viewModel: GalleryViewModel) fun inject(viewModel: PlusViewModel) fun inject(viewModel: SettingsViewModel) fun inject(viewModel: ThemePickerViewModel) diff --git a/qksms/src/main/java/common/util/extensions/RxExtensions.kt b/qksms/src/main/java/common/util/extensions/RxExtensions.kt index 04bd6697..b787ffa4 100644 --- a/qksms/src/main/java/common/util/extensions/RxExtensions.kt +++ b/qksms/src/main/java/common/util/extensions/RxExtensions.kt @@ -28,4 +28,9 @@ fun Flowable.mapNotNull(mapper: (T) -> R?): Flowable .filter { optional -> optional.notNull() } .map { optional -> optional.value } +fun Observable.mapNotNull(mapper: (T) -> R?): Observable + = map { input -> Optional(mapper(input)) } + .filter { optional -> optional.notNull() } + .map { optional -> optional.value } + fun Observable.toFlowable(): Flowable = this.toFlowable(io.reactivex.BackpressureStrategy.BUFFER) \ No newline at end of file diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index c51466ac..6dedf354 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -36,10 +36,7 @@ import common.util.Preferences import common.util.extensions.* import data.mapper.CursorToConversation import data.mapper.CursorToRecipient -import data.model.Contact -import data.model.Conversation -import data.model.InboxItem -import data.model.Message +import data.model.* import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.android.schedulers.AndroidSchedulers @@ -157,6 +154,13 @@ class MessageRepository @Inject constructor( .findFirst() } + fun getPart(id: Long): MmsPart? { + return Realm.getDefaultInstance() + .where(MmsPart::class.java) + .equalTo("id", id) + .findFirst() + } + /** * Retrieves the list of messages which should be shown in the notification * for a given conversation diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index fd67aba3..dc032cc3 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -31,6 +31,8 @@ import android.provider.Telephony import common.util.NotificationManager import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel +import presentation.feature.gallery.GalleryActivity +import presentation.feature.gallery.GalleryViewModel import presentation.feature.main.MainViewModel import presentation.feature.plus.PlusActivity import presentation.feature.plus.PlusViewModel @@ -89,6 +91,12 @@ class Navigator @Inject constructor(val context: Context) { startActivity(intent) } + fun showImage(partId: Long) { + val intent = Intent(context, GalleryActivity::class.java) + intent.putExtra("partId", partId) + startActivity(intent) + } + fun showSettings() { val intent = Intent(context, SettingsActivity::class.java) startActivity(intent) @@ -134,6 +142,7 @@ class Navigator @Inject constructor(val context: Context) { PlusViewModel::class.java -> PlusViewModel() SetupViewModel::class.java -> SetupViewModel() ComposeViewModel::class.java -> ComposeViewModel(intent) + GalleryViewModel::class.java -> GalleryViewModel(intent) SettingsViewModel::class.java -> SettingsViewModel() ThemePickerViewModel::class.java -> ThemePickerViewModel() else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt") diff --git a/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt b/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt index 4860140a..63784c90 100644 --- a/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt +++ b/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt @@ -22,14 +22,21 @@ import android.content.Context import android.util.AttributeSet import android.view.View import android.widget.LinearLayout +import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R +import common.di.appComponent import common.util.GlideApp +import common.util.extensions.mapNotNull import common.util.extensions.setVisible import data.model.MmsPart import kotlinx.android.synthetic.main.mms_preview_view.view.* +import presentation.common.Navigator +import javax.inject.Inject class MmsPreviewView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) { + @Inject lateinit var navigator: Navigator + var parts: List = ArrayList() set(value) { field = value @@ -37,7 +44,14 @@ class MmsPreviewView @JvmOverloads constructor(context: Context, attrs: Attribut } init { + appComponent.inject(this) View.inflate(context, R.layout.mms_preview_view, this) + + image.clicks() + .mapNotNull { parts.firstOrNull { it.image != null } } + .map { part -> part.id } + .doOnNext { partId -> navigator.showImage(partId) } + .subscribe() } private fun updateView() { diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt new file mode 100644 index 00000000..1511450a --- /dev/null +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt @@ -0,0 +1,52 @@ +/* + * 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 presentation.feature.gallery + +import android.os.Bundle +import com.jakewharton.rxbinding2.view.clicks +import com.moez.QKSMS.R +import common.di.appComponent +import common.util.GlideApp +import common.util.extensions.setVisible +import kotlinx.android.synthetic.main.gallery_activity.* +import presentation.common.base.QkActivity + +class GalleryActivity : QkActivity(), GalleryView { + + override val viewModelClass = GalleryViewModel::class + override val screenTouchedIntent by lazy { image.clicks() } + + override fun onCreate(savedInstanceState: Bundle?) { + appComponent.inject(this) + super.onCreate(savedInstanceState) + setContentView(R.layout.gallery_activity) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + title = "" + viewModel.bindView(this) + } + + override fun render(state: GalleryState) { + navigation.setVisible(state.navigationVisible) + + if (image.drawable == null) { + GlideApp.with(this).load(state.imagePath).into(image) + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt new file mode 100644 index 00000000..63677ac8 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt @@ -0,0 +1,24 @@ +/* + * 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 presentation.feature.gallery + +data class GalleryState( + val navigationVisible: Boolean = true, + val imagePath: String = "" +) \ 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 new file mode 100644 index 00000000..37851f05 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryView.kt @@ -0,0 +1,28 @@ +/* + * 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 presentation.feature.gallery + +import io.reactivex.Observable +import presentation.common.base.QkView + +interface GalleryView : QkView { + + val screenTouchedIntent: 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 new file mode 100644 index 00000000..a193a6f0 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt @@ -0,0 +1,60 @@ +/* + * 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 presentation.feature.gallery + +import android.content.Intent +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.kotlin.autoDisposable +import common.di.appComponent +import common.util.extensions.mapNotNull +import data.repository.MessageRepository +import io.reactivex.Flowable +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.withLatestFrom +import presentation.common.base.QkViewModel +import javax.inject.Inject + +class GalleryViewModel(intent: Intent) : QkViewModel(GalleryState()) { + + @Inject lateinit var messageRepo: MessageRepository + + init { + appComponent.inject(this) + + disposables += Flowable.just(intent) + .map { it.getLongExtra("partId", 0L) } + .filter { partId -> partId != 0L } + .mapNotNull { partId -> messageRepo.getPart(partId) } + .mapNotNull { part -> part.image } + .doOnNext { path -> newState { it.copy(imagePath = path) } } + .subscribe() + } + + override fun bindView(view: GalleryView) { + super.bindView(view) + + // When the screen is touched, toggle the visibility of the navigation UI + view.screenTouchedIntent + .withLatestFrom(state, { _, state -> state.navigationVisible }) + .map { navigationVisible -> !navigationVisible } + .autoDisposable(view.scope()) + .subscribe { navigationVisible -> newState { it.copy(navigationVisible = navigationVisible) } } + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/layout/gallery_activity.xml b/qksms/src/main/res/layout/gallery_activity.xml new file mode 100644 index 00000000..0a6b9813 --- /dev/null +++ b/qksms/src/main/res/layout/gallery_activity.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index b9e9cb1a..51554890 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -19,6 +19,7 @@ --> #FFFFFF + #000000 #F7F7F7 #1a1e22