Skip to content

Commit

Permalink
release v0.11.1.0-mi
Browse files Browse the repository at this point in the history
- merge new tachiyomi features
- padding and stuff in player overlay
- more fixed strings
- add option to open episode internally/externally independently from your
default setting
  • Loading branch information
jmir1 committed Jun 1, 2021
2 parents e388dc6 + d681bea commit ee89da8
Show file tree
Hide file tree
Showing 87 changed files with 642 additions and 2,163 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
I acknowledge that:

- I have updated:
- To the latest version of the app (stable is v0.10.12)
- To the latest version of the app (stable is v0.11.1)
- All extensions
- I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ labels: "bug"
I acknowledge that:

- I have updated:
- To the latest version of the app (stable is v0.10.12)
- To the latest version of the app (stable is v0.11.1)
- All extensions
- I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ labels: "feature"
I acknowledge that:

- I have updated:
- To the latest version of the app (stable is v0.10.12)
- To the latest version of the app (stable is v0.11.1)
- All extensions
- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


# ![app icon](./.github/readme-images/app-icon.png)Tachiyomi-MI
Tachiyomi-MI is a fork of the free and open source manga reader [Tachiyomi](https://github.com/tachiyomiorg/tachiyomi) that adds anime capabilities! For Android 5.0 and above.
Tachiyomi-MI is a fork of the free and open source manga reader [Tachiyomi](https://github.com/tachiyomiorg/tachiyomi) that adds anime capabilities! For Android 6.0 and above.

![screenshots of app](./.github/readme-images/screens.png)

Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
minSdkVersion(AndroidConfig.minSdk)
targetSdkVersion(AndroidConfig.targetSdk)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
versionCode = 61
versionName = "0.10.12.5-mi"
versionCode = 63
versionName = "0.11.1.0-mi"

buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
Expand Down
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-keep,allowoptimization class androidx.preference.** { *; }
-keep,allowoptimization class android.content.** { *; }
-keep,allowoptimization class kotlinx.coroutines.** { *; }
-keep,allowoptimization class uy.kohesive.injekt.** { *; }
-keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
-keep,allowoptimization class android.test.base.** { *; }
-keep,allowoptimization class kotlin.** { public protected *; }
-keep,allowoptimization class okhttp3.** { public protected *; }
Expand Down
15 changes: 10 additions & 5 deletions app/src/main/java/eu/kanade/tachiyomi/ui/anime/AnimeController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class AnimeController :
override fun onChangeEnded(handler: ControllerChangeHandler, type: ControllerChangeType) {
super.onChangeEnded(handler, type)
if (anime == null || source == null) {
activity?.toast(R.string.manga_not_in_db)
activity?.toast(R.string.anime_not_in_db)
router.popController(this)
}
}
Expand Down Expand Up @@ -563,7 +563,7 @@ class AnimeController :
presenter.registerTracking(track, service as TrackService)
}
} catch (e: Exception) {
Timber.w(e, "Could not match manga: ${anime.title} with service $service")
Timber.w(e, "Could not match anime: ${anime.title} with service $service")
}
}
}
Expand All @@ -576,7 +576,7 @@ class AnimeController :
private fun toggleFavorite() {
val isNowFavorite = presenter.toggleFavorite()
if (activity != null && !isNowFavorite && presenter.hasDownloads()) {
(activity as? MainActivity)?.binding?.rootCoordinator?.snack(activity!!.getString(R.string.delete_downloads_for_manga)) {
(activity as? MainActivity)?.binding?.rootCoordinator?.snack(activity!!.getString(R.string.delete_downloads_for_anime)) {
setAction(R.string.action_delete) {
presenter.deleteDownloads()
}
Expand Down Expand Up @@ -885,7 +885,7 @@ class AnimeController :
}
}

fun openEpisode(episode: Episode) {
fun openEpisode(episode: Episode, playerChangeRequested: Boolean = false) {
val activity = activity ?: return
launchIO {
val episodeList = ArrayList<Episode>()
Expand All @@ -897,7 +897,8 @@ class AnimeController :
episodeList.add(episodeItem.episode)
}
val intent = WatcherActivity.newIntent(activity, presenter.anime, episode, episodeList)
if (!preferences.alwaysUseExternalPlayer()) {
val useInternal = if (preferences.alwaysUseExternalPlayer()) playerChangeRequested else !playerChangeRequested
if (useInternal) {
startActivity(intent)
} else {
val url = EpisodeLoader.getUri(episode, anime!!, source!!)
Expand Down Expand Up @@ -1021,6 +1022,8 @@ class AnimeController :
binding.actionToolbar.findItem(R.id.action_remove_bookmark)?.isVisible = episodes.all { it.episode.bookmark }
binding.actionToolbar.findItem(R.id.action_mark_as_read)?.isVisible = episodes.any { !it.episode.seen }
binding.actionToolbar.findItem(R.id.action_mark_as_unread)?.isVisible = episodes.all { it.episode.seen }
binding.actionToolbar.findItem(R.id.action_play_externally)?.isVisible = !preferences.alwaysUseExternalPlayer()
binding.actionToolbar.findItem(R.id.action_play_internally)?.isVisible = preferences.alwaysUseExternalPlayer()

// Hide FAB to avoid interfering with the bottom action toolbar
actionFab?.isVisible = false
Expand All @@ -1043,6 +1046,8 @@ class AnimeController :
R.id.action_mark_as_read -> markAsRead(getSelectedEpisodes())
R.id.action_mark_as_unread -> markAsUnread(getSelectedEpisodes())
R.id.action_mark_previous_as_read -> markPreviousAsRead(getSelectedEpisodes())
R.id.action_play_internally -> openEpisode(getSelectedEpisodes().last().episode, true)
R.id.action_play_externally -> openEpisode(getSelectedEpisodes().last().episode, true)
else -> return false
}
return true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ class AnimeEpisodesHeaderAdapter(
inner class HeaderViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
fun bind() {
binding.episodesLabel.text = if (numEpisodes == null) {
view.context.getString(R.string.chapters)
view.context.getString(R.string.episodes)
} else {
view.context.resources.getQuantityString(R.plurals.manga_num_chapters, numEpisodes!!, numEpisodes)
view.context.resources.getQuantityString(R.plurals.anime_num_episodes, numEpisodes!!, numEpisodes)
}

val filterColor = if (hasActiveFilters) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DeleteEpisodesDialog<T>(bundle: Bundle? = null) : DialogController(bundle)

override fun onCreateDialog(savedViewState: Bundle?): Dialog {
return MaterialDialog(activity!!)
.message(R.string.confirm_delete_chapters)
.message(R.string.confirm_delete_episodes)
.positiveButton(android.R.string.ok) {
(targetController as? Listener)?.deleteEpisodes()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class EpisodeHolder(
binding.episodeTitle.text = when (anime.displayMode) {
Anime.EPISODE_DISPLAY_NUMBER -> {
val number = adapter.decimalFormat.format(episode.episode_number.toDouble())
itemView.context.getString(R.string.display_mode_chapter, number)
itemView.context.getString(R.string.display_mode_episode, number)
}
else -> episode.name
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class EpisodesSettingsSheet(
inner class DisplayGroup : Group {

private val displayTitle = Item.Radio(R.string.show_title, this)
private val displayEpisodeNum = Item.Radio(R.string.show_chapter_number, this)
private val displayEpisodeNum = Item.Radio(R.string.show_episode_number, this)

override val header = null
override val items = listOf(displayTitle, displayEpisodeNum)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@ import eu.kanade.tachiyomi.widget.DialogCheckboxView
class SetEpisodeSettingsDialog(bundle: Bundle? = null) : DialogController(bundle) {

constructor(anime: Anime) : this(
bundleOf(MANGA_KEY to anime)
bundleOf(ANIME_KEY to anime)
)

override fun onCreateDialog(savedViewState: Bundle?): Dialog {
val view = DialogCheckboxView(activity!!).apply {
setDescription(R.string.confirm_set_chapter_settings)
setOptionDescription(R.string.also_set_chapter_settings_for_library)
setOptionDescription(R.string.also_set_episode_settings_for_library)
}

return MaterialDialog(activity!!)
.title(R.string.chapter_settings)
.title(R.string.episode_settings)
.customView(
view = view,
horizontalPadding = true
)
.positiveButton(android.R.string.ok) {
EpisodeSettingsHelper.setGlobalSettings(args.getSerializable(MANGA_KEY)!! as Anime)
EpisodeSettingsHelper.setGlobalSettings(args.getSerializable(ANIME_KEY)!! as Anime)
if (view.isChecked()) {
EpisodeSettingsHelper.updateAllAnimesWithGlobalDefaults()
}

activity?.toast(activity!!.getString(R.string.chapter_settings_updated))
activity?.toast(activity!!.getString(R.string.episode_settings_updated))
}
.negativeButton(android.R.string.cancel)
}

private companion object {
const val MANGA_KEY = "anime"
const val ANIME_KEY = "anime"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.manga.info
package eu.kanade.tachiyomi.ui.anime.info

import android.content.Context
import android.util.AttributeSet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SetTrackEpisodesDialog<T> : DialogController
val item = item

val dialog = MaterialDialog(activity!!)
.title(R.string.chapters)
.title(R.string.episodes)
.customView(R.layout.track_chapters_dialog, dialogWrapContent = false)
.positiveButton(android.R.string.ok) { dialog ->
val view = dialog.getCustomView()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ open class AnimeExtensionController :
}

override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.extension_main, menu)
inflater.inflate(R.menu.browse_extensions, menu)

val searchItem = menu.findItem(R.id.action_search)
val searchView = searchItem.actionView as SearchView
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class AnimeSourceController :
createOptionsMenu(
menu,
inflater,
R.menu.source_main,
R.menu.browse_sources,
R.id.action_search,
R.string.action_global_search_hint,
false // GlobalSearch handles the searching here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ open class ExtensionController :
}

override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.extension_main, menu)
inflater.inflate(R.menu.browse_extensions, menu)

val searchItem = menu.findItem(R.id.action_search)
val searchView = searchItem.actionView as SearchView
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class MigrationSourcesController :
}

override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.source_migration, menu)
inflater.inflate(R.menu.browse_migrate, menu)
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class SourceController :
createOptionsMenu(
menu,
inflater,
R.menu.source_main,
R.menu.browse_sources,
R.id.action_search,
R.string.action_global_search_hint,
false // GlobalSearch handles the searching here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.category.CategoryController
import eu.kanade.tachiyomi.ui.download.DownloadTabsController
import eu.kanade.tachiyomi.ui.recent.HistoryTabsController
import eu.kanade.tachiyomi.ui.setting.SettingsBackupController
import eu.kanade.tachiyomi.ui.setting.SettingsController
import eu.kanade.tachiyomi.ui.setting.SettingsMainController
import eu.kanade.tachiyomi.util.preference.add
Expand Down Expand Up @@ -112,6 +113,14 @@ class MoreController :
router.pushController(CategoryController().withFadeTransaction())
}
}
preference {
titleRes = R.string.label_backup
iconRes = R.drawable.ic_settings_backup_restore_24dp
iconTint = tintColor
onClick {
router.pushController(SettingsBackupController().withFadeTransaction())
}
}
}

preferenceCategory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class SettingsMainController : SettingsController() {
onClick { navigateTo(SettingsBrowseController()) }
}
preference {
iconRes = R.drawable.ic_backup_24dp
iconRes = R.drawable.ic_settings_backup_restore_24dp
iconTint = tintColor
titleRes = R.string.label_backup
onClick { navigateTo(SettingsBackupController()) }
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_backup_24dp.xml

This file was deleted.

9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_baseline_input_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:pathData="M21,3.01H3c-1.1,0 -2,0.9 -2,2V9h2V4.99h18v14.03H3V15H1v4.01c0,1.1 0.9,1.98 2,1.98h18c1.1,0 2,-0.88 2,-1.98v-14c0,-1.11 -0.9,-2 -2,-2zM11,16l4,-4 -4,-4v3H1v2h10v3z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_baseline_open_in_new_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"/>
</vector>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/ic_share_24dp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
<path
android:fillColor="@android:color/black"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_translate_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/anime_episodes_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
style="@style/TextAppearance.Regular.SubHeading"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/chapters"
android:text="@string/episodes"
android:textIsSelectable="false"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
Loading

0 comments on commit ee89da8

Please sign in to comment.