diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 6dedf354..913f105c 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -154,6 +154,13 @@ class MessageRepository @Inject constructor( .findFirst() } + fun getMessageForPart(id: Long): Message? { + return Realm.getDefaultInstance() + .where(Message::class.java) + .equalTo("parts.id", id) + .findFirst() + } + fun getPart(id: Long): MmsPart? { return Realm.getDefaultInstance() .where(MmsPart::class.java) diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt index c5589b2b..995a1c4d 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt @@ -35,13 +35,14 @@ class GalleryActivity : QkActivity(), GalleryView { super.onCreate(savedInstanceState) setContentView(R.layout.gallery_activity) supportActionBar?.setDisplayHomeAsUpEnabled(true) - title = "" viewModel.bindView(this) } override fun render(state: GalleryState) { toolbar.setVisible(state.navigationVisible) + title = state.title + if (image.drawable == null) { GlideApp.with(this).load(state.imagePath).into(image) } diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt index 63677ac8..d5a33918 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryState.kt @@ -20,5 +20,6 @@ package presentation.feature.gallery data class GalleryState( val navigationVisible: Boolean = true, + val title: String = "", val imagePath: String = "" ) \ 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 a193a6f0..e9d7c174 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt @@ -37,13 +37,19 @@ class GalleryViewModel(intent: Intent) : QkViewModel( init { appComponent.inject(this) - disposables += Flowable.just(intent) + 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 } - .doOnNext { path -> newState { it.copy(imagePath = path) } } - .subscribe() + .subscribe { path -> newState { it.copy(imagePath = path) } } + + disposables += partIdFlowable + .mapNotNull { partId -> messageRepo.getMessageForPart(partId) } + .mapNotNull { message -> messageRepo.getConversation(message.threadId) } + .subscribe { conversation -> newState { it.copy(title = conversation.getTitle()) } } } override fun bindView(view: GalleryView) {