Skip to content

Commit d04c83a

Browse files
Okuro3499dogi
Okuro3499
and
dogi
authored
resources: smoother unified viewing (fixes #13540) (#13541)
Co-authored-by: dogi <dogi@users.noreply.github.com>
1 parent 707c547 commit d04c83a

24 files changed

Lines changed: 849 additions & 1205 deletions

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId "org.ole.planet.myplanet"
1313
minSdk = 26
1414
targetSdk = 36
15-
versionCode = 5578
16-
versionName = "0.55.78"
15+
versionCode = 5579
16+
versionName = "0.55.79"
1717
ndkVersion = '26.3.11579264'
1818
vectorDrawables.useSupportLibrary = true
1919
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@
8585
<activity
8686
android:name=".ui.resources.AddResourceActivity"
8787
android:theme="@style/AppTheme" />
88-
<activity android:name=".ui.viewer.AudioPlayerActivity"
89-
android:configChanges="orientation|screenSize" />
9088
<activity
9189
android:name=".ui.feedback.FeedbackDetailActivity"
9290
android:theme="@style/AppTheme" />
@@ -96,19 +94,9 @@
9694
android:label="@string/title_activity_dashboard"
9795
android:windowSoftInputMode="adjustResize"
9896
android:theme="@style/FullscreenTheme" />
99-
<activity android:name=".ui.viewer.PDFReaderActivity"
100-
android:configChanges="orientation|screenSize" />
10197
<activity android:name=".ui.viewer.WebViewActivity"
10298
android:configChanges="orientation|screenSize" />
103-
<activity android:name=".ui.viewer.VideoViewerActivity"
104-
android:configChanges="orientation|screenSize" />
105-
<activity android:name=".ui.viewer.ImageViewerActivity"
106-
android:configChanges="orientation|screenSize" />
107-
<activity android:name=".ui.viewer.TextFileViewerActivity"
108-
android:configChanges="orientation|screenSize" />
109-
<activity android:name=".ui.viewer.MarkdownViewerActivity"
110-
android:configChanges="orientation|screenSize" />
111-
<activity android:name=".ui.viewer.CSVViewerActivity"
99+
<activity android:name=".ui.viewer.ResourceViewerActivity"
112100
android:configChanges="orientation|screenSize" />
113101
<activity
114102
android:name=".ui.dictionary.DictionaryActivity"

‎app/src/main/java/org/ole/planet/myplanet/ui/personals/PersonalsAdapter.kt‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.ole.planet.myplanet.ui.personals
33
import android.content.Context
44
import android.content.Intent
55
import android.net.Uri
6-
import android.os.Bundle
76
import android.view.LayoutInflater
87
import android.view.ViewGroup
98
import androidx.recyclerview.widget.ListAdapter
@@ -13,9 +12,8 @@ import org.ole.planet.myplanet.callback.OnPersonalSelectedListener
1312
import org.ole.planet.myplanet.databinding.RowMyPersonalBinding
1413
import org.ole.planet.myplanet.model.RealmMyPersonal
1514
import org.ole.planet.myplanet.ui.personals.PersonalsAdapter.PersonalsViewHolder
16-
import org.ole.planet.myplanet.ui.viewer.ImageViewerActivity
17-
import org.ole.planet.myplanet.ui.viewer.PDFReaderActivity
18-
import org.ole.planet.myplanet.ui.viewer.VideoViewerActivity
15+
import org.ole.planet.myplanet.ui.viewer.ResourceViewerActivity
16+
import org.ole.planet.myplanet.ui.viewer.ResourceViewerFragment
1917
import org.ole.planet.myplanet.utils.DiffUtils
2018
import org.ole.planet.myplanet.utils.IntentUtils.openAudioFile
2119
import org.ole.planet.myplanet.utils.TimeUtils.getFormattedDate
@@ -68,30 +66,25 @@ class PersonalsAdapter(private val context: Context) : ListAdapter<RealmMyPerson
6866
val arr = path?.split("\\.".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
6967
when (arr?.get(arr.size - 1)) {
7068
"pdf" -> context.startActivity(
71-
Intent(context, PDFReaderActivity::class.java).putExtra("TOUCHED_FILE", path)
69+
Intent(context, ResourceViewerActivity::class.java)
70+
.putExtra("TOUCHED_FILE", path)
71+
.putExtra("resourceType", ResourceViewerFragment.ResourceType.PDF.name)
72+
)
73+
"bmp", "gif", "jpg", "png", "webp" -> context.startActivity(
74+
Intent(context, ResourceViewerActivity::class.java)
75+
.putExtra("TOUCHED_FILE", path)
76+
.putExtra("isFullPath", true)
77+
.putExtra("resourceType", ResourceViewerFragment.ResourceType.IMAGE.name)
7278
)
73-
74-
"bmp", "gif", "jpg", "png", "webp" -> {
75-
val ii = Intent(context, ImageViewerActivity::class.java).putExtra("TOUCHED_FILE", path)
76-
ii.putExtra("isFullPath", true)
77-
context.startActivity(ii)
78-
}
79-
8079
"aac", "mp3" -> openAudioFile(context, path)
81-
"mp4" -> openVideo(path)
80+
"mp4" -> context.startActivity(
81+
Intent(context, ResourceViewerActivity::class.java)
82+
.putExtra("TOUCHED_FILE", Uri.fromFile(path?.let { File(it) }).toString())
83+
.putExtra("resourceType", ResourceViewerFragment.ResourceType.VIDEO.name)
84+
)
8285
}
8386
}
8487

85-
private fun openVideo(path: String?) {
86-
val b = Bundle()
87-
b.putString("videoURL", "" + Uri.fromFile(path?.let { File(it) }))
88-
b.putString("Auth", "" + Uri.fromFile(path?.let { File(it) }))
89-
b.putString("videoType", "offline")
90-
val i = Intent(context, VideoViewerActivity::class.java).putExtra("TOUCHED_FILE", path)
91-
i.putExtras(b)
92-
context.startActivity(i)
93-
}
94-
9588
class PersonalsViewHolder(val binding: RowMyPersonalBinding) : RecyclerView.ViewHolder(binding.root)
9689

9790
companion object {

‎app/src/main/java/org/ole/planet/myplanet/ui/user/AchievementFragment.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ import org.ole.planet.myplanet.services.sync.RealtimeSyncManager
3939
import org.ole.planet.myplanet.services.sync.ServerUrlMapper
4040
import org.ole.planet.myplanet.services.sync.SyncManager
4141
import org.ole.planet.myplanet.ui.references.ReferencesAdapter
42-
import org.ole.planet.myplanet.ui.viewer.PDFReaderActivity
42+
import org.ole.planet.myplanet.ui.viewer.ResourceViewerActivity
43+
import org.ole.planet.myplanet.ui.viewer.ResourceViewerFragment
4344
import org.ole.planet.myplanet.utils.DialogUtils
4445
import org.ole.planet.myplanet.utils.DispatcherProvider
4546
import org.ole.planet.myplanet.utils.FileUtils
@@ -327,8 +328,9 @@ class AchievementFragment : BaseContainerFragment() {
327328
}
328329
binding.cvCard.visibility = View.VISIBLE
329330
binding.btnViewCv.setOnClickListener {
330-
val intent = Intent(requireContext(), PDFReaderActivity::class.java)
331+
val intent = Intent(requireContext(), ResourceViewerActivity::class.java)
331332
intent.putExtra("TOUCHED_FILE", "cv/$cvFilename")
333+
intent.putExtra("resourceType", ResourceViewerFragment.ResourceType.PDF.name)
332334
startActivity(intent)
333335
}
334336
}

‎app/src/main/java/org/ole/planet/myplanet/ui/user/EditAchievementFragment.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ import org.ole.planet.myplanet.model.RealmMyLibrary
4646
import org.ole.planet.myplanet.model.RealmUser
4747
import org.ole.planet.myplanet.ui.components.CheckboxAdapter
4848
import org.ole.planet.myplanet.ui.components.FragmentNavigator
49-
import org.ole.planet.myplanet.ui.viewer.PDFReaderActivity
49+
import org.ole.planet.myplanet.ui.viewer.ResourceViewerActivity
50+
import org.ole.planet.myplanet.ui.viewer.ResourceViewerFragment
5051
import org.ole.planet.myplanet.utils.DialogUtils.getDialog
5152
import org.ole.planet.myplanet.utils.FileUtils
5253
import org.ole.planet.myplanet.utils.TimeUtils.getFormattedDate
@@ -215,8 +216,9 @@ class EditAchievementFragment : BaseContainerFragment(), DatePickerDialog.OnDate
215216
val filename = pendingCvFilename ?: achievement?.resumeFileName ?: return@setOnClickListener
216217
val cvFile = File(FileUtils.getOlePath(requireContext()) + "cv/$filename")
217218
if (cvFile.exists()) {
218-
val intent = android.content.Intent(requireContext(), PDFReaderActivity::class.java)
219+
val intent = android.content.Intent(requireContext(), ResourceViewerActivity::class.java)
219220
intent.putExtra("TOUCHED_FILE", "cv/$filename")
221+
intent.putExtra("resourceType", ResourceViewerFragment.ResourceType.PDF.name)
220222
startActivity(intent)
221223
} else {
222224
Utilities.toast(activity, getString(R.string.file_not_found, filename))

‎app/src/main/java/org/ole/planet/myplanet/ui/viewer/AudioPlayerActivity.kt‎

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

Comments
 (0)