diff --git a/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt
index a6d6c39e..fe7b81d2 100644
--- a/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt
@@ -13,7 +13,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import ani.dantotsu.R
import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
-import ani.dantotsu.databinding.FragmentAnimeExtensionsBinding
+import ani.dantotsu.databinding.FragmentExtensionsBinding
import ani.dantotsu.settings.paging.AnimeExtensionAdapter
import ani.dantotsu.settings.paging.AnimeExtensionsViewModel
import ani.dantotsu.settings.paging.AnimeExtensionsViewModelFactory
@@ -30,7 +30,7 @@ import uy.kohesive.injekt.api.get
class AnimeExtensionsFragment : Fragment(),
SearchQueryHandler, OnAnimeInstallClickListener {
- private var _binding: FragmentAnimeExtensionsBinding? = null
+ private var _binding: FragmentExtensionsBinding? = null
private val binding get() = _binding!!
private val viewModel: AnimeExtensionsViewModel by viewModels {
@@ -48,12 +48,12 @@ class AnimeExtensionsFragment : Fragment(),
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- _binding = FragmentAnimeExtensionsBinding.inflate(inflater, container, false)
+ _binding = FragmentExtensionsBinding.inflate(inflater, container, false)
- binding.allAnimeExtensionsRecyclerView.isNestedScrollingEnabled = false
- binding.allAnimeExtensionsRecyclerView.adapter = adapter
- binding.allAnimeExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
- (binding.allAnimeExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled =
+ binding.allExtensionsRecyclerView.isNestedScrollingEnabled = false
+ binding.allExtensionsRecyclerView.adapter = adapter
+ binding.allExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
+ (binding.allExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled =
true
lifecycleScope.launch {
@@ -91,8 +91,8 @@ class AnimeExtensionsFragment : Fragment(),
Notifications.CHANNEL_DOWNLOADER_PROGRESS
)
.setSmallIcon(R.drawable.ic_round_sync_24)
- .setContentTitle("Installing extension")
- .setContentText("Step: $installStep")
+ .setContentTitle(getString(R.string.installing_extension))
+ .setContentText(getString(R.string.install_step, installStep))
.setPriority(NotificationCompat.PRIORITY_LOW)
notificationManager.notify(1, builder.build())
},
@@ -103,11 +103,11 @@ class AnimeExtensionsFragment : Fragment(),
Notifications.CHANNEL_DOWNLOADER_ERROR
)
.setSmallIcon(R.drawable.ic_round_info_24)
- .setContentTitle("Installation failed: ${error.message}")
- .setContentText("Error: ${error.message}")
+ .setContentTitle(getString(R.string.installation_failed, error.message))
+ .setContentText(getString(R.string.error_message, error.message))
.setPriority(NotificationCompat.PRIORITY_HIGH)
notificationManager.notify(1, builder.build())
- snackString("Installation failed: ${error.message}")
+ snackString(getString(R.string.installation_failed, error.message))
},
{
val builder = NotificationCompat.Builder(
@@ -115,12 +115,12 @@ class AnimeExtensionsFragment : Fragment(),
Notifications.CHANNEL_DOWNLOADER_PROGRESS
)
.setSmallIcon(R.drawable.ic_download_24)
- .setContentTitle("Installation complete")
- .setContentText("The extension has been successfully installed.")
+ .setContentTitle(getString(R.string.installation_complete))
+ .setContentText(getString(R.string.extension_has_been_installed))
.setPriority(NotificationCompat.PRIORITY_LOW)
notificationManager.notify(1, builder.build())
viewModel.invalidatePager()
- snackString("Extension installed")
+ snackString(getString(R.string.extension_installed))
}
)
}
diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
index e25fb822..3f1a3c49 100644
--- a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager2.widget.ViewPager2
import ani.dantotsu.R
import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
-import ani.dantotsu.databinding.FragmentAnimeExtensionsBinding
+import ani.dantotsu.databinding.FragmentExtensionsBinding
import ani.dantotsu.others.LanguageMapper
import ani.dantotsu.parsers.AnimeSources
import ani.dantotsu.settings.extensionprefs.AnimeSourcePreferencesFragment
@@ -49,7 +49,7 @@ import java.util.Locale
class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
- private var _binding: FragmentAnimeExtensionsBinding? = null
+ private var _binding: FragmentExtensionsBinding? = null
private val binding get() = _binding!!
private lateinit var extensionsRecyclerView: RecyclerView
private val skipIcons: Boolean = PrefManager.getVal(PrefName.SkipExtensionIcons)
@@ -183,9 +183,9 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- _binding = FragmentAnimeExtensionsBinding.inflate(inflater, container, false)
+ _binding = FragmentExtensionsBinding.inflate(inflater, container, false)
- extensionsRecyclerView = binding.allAnimeExtensionsRecyclerView
+ extensionsRecyclerView = binding.allExtensionsRecyclerView
extensionsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
extensionsRecyclerView.adapter = extensionsAdapter
diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
index 24780ef5..90bfa771 100644
--- a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
@@ -26,7 +26,7 @@ import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager2.widget.ViewPager2
import ani.dantotsu.R
import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
-import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
+import ani.dantotsu.databinding.FragmentExtensionsBinding
import ani.dantotsu.others.LanguageMapper
import ani.dantotsu.parsers.MangaSources
import ani.dantotsu.settings.extensionprefs.MangaSourcePreferencesFragment
@@ -48,7 +48,7 @@ import java.util.Collections
import java.util.Locale
class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
- private var _binding: FragmentMangaExtensionsBinding? = null
+ private var _binding: FragmentExtensionsBinding? = null
private val binding get() = _binding!!
private lateinit var extensionsRecyclerView: RecyclerView
private val skipIcons: Boolean = PrefManager.getVal(PrefName.SkipExtensionIcons)
@@ -181,9 +181,9 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- _binding = FragmentMangaExtensionsBinding.inflate(inflater, container, false)
+ _binding = FragmentExtensionsBinding.inflate(inflater, container, false)
- extensionsRecyclerView = binding.allMangaExtensionsRecyclerView
+ extensionsRecyclerView = binding.allExtensionsRecyclerView
extensionsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
extensionsRecyclerView.adapter = extensionsAdapter
diff --git a/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt
index 6f7276ad..c5118096 100644
--- a/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt
@@ -13,7 +13,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import ani.dantotsu.R
import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
-import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
+import ani.dantotsu.databinding.FragmentExtensionsBinding
import ani.dantotsu.settings.paging.MangaExtensionAdapter
import ani.dantotsu.settings.paging.MangaExtensionsViewModel
import ani.dantotsu.settings.paging.MangaExtensionsViewModelFactory
@@ -30,7 +30,7 @@ import uy.kohesive.injekt.api.get
class MangaExtensionsFragment : Fragment(),
SearchQueryHandler, OnMangaInstallClickListener {
- private var _binding: FragmentMangaExtensionsBinding? = null
+ private var _binding: FragmentExtensionsBinding? = null
private val binding get() = _binding!!
private val viewModel: MangaExtensionsViewModel by viewModels {
@@ -49,12 +49,12 @@ class MangaExtensionsFragment : Fragment(),
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- _binding = FragmentMangaExtensionsBinding.inflate(inflater, container, false)
+ _binding = FragmentExtensionsBinding.inflate(inflater, container, false)
- binding.allMangaExtensionsRecyclerView.isNestedScrollingEnabled = false
- binding.allMangaExtensionsRecyclerView.adapter = adapter
- binding.allMangaExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
- (binding.allMangaExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled =
+ binding.allExtensionsRecyclerView.isNestedScrollingEnabled = false
+ binding.allExtensionsRecyclerView.adapter = adapter
+ binding.allExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
+ (binding.allExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled =
true
lifecycleScope.launch {
@@ -92,8 +92,8 @@ class MangaExtensionsFragment : Fragment(),
Notifications.CHANNEL_DOWNLOADER_PROGRESS
)
.setSmallIcon(R.drawable.ic_round_sync_24)
- .setContentTitle("Installing extension")
- .setContentText("Step: $installStep")
+ .setContentTitle(getString(R.string.installing_extension))
+ .setContentText(getString(R.string.install_step, installStep))
.setPriority(NotificationCompat.PRIORITY_LOW)
notificationManager.notify(1, builder.build())
},
@@ -104,11 +104,11 @@ class MangaExtensionsFragment : Fragment(),
Notifications.CHANNEL_DOWNLOADER_ERROR
)
.setSmallIcon(R.drawable.ic_round_info_24)
- .setContentTitle("Installation failed: ${error.message}")
- .setContentText("Error: ${error.message}")
+ .setContentTitle(getString(R.string.installation_failed, error.message))
+ .setContentText(getString(R.string.error_message, error.message))
.setPriority(NotificationCompat.PRIORITY_HIGH)
notificationManager.notify(1, builder.build())
- snackString("Installation failed: ${error.message}")
+ snackString(getString(R.string.installation_failed, error.message))
},
{
val builder = NotificationCompat.Builder(
@@ -116,12 +116,12 @@ class MangaExtensionsFragment : Fragment(),
Notifications.CHANNEL_DOWNLOADER_PROGRESS
)
.setSmallIcon(R.drawable.ic_download_24)
- .setContentTitle("Installation complete")
- .setContentText("The extension has been successfully installed.")
+ .setContentTitle(getString(R.string.installation_complete))
+ .setContentText(getString(R.string.extension_has_been_installed))
.setPriority(NotificationCompat.PRIORITY_LOW)
notificationManager.notify(1, builder.build())
viewModel.invalidatePager()
- snackString("Extension installed")
+ snackString(getString(R.string.extension_installed))
}
)
}
diff --git a/app/src/main/res/layout/fragment_anime_extensions.xml b/app/src/main/res/layout/fragment_anime_extensions.xml
deleted file mode 100644
index 2ccb2d42..00000000
--- a/app/src/main/res/layout/fragment_anime_extensions.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_manga_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
similarity index 89%
rename from app/src/main/res/layout/fragment_manga_extensions.xml
rename to app/src/main/res/layout/fragment_extensions.xml
index 99067aea..d51f19be 100644
--- a/app/src/main/res/layout/fragment_manga_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -7,7 +7,7 @@
android:paddingEnd="16dp">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ad56211..989da759 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -409,6 +409,13 @@
Crop Borders
NOTE
+ Installing extension
+ Installation failed: %1$s
+ Installation complete
+ The extension has been successfully installed.
+ Extension installed
+ Error: %1$s
+ Step: %1$s
DAMN! YOU TRULY ARE JOBLESS\nYOU REACHED THE END
Couldn\'t find any File Manager to open SD card