diff --git a/app/build.gradle b/app/build.gradle index eb978148..240a28a1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { minSdk 23 targetSdk 34 versionCode ((System.currentTimeMillis() / 60000).toInteger()) - versionName "1.0.0-beta03i-2" + versionName "2.0.0" signingConfig signingConfigs.debug } diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt index 3d4e6d8e..67304285 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt @@ -92,6 +92,7 @@ class MangaChapterAdapter( // Find the position of the chapter and notify only that item val position = arr.indexOfFirst { it.number == chapterNumber } if (position != -1) { + arr[position].progress = "" notifyItemChanged(position) } } @@ -102,6 +103,7 @@ class MangaChapterAdapter( // Find the position of the chapter and notify only that item val position = arr.indexOfFirst { it.number == chapterNumber } if (position != -1) { + arr[position].progress = "" notifyItemChanged(position) } } @@ -116,30 +118,6 @@ class MangaChapterAdapter( } } - fun downloadNextNChapters(n: Int) { - //find last viewed chapter - var lastViewedChapter = arr.indexOfFirst { MangaNameAdapter.findChapterNumber(it.number)?.toInt() == media.userProgress } - if (lastViewedChapter == -1) { - lastViewedChapter = 0 - } - //download next n chapters - for (i in 1..n) { - if (lastViewedChapter + i < arr.size) { - val chapterNumber = arr[lastViewedChapter + i].number - if (activeDownloads.contains(chapterNumber)) { - //do nothing - continue - } else if (downloadedChapters.contains(chapterNumber)) { - //do nothing - continue - } else { - fragment.onMangaChapterDownloadClick(chapterNumber) - startDownload(chapterNumber) - } - } - } - } - fun downloadNChaptersFrom(position: Int, n: Int) { //download next n chapters for (i in 0..) { + val selected = model.loadSelected(media) + selected.scanlators = list + model.saveSelected(media.id, selected, requireActivity()) + media.selected = selected + } fun loadChapters(i: Int, invalidate: Boolean) { lifecycleScope.launch(Dispatchers.IO) { model.loadMangaChapters(media, i, invalidate) } diff --git a/app/src/main/java/ani/dantotsu/others/AppUpdater.kt b/app/src/main/java/ani/dantotsu/others/AppUpdater.kt index b753e908..eea658e0 100644 --- a/app/src/main/java/ani/dantotsu/others/AppUpdater.kt +++ b/app/src/main/java/ani/dantotsu/others/AppUpdater.kt @@ -24,7 +24,6 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.decodeFromJsonElement -import rx.android.BuildConfig import java.io.File import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/ani/dantotsu/others/LanguageMapper.kt b/app/src/main/java/ani/dantotsu/others/LanguageMapper.kt index bd621cb0..25f8f6a4 100644 --- a/app/src/main/java/ani/dantotsu/others/LanguageMapper.kt +++ b/app/src/main/java/ani/dantotsu/others/LanguageMapper.kt @@ -27,6 +27,28 @@ class LanguageMapper { else -> "" } } + + enum class Language(val code: String) { + ALL("all"), + ARABIC("ar"), + GERMAN("de"), + ENGLISH("en"), + SPANISH("es"), + FRENCH("fr"), + INDONESIAN("id"), + ITALIAN("it"), + JAPANESE("ja"), + KOREAN("ko"), + POLISH("pl"), + PORTUGUESE_BRAZIL("pt-BR"), + RUSSIAN("ru"), + THAI("th"), + TURKISH("tr"), + UKRAINIAN("uk"), + VIETNAMESE("vi"), + CHINESE("zh"), + CHINESE_SIMPLIFIED("zh-Hans") + } } } diff --git a/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt b/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt index c733319f..32e3a7e7 100644 --- a/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt @@ -21,7 +21,6 @@ import ani.dantotsu.others.LangSet import ani.dantotsu.themes.ThemeManager import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator -import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension class ExtensionsActivity : AppCompatActivity() { private val restartMainActivity = object : OnBackPressedCallback(false) { @@ -120,15 +119,17 @@ class ExtensionsActivity : AppCompatActivity() { initActivity(this) - - fun bind(extension: AnimeExtension.Available) { - binding.languageselect.setOnClickListener { - val popup = PopupMenu(this, it) - - popup.inflate(R.menu.launguage_selector_menu) - popup.show() +/* TODO + binding.languageselect.setOnClickListener { + val popup = PopupMenu(this, it) + popup.inflate(R.menu.launguage_selector_menu) + popup.setOnMenuItemClickListener { menuItem -> + true } - } + popup.setOnDismissListener { + } + popup.show() + }*/ binding.settingsContainer.updateLayoutParams { topMargin = statusBarHeight bottomMargin = navBarHeight diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt index 55a45076..6d1e70df 100644 --- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt @@ -199,6 +199,7 @@ class SettingsActivity : AppCompatActivity() { passedColor = color linearLayout.setBackgroundColor(color) }) + alertDialog.show() alertDialog.window?.setDimAmount(0.8f) } @@ -338,16 +339,6 @@ class SettingsActivity : AppCompatActivity() { binding.settingsRecentlyListOnly.setOnCheckedChangeListener { _, isChecked -> saveData("recently_list_only", isChecked) } - - val dns = listOf("None", "Google", "Cloudflare", "AdGuard") - binding.settingsDns.setText(dns[loadData("settings_dns") ?: 0], false) - binding.settingsDns.setAdapter(ArrayAdapter(this, R.layout.item_dropdown, dns)) - binding.settingsDns.setOnItemClickListener { _, _, i, _ -> - saveData("settings_dns", i) - initializeNetwork(this) - binding.settingsDns.clearFocus() - } - binding.settingsPreferDub.isChecked = loadData("settings_prefer_dub") ?: false binding.settingsPreferDub.setOnCheckedChangeListener { _, isChecked -> saveData("settings_prefer_dub", isChecked) @@ -546,7 +537,9 @@ class SettingsActivity : AppCompatActivity() { cursedCounter++ (binding.settingsLogo.drawable as Animatable).start() if (cursedCounter % 7 == 0) { - snackString("youwu have been cuwsed :pwayge:") + Toast.makeText(this, "youwu have been cuwsed :pwayge:", Toast.LENGTH_LONG).show() + val url = "https://www.youtube.com/watch?v=dQw4w9WgXcQ" + openLinkInBrowser(url) getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean( "use_cursed_lang", getSharedPreferences( diff --git a/app/src/main/res/layout/activity_extensions.xml b/app/src/main/res/layout/activity_extensions.xml index 19d12fb8..85a8db87 100644 --- a/app/src/main/res/layout/activity_extensions.xml +++ b/app/src/main/res/layout/activity_extensions.xml @@ -48,8 +48,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" /> - - - - - - - - - -