Skip to content

Fix lingering UI bugs #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2021
Merged

Fix lingering UI bugs #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
686bb67
Fix lingering UI bugs
stevenzeck Oct 1, 2021
2eac6f9
Merge branch 'develop' into bug-fixes
mickael-menu Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions test-app/src/main/java/org/readium/r2/testapp/outline/NavigationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ import android.widget.LinearLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.setFragmentResult
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.*
import org.readium.r2.shared.publication.Link
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.publication.toLocator
Expand Down Expand Up @@ -75,6 +72,12 @@ class NavigationFragment : Fragment() {
setHasFixedSize(true)
layoutManager = LinearLayoutManager(requireContext())
adapter = navAdapter
addItemDecoration(
DividerItemDecoration(
requireContext(),
LinearLayoutManager.VERTICAL
)
)
}
navAdapter.submitList(flatLinks)
}
Expand Down
3 changes: 3 additions & 0 deletions test-app/src/main/java/org/readium/r2/testapp/outline/OutlineFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.readium.r2.shared.publication.epub.pageList
import org.readium.r2.shared.publication.opds.images
import org.readium.r2.testapp.R
import org.readium.r2.testapp.databinding.FragmentOutlineBinding
import org.readium.r2.testapp.reader.ReaderActivity
import org.readium.r2.testapp.reader.ReaderViewModel

class OutlineFragment : Fragment() {
Expand All @@ -38,6 +39,8 @@ class OutlineFragment : Fragment() {
publication = it.publication
}

(activity as ReaderActivity?)?.supportActionBar?.setDisplayHomeAsUpEnabled(true)

childFragmentManager.setFragmentResultListener(
OutlineContract.REQUEST_KEY,
this,
Expand Down
21 changes: 20 additions & 1 deletion test-app/src/main/java/org/readium/r2/testapp/reader/ReaderActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package org.readium.r2.testapp.reader
import android.app.Activity
import android.os.Build
import android.os.Bundle
import android.view.MenuItem
import android.view.WindowManager
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
Expand Down Expand Up @@ -120,6 +121,9 @@ open class ReaderActivity : AppCompatActivity() {
is DrmManagementFragment -> getString(R.string.title_fragment_drm_management)
else -> null
}
if (supportFragmentManager.fragments.last() !is OutlineFragment) {
supportActionBar?.setDisplayHomeAsUpEnabled(false)
}
}

override fun getDefaultViewModelProviderFactory(): ViewModelProvider.Factory {
Expand Down Expand Up @@ -156,12 +160,27 @@ open class ReaderActivity : AppCompatActivity() {

private fun showDrmManagementFragment() {
supportFragmentManager.commit {
add(R.id.activity_container, DrmManagementFragment::class.java, Bundle(), DRM_FRAGMENT_TAG)
add(
R.id.activity_container,
DrmManagementFragment::class.java,
Bundle(),
DRM_FRAGMENT_TAG
)
hide(readerFragment)
addToBackStack(null)
}
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
android.R.id.home -> {
supportFragmentManager.popBackStack()
return true
}
}
return super.onOptionsItemSelected(item)
}

companion object {
const val READER_FRAGMENT_TAG = "reader"
const val OUTLINE_FRAGMENT_TAG = "outline"
Expand Down
5 changes: 2 additions & 3 deletions test-app/src/main/java/org/readium/r2/testapp/utils/SystemUiManagement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package org.readium.r2.testapp.utils
import android.app.Activity
import android.view.View
import android.view.WindowInsets
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.WindowInsetsCompat

// Using ViewCompat and WindowInsetsCompat does not work properly in all versions of Android
Expand Down Expand Up @@ -56,10 +55,10 @@ fun Activity.toggleSystemUi() {
/** Set padding around view so that content doesn't overlap system UI */
fun View.padSystemUi(insets: WindowInsets, activity: Activity) =
WindowInsetsCompat.toWindowInsetsCompat(insets, this)
.getInsets(WindowInsetsCompat.Type.statusBars()).apply {
.getInsets(WindowInsetsCompat.Type.systemBars()).apply {
setPadding(
left,
top + (activity as AppCompatActivity).supportActionBar!!.height,
top,
right,
bottom
)
Expand Down
1 change: 1 addition & 0 deletions test-app/src/main/res/layout/fragment_outline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:orientation="vertical">

<com.google.android.material.tabs.TabLayout
Expand Down
17 changes: 9 additions & 8 deletions test-app/src/main/res/layout/fragment_screen_reader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
android:id="@+id/tts_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:background="@color/colorAccent">

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -82,8 +83,8 @@

<ImageButton
android:id="@+id/prev_chapter"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:contentDescription="@string/previous_chapter"
Expand All @@ -93,8 +94,8 @@

<ImageButton
android:id="@+id/fast_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:contentDescription="@string/previous_sentence"
Expand All @@ -116,8 +117,8 @@

<ImageButton
android:id="@+id/fast_forward"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:contentDescription="@string/next_sentence"
Expand All @@ -127,8 +128,8 @@

<ImageButton
android:id="@+id/next_chapter"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:contentDescription="@string/next_chapter"
Expand Down