Tap image to view fullscreen

This commit is contained in:
Moez Bhatti
2018-02-13 18:59:00 -05:00
parent 4409aff905
commit e48a43edd5
14 changed files with 256 additions and 5 deletions
+1
View File
@@ -16,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
maven { url 'https://maven.google.com' }
mavenCentral()
}
+1
View File
@@ -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'
+1
View File
@@ -62,6 +62,7 @@
<activity android:name="presentation.feature.setup.SetupActivity" />
<activity android:name="presentation.feature.themepicker.ThemePickerActivity" />
<activity android:name="presentation.feature.plus.PlusActivity" />
<activity android:name="presentation.feature.gallery.GalleryActivity" />
<receiver android:name="presentation.receiver.DefaultSmsChangedReceiver">
<intent-filter>
@@ -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)
@@ -28,4 +28,9 @@ fun <T, R> Flowable<T>.mapNotNull(mapper: (T) -> R?): Flowable<R>
.filter { optional -> optional.notNull() }
.map { optional -> optional.value }
fun <T, R> Observable<T>.mapNotNull(mapper: (T) -> R?): Observable<R>
= map { input -> Optional(mapper(input)) }
.filter { optional -> optional.notNull() }
.map { optional -> optional.value }
fun <T> Observable<T>.toFlowable(): Flowable<T> = this.toFlowable(io.reactivex.BackpressureStrategy.BUFFER)
@@ -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
@@ -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")
@@ -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<MmsPart> = 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() {
@@ -0,0 +1,52 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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<GalleryViewModel>(), 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)
}
}
}
@@ -0,0 +1,24 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package presentation.feature.gallery
data class GalleryState(
val navigationVisible: Boolean = true,
val imagePath: String = ""
)
@@ -0,0 +1,28 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package presentation.feature.gallery
import io.reactivex.Observable
import presentation.common.base.QkView
interface GalleryView : QkView<GalleryState> {
val screenTouchedIntent: Observable<Unit>
}
@@ -0,0 +1,60 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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<GalleryView, GalleryState>(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) } }
}
}
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ 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 <http://www.gnu.org/licenses/>.
-->
<FrameLayout android:id="@+id/root"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:background="@color/black">
<com.github.chrisbanes.photoview.PhotoView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/toolbar" />
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@drawable/ab_shadow" />
</LinearLayout>
</FrameLayout>
+1
View File
@@ -19,6 +19,7 @@
-->
<resources>
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="statusBarLight">#F7F7F7</color>
<color name="statusBarDark">#1a1e22</color>