Skip to content

chore: convert SharedDecksDownloadFragment to ViewBinding #20079

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

Open
david-allison wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −52
Open

chore: convert SharedDecksDownloadFragment to ViewBinding #20079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 29 additions & 44 deletions AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ import android.os.Handler
import android.os.Looper
import android.view.View
import android.webkit.CookieManager
import android.widget.Button
import android.widget.ProgressBar
import android.widget.TextView
import androidx.activity.OnBackPressedCallback
import androidx.annotation.VisibleForTesting
import androidx.appcompat.app.AlertDialog
Expand All @@ -40,12 +37,14 @@ import androidx.core.net.toUri
import androidx.fragment.app.Fragment
import com.ichi2.anki.CollectionManager.TR
import com.ichi2.anki.SharedDecksActivity.Companion.DOWNLOAD_FILE
import com.ichi2.anki.databinding.FragmentSharedDecksDownloadBinding
import com.ichi2.anki.snackbar.showSnackbar
import com.ichi2.anki.utils.openUrl
import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
import com.ichi2.compat.CompatHelper.Companion.registerReceiverCompat
import com.ichi2.utils.ImportUtils
import com.ichi2.utils.create
import dev.androidbroadcast.vbpd.viewBinding
import timber.log.Timber
import java.io.File
import java.net.URLConnection
Expand All @@ -59,21 +58,15 @@ import kotlin.math.abs
* simultaneously is not supported.
*/
class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_download) {
private val binding by viewBinding(FragmentSharedDecksDownloadBinding::bind)

private var downloadId: Long = 0

private var fileName: String? = null

private var handler: Handler = Handler(Looper.getMainLooper())
private var isProgressCheckerRunning = false

private lateinit var cancelButton: Button
private lateinit var tryAgainButton: Button
private lateinit var importDeckButton: Button
private lateinit var downloadPercentageText: TextView
private lateinit var downloadProgressBar: ProgressBar
private lateinit var checkNetworkInfoText: TextView
private lateinit var openInBrowserButton: Button

/**
* Android's DownloadManager - Used here to manage the functionality of downloading decks, one
* at a time. Responsible for enqueuing a download and generating the corresponding download ID,
Expand Down Expand Up @@ -149,43 +142,35 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
) {
super.onViewCreated(view, savedInstanceState)

downloadPercentageText = view.findViewById(R.id.download_percentage)
downloadProgressBar = view.findViewById(R.id.download_progress)
cancelButton = view.findViewById(R.id.cancel_shared_decks_download)
importDeckButton = view.findViewById(R.id.import_shared_deck_button)
tryAgainButton = view.findViewById(R.id.try_again_deck_download)
checkNetworkInfoText = view.findViewById(R.id.check_network_info_text)
openInBrowserButton = view.findViewById(R.id.download_shared_deck_from_browser)

val fileToBeDownloaded = arguments?.getSerializableCompat<DownloadFile>(DOWNLOAD_FILE)!!
downloadManager = (activity as SharedDecksActivity).downloadManager

downloadFile(fileToBeDownloaded)

cancelButton.setOnClickListener {
binding.cancelDownloadButton.setOnClickListener {
Timber.i("Cancel download button clicked")
showCancelConfirmationDialog()
}

importDeckButton.setOnClickListener {
binding.importSharedDeckButton.setOnClickListener {
Timber.i("Import deck button clicked")
openDownloadedDeck(context)
}

openInBrowserButton.setOnClickListener {
binding.openInWebBrowserButton.setOnClickListener {
Timber.i("'Open in Browser' clicked")
downloadManager.remove(downloadId)
openUrl(requireContext().getDeckPageUri(fileToBeDownloaded.url).toUri())
parentFragmentManager.popBackStack()
}

tryAgainButton.setOnClickListener {
binding.tryDownloadAgainButton.setOnClickListener {
Timber.i("Try again button clicked, retry downloading of deck")
downloadManager.remove(downloadId)
downloadFile(fileToBeDownloaded)
cancelButton.visibility = View.VISIBLE
tryAgainButton.visibility = View.GONE
openInBrowserButton.visibility = View.GONE
binding.cancelDownloadButton.visibility = View.VISIBLE
binding.tryDownloadAgainButton.visibility = View.GONE
binding.openInWebBrowserButton.visibility = View.GONE
}
}

Expand Down Expand Up @@ -226,7 +211,7 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
onBackPressedCallback.isEnabled = isDownloadInProgress
Timber.d("Download ID -> $downloadId")
Timber.d("File name -> $fileName")
view?.findViewById<TextView>(R.id.downloading_title)?.text = getString(R.string.downloading_file, fileName)
binding.downloadingTitle.text = getString(R.string.downloading_file, fileName)
startDownloadProgressChecker()
}

Expand Down Expand Up @@ -338,12 +323,12 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down

if (isVisible) {
// Setting these since progress checker can stop before progress is updated to represent 100%
downloadPercentageText.text = getString(R.string.percentage, DOWNLOAD_COMPLETED_PROGRESS_PERCENTAGE)
downloadProgressBar.progress = DOWNLOAD_COMPLETED_PROGRESS_PERCENTAGE.toInt()
binding.downloadPercentageText.text = getString(R.string.percentage, DOWNLOAD_COMPLETED_PROGRESS_PERCENTAGE)
binding.downloadProgressBar.progress = DOWNLOAD_COMPLETED_PROGRESS_PERCENTAGE.toInt()

// Remove cancel button and show import deck button
cancelButton.visibility = View.GONE
importDeckButton.visibility = View.VISIBLE
binding.cancelDownloadButton.visibility = View.GONE
binding.importSharedDeckButton.visibility = View.VISIBLE
}

Timber.i("Opening downloaded deck for import")
Expand Down Expand Up @@ -411,8 +396,8 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
Timber.d("Starting download progress checker")
downloadProgressChecker.run()
isProgressCheckerRunning = true
downloadPercentageText.text = getString(R.string.percentage, DOWNLOAD_STARTED_PROGRESS_PERCENTAGE)
downloadProgressBar.progress = DOWNLOAD_STARTED_PROGRESS_PERCENTAGE.toInt()
binding.downloadPercentageText.text = getString(R.string.percentage, DOWNLOAD_STARTED_PROGRESS_PERCENTAGE)
binding.downloadProgressBar.progress = DOWNLOAD_STARTED_PROGRESS_PERCENTAGE.toInt()
}

/**
Expand All @@ -436,8 +421,8 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
downloadManager.query(query)
} catch (_: IllegalArgumentException) {
// 19812: column local_filename is not allowed in queries
downloadPercentageText.text = TR.syncDownloadingFromAnkiweb()
downloadProgressBar.progress = 0
binding.downloadPercentageText.text = TR.syncDownloadingFromAnkiweb()
binding.downloadProgressBar.progress = 0
return
}

Expand All @@ -461,8 +446,8 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
// Show download progress percentage up to 1 decimal place.
"%.1f".format(downloadProgress)
}
downloadPercentageText.text = getString(R.string.percentage, percentageValue)
downloadProgressBar.progress = downloadProgress.toInt()
binding.downloadPercentageText.text = getString(R.string.percentage, percentageValue)
binding.downloadProgressBar.progress = downloadProgress.toInt()

val columnIndexForStatus = it.getColumnIndex(DownloadManager.COLUMN_STATUS)
val columnIndexForReason = it.getColumnIndex(DownloadManager.COLUMN_REASON)
Expand All @@ -481,9 +466,9 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
if (it.getInt(columnIndexForStatus) == DownloadManager.STATUS_PAUSED &&
it.getInt(columnIndexForReason) == DownloadManager.PAUSED_WAITING_FOR_NETWORK
) {
checkNetworkInfoText.visibility = View.VISIBLE
binding.checkNetworkInfoText.visibility = View.VISIBLE
} else {
checkNetworkInfoText.visibility = View.GONE
binding.checkNetworkInfoText.visibility = View.GONE
}
}
}
Expand Down Expand Up @@ -537,11 +522,11 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
Timber.i("Download failed, update UI and provide option to retry")
context?.let { showThemedToast(it, R.string.something_wrong, false) }
// Update UI if download could not be successful
tryAgainButton.visibility = View.VISIBLE
openInBrowserButton.visibility = View.VISIBLE
cancelButton.visibility = View.GONE
downloadPercentageText.text = getString(R.string.download_failed)
downloadProgressBar.progress = DOWNLOAD_STARTED_PROGRESS_PERCENTAGE.toInt()
binding.tryDownloadAgainButton.visibility = View.VISIBLE
binding.openInWebBrowserButton.visibility = View.VISIBLE
binding.cancelDownloadButton.visibility = View.GONE
binding.downloadPercentageText.text = getString(R.string.download_failed)
binding.downloadProgressBar.progress = DOWNLOAD_STARTED_PROGRESS_PERCENTAGE.toInt()
}
}

Expand Down
16 changes: 8 additions & 8 deletions AnkiDroid/src/main/res/layout/fragment_shared_decks_download.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
app:layout_constraintTop_toBottomOf="@id/downloading_title" />

<com.ichi2.ui.FixedTextView
android:id="@+id/download_percentage"
android:id="@+id/download_percentage_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
Expand All @@ -48,7 +48,7 @@
tools:text="100 %" />

<ProgressBar
android:id="@+id/download_progress"
android:id="@+id/download_progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -57,7 +57,7 @@
android:scaleY="4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/download_percentage"
app:layout_constraintTop_toBottomOf="@id/download_percentage_text"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" />

<com.ichi2.ui.FixedTextView
Expand All @@ -73,11 +73,11 @@
android:gravity="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/download_progress"
app:layout_constraintTop_toBottomOf="@id/download_progress_bar"
android:visibility="gone" />

<android.widget.Button
android:id="@+id/download_shared_deck_from_browser"
android:id="@+id/open_in_web_browser_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/open_in_browser"
Expand All @@ -89,11 +89,11 @@
android:layout_marginEnd="24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/try_again_deck_download"
app:layout_constraintBottom_toTopOf="@id/try_download_again_button"
android:visibility="gone" />

<android.widget.Button
android:id="@+id/cancel_shared_decks_download"
android:id="@+id/cancel_download_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/cancel_download"
Expand All @@ -108,7 +108,7 @@
app:layout_constraintEnd_toEndOf="parent" />

<android.widget.Button
android:id="@+id/try_again_deck_download"
android:id="@+id/try_download_again_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/try_again"
Expand Down