From da264a0b3c1b4f892522e2ea418dd6fe88c26cf3 Mon Sep 17 00:00:00 2001 From: Shane <6071159+smashedr@users.noreply.github.com> Date: Tue, 14 Apr 2026 12:49:50 -0700 Subject: [PATCH 1/2] Update deprecated bundleOf --- .../org/cssnr/zipline/ui/dialogs/FolderFragment.kt | 9 ++++----- .../cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt | 13 ++++++------- .../org/cssnr/zipline/ui/setup/SetupFragment.kt | 3 +-- .../org/cssnr/zipline/ui/upload/ShortFragment.kt | 5 ++--- .../org/cssnr/zipline/ui/upload/TextFragment.kt | 5 ++--- .../org/cssnr/zipline/ui/upload/UploadFragment.kt | 5 ++--- .../cssnr/zipline/ui/upload/UploadMultiFragment.kt | 5 ++--- .../java/org/cssnr/zipline/ui/user/CropFragment.kt | 3 +-- 8 files changed, 20 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/cssnr/zipline/ui/dialogs/FolderFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/dialogs/FolderFragment.kt index a072488..bf7743b 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/dialogs/FolderFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/dialogs/FolderFragment.kt @@ -4,7 +4,6 @@ import android.app.Dialog import android.content.Context import android.os.Bundle import android.util.Log -import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult import androidx.preference.PreferenceManager @@ -82,10 +81,10 @@ class FolderFragment : DialogFragment() { } dialog.setPositiveButton("Save") { _, _ -> Log.d("FolderFragment", "selectedName: $selectedName - selectedId: $selectedId") - val bundle = bundleOf( - "folderId" to selectedId, - "folderName" to selectedName, - ) + val bundle = Bundle().apply { + putString("folderId", selectedId) + putString("folderName", selectedName) + } setFragmentResult("folder_fragment_result", bundle) dismiss() } diff --git a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt index ccbc283..9604012 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt @@ -9,7 +9,6 @@ import android.widget.EditText import android.widget.SeekBar import android.widget.TextView import androidx.appcompat.app.AlertDialog -import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -103,12 +102,12 @@ class UploadOptionsDialog : DialogFragment() { fileDeletesAt.setText(normalized) } - val bundle = bundleOf( - "filePassword" to filePassword.text.toString().takeIf { it.isNotEmpty() }, - "deletesAt" to fileDeletesAt.text.toString().takeIf { it.isNotEmpty() }, - "maxViews" to fileMaxViews.text.toString().toIntOrNull(), - "compression" to imageCompressionBar.progress, - ) + val bundle = Bundle().apply { + putString("filePassword", filePassword.text.toString().takeIf { it.isNotEmpty() }) + putString("deletesAt", fileDeletesAt.text.toString().takeIf { it.isNotEmpty() }) + fileMaxViews.text.toString().toIntOrNull()?.let { putInt("maxViews", it) } + putInt("compression", imageCompressionBar.progress) + } Log.i("UploadOptionsDialog", "bundle: $bundle") setFragmentResult("upload_options_result", bundle) dismiss() diff --git a/app/src/main/java/org/cssnr/zipline/ui/setup/SetupFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/setup/SetupFragment.kt index 82e52c5..5bc70b1 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/setup/SetupFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/setup/SetupFragment.kt @@ -8,7 +8,6 @@ import android.view.ViewGroup import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.core.content.edit -import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope @@ -221,7 +220,7 @@ class SetupFragment : Fragment() { } // Arguments - val bundle = bundleOf() + val bundle = Bundle() when (v.id) { R.id.btn_continue -> { Log.i(LOG_TAG, "Continue Button Pressed. Showing First Run...") diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt index 487b96e..a872ef5 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt @@ -9,7 +9,6 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.core.net.toUri -import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import androidx.navigation.NavController @@ -107,7 +106,7 @@ class ShortFragment : Fragment() { binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true)) + navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) } binding.openButton.setOnClickListener { @@ -152,7 +151,7 @@ class ShortFragment : Fragment() { } startActivity(Intent.createChooser(shareIntent, null)) } - val bundle = bundleOf("url" to "${savedUrl}/dashboard/urls") + val bundle = Bundle().apply { putString("url", "${savedUrl}/dashboard/urls") } navController.navigate( R.id.nav_item_home, bundle, NavOptions.Builder() .setPopUpTo(navController.graph.id, true) diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt index 717a895..1596c96 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt @@ -9,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast -import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.setFragmentResultListener @@ -141,7 +140,7 @@ class TextFragment : Fragment() { // Options Button binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true)) + navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) } // Share Button @@ -228,7 +227,7 @@ class TextFragment : Fragment() { if (uploadResponse != null) { logFileUpload(true, "Text Upload") this@processUpload.copyToClipboard(uploadResponse.files.first().url) - val bundle = bundleOf("url" to uploadResponse.files.first().url) + val bundle = Bundle().apply { putString("url", uploadResponse.files.first().url) } navController.navigate( R.id.nav_item_home, bundle, NavOptions.Builder() .setPopUpTo(navController.graph.id, true) diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt index d61e67b..4d557ef 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt @@ -23,7 +23,6 @@ import androidx.annotation.OptIn import androidx.core.content.ContextCompat import androidx.core.graphics.ColorUtils import androidx.core.net.toUri -import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.setFragmentResultListener @@ -268,7 +267,7 @@ class UploadFragment : Fragment() { // Options Button binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true)) + navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) } // Share Button @@ -384,7 +383,7 @@ class UploadFragment : Fragment() { } startActivity(Intent.createChooser(shareIntent, null)) } - val bundle = bundleOf("url" to "${savedUrl}/dashboard/files/") + val bundle = Bundle().apply { putString("url", "${savedUrl}/dashboard/files/") } navController.navigate( R.id.nav_item_home, bundle, NavOptions.Builder() .setPopUpTo(navController.graph.id, true) diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt index 0196a13..21cda2b 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt @@ -13,7 +13,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast -import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.setFragmentResultListener @@ -198,7 +197,7 @@ class UploadMultiFragment : Fragment() { // Options Button binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true)) + navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) } // Folder Button @@ -319,7 +318,7 @@ class UploadMultiFragment : Fragment() { } startActivity(Intent.createChooser(shareIntent, null)) } - val bundle = bundleOf("url" to "${savedUrl}/dashboard/files") + val bundle = Bundle().apply { putString("url", "${savedUrl}/dashboard/files") } navController.navigate( R.id.nav_item_home, bundle, NavOptions.Builder() .setPopUpTo(navController.graph.id, true) diff --git a/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt index b6793c3..1dd2dde 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import androidx.core.graphics.scale import androidx.core.graphics.toColorInt import androidx.core.net.toUri -import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.setFragmentResult import androidx.navigation.fragment.findNavController @@ -100,7 +99,7 @@ class CropFragment : Fragment() { FileOutputStream(file).use { out -> val result = cropped.compress(Bitmap.CompressFormat.PNG, 100, out) Log.d(LOG_TAG, "result: $result - file.name: ${file.name}") - setFragmentResult("CropFragment", bundleOf("fileName" to file.name)) + setFragmentResult("CropFragment", Bundle().apply { putString("fileName", file.name) }) findNavController().navigateUp() } } catch (e: Throwable) { From 505950fe6cfee3ddeeb9f37c80e36de325c3281a Mon Sep 17 00:00:00 2001 From: Shane <6071159+smashedr@users.noreply.github.com> Date: Tue, 14 Apr 2026 12:51:07 -0700 Subject: [PATCH 2/2] Reformat --- .../cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt | 4 +++- .../java/org/cssnr/zipline/ui/upload/ShortFragment.kt | 4 +++- .../java/org/cssnr/zipline/ui/upload/TextFragment.kt | 11 +++++++++-- .../org/cssnr/zipline/ui/upload/UploadFragment.kt | 7 +++++-- .../cssnr/zipline/ui/upload/UploadMultiFragment.kt | 4 +++- .../java/org/cssnr/zipline/ui/user/CropFragment.kt | 4 +++- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt index 9604012..7ad1f3e 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt @@ -103,7 +103,9 @@ class UploadOptionsDialog : DialogFragment() { } val bundle = Bundle().apply { - putString("filePassword", filePassword.text.toString().takeIf { it.isNotEmpty() }) + putString( + "filePassword", + filePassword.text.toString().takeIf { it.isNotEmpty() }) putString("deletesAt", fileDeletesAt.text.toString().takeIf { it.isNotEmpty() }) fileMaxViews.text.toString().toIntOrNull()?.let { putInt("maxViews", it) } putInt("compression", imageCompressionBar.progress) diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt index a872ef5..2bc0c40 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt @@ -106,7 +106,9 @@ class ShortFragment : Fragment() { binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) + navController.navigate( + R.id.nav_item_settings, + Bundle().apply { putBoolean("hide_bottom_nav", true) }) } binding.openButton.setOnClickListener { diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt index 1596c96..ee873f2 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt @@ -140,7 +140,9 @@ class TextFragment : Fragment() { // Options Button binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) + navController.navigate( + R.id.nav_item_settings, + Bundle().apply { putBoolean("hide_bottom_nav", true) }) } // Share Button @@ -227,7 +229,12 @@ class TextFragment : Fragment() { if (uploadResponse != null) { logFileUpload(true, "Text Upload") this@processUpload.copyToClipboard(uploadResponse.files.first().url) - val bundle = Bundle().apply { putString("url", uploadResponse.files.first().url) } + val bundle = Bundle().apply { + putString( + "url", + uploadResponse.files.first().url + ) + } navController.navigate( R.id.nav_item_home, bundle, NavOptions.Builder() .setPopUpTo(navController.graph.id, true) diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt index 4d557ef..26af019 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt @@ -267,7 +267,9 @@ class UploadFragment : Fragment() { // Options Button binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) + navController.navigate( + R.id.nav_item_settings, + Bundle().apply { putBoolean("hide_bottom_nav", true) }) } // Share Button @@ -383,7 +385,8 @@ class UploadFragment : Fragment() { } startActivity(Intent.createChooser(shareIntent, null)) } - val bundle = Bundle().apply { putString("url", "${savedUrl}/dashboard/files/") } + val bundle = + Bundle().apply { putString("url", "${savedUrl}/dashboard/files/") } navController.navigate( R.id.nav_item_home, bundle, NavOptions.Builder() .setPopUpTo(navController.graph.id, true) diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt index 21cda2b..e02fc52 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt @@ -197,7 +197,9 @@ class UploadMultiFragment : Fragment() { // Options Button binding.optionsButton.setOnClickListener { Log.d("optionsButton", "setOnClickListener") - navController.navigate(R.id.nav_item_settings, Bundle().apply { putBoolean("hide_bottom_nav", true) }) + navController.navigate( + R.id.nav_item_settings, + Bundle().apply { putBoolean("hide_bottom_nav", true) }) } // Folder Button diff --git a/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt index 1dd2dde..ac3bd04 100644 --- a/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt +++ b/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt @@ -99,7 +99,9 @@ class CropFragment : Fragment() { FileOutputStream(file).use { out -> val result = cropped.compress(Bitmap.CompressFormat.PNG, 100, out) Log.d(LOG_TAG, "result: $result - file.name: ${file.name}") - setFragmentResult("CropFragment", Bundle().apply { putString("fileName", file.name) }) + setFragmentResult( + "CropFragment", + Bundle().apply { putString("fileName", file.name) }) findNavController().navigateUp() } } catch (e: Throwable) {