Added Skip Recap Feature (#336)
* Added Skip Recap Feature * Reverted gradle.properties to default
This commit is contained in:
parent
a51e025c03
commit
6be589618c
5 changed files with 45 additions and 0 deletions
|
@ -1863,6 +1863,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
|
||||||
exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
|
exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (PrefManager.getVal(PrefName.AutoSkipOPED) && (new.skipType == "op" || new.skipType == "ed")
|
if (PrefManager.getVal(PrefName.AutoSkipOPED) && (new.skipType == "op" || new.skipType == "ed")
|
||||||
&& !skippedTimeStamps.contains(new)
|
&& !skippedTimeStamps.contains(new)
|
||||||
|
@ -1870,6 +1871,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
|
||||||
exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
|
exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
|
||||||
skippedTimeStamps.add(new)
|
skippedTimeStamps.add(new)
|
||||||
}
|
}
|
||||||
|
if (PrefManager.getVal(PrefName.AutoSkipRecap) && new.skipType == "recap" && !skippedTimeStamps.contains(new)) {
|
||||||
|
exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
|
||||||
|
skippedTimeStamps.add(new)
|
||||||
|
}
|
||||||
new.skipType.getType()
|
new.skipType.getType()
|
||||||
} else {
|
} else {
|
||||||
disappeared = false
|
disappeared = false
|
||||||
|
|
|
@ -24,6 +24,7 @@ import ani.dantotsu.others.getSerialized
|
||||||
import ani.dantotsu.parsers.Subtitle
|
import ani.dantotsu.parsers.Subtitle
|
||||||
import ani.dantotsu.settings.saving.PrefManager
|
import ani.dantotsu.settings.saving.PrefManager
|
||||||
import ani.dantotsu.settings.saving.PrefName
|
import ani.dantotsu.settings.saving.PrefName
|
||||||
|
import ani.dantotsu.settings.saving.internal.Pref
|
||||||
import ani.dantotsu.snackString
|
import ani.dantotsu.snackString
|
||||||
import ani.dantotsu.statusBarHeight
|
import ani.dantotsu.statusBarHeight
|
||||||
import ani.dantotsu.themes.ThemeManager
|
import ani.dantotsu.themes.ThemeManager
|
||||||
|
@ -163,6 +164,12 @@ class PlayerSettingsActivity : AppCompatActivity() {
|
||||||
PrefManager.setVal(PrefName.AutoSkipOPED, isChecked)
|
PrefManager.setVal(PrefName.AutoSkipOPED, isChecked)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
binding.playerSettingsAutoSkipRecap.isChecked = PrefManager.getVal(PrefName.AutoSkipRecap)
|
||||||
|
binding.playerSettingsAutoSkipRecap.isEnabled = binding.playerSettingsTimeStamps.isChecked
|
||||||
|
binding.playerSettingsAutoSkipRecap.setOnCheckedChangeListener { _, isChecked ->
|
||||||
|
PrefManager.setVal(PrefName.AutoSkipRecap, isChecked)
|
||||||
|
}
|
||||||
|
|
||||||
binding.playerSettingsAutoPlay.isChecked = PrefManager.getVal(PrefName.AutoPlay)
|
binding.playerSettingsAutoPlay.isChecked = PrefManager.getVal(PrefName.AutoPlay)
|
||||||
binding.playerSettingsAutoPlay.setOnCheckedChangeListener { _, isChecked ->
|
binding.playerSettingsAutoPlay.setOnCheckedChangeListener { _, isChecked ->
|
||||||
PrefManager.setVal(PrefName.AutoPlay, isChecked)
|
PrefManager.setVal(PrefName.AutoPlay, isChecked)
|
||||||
|
|
|
@ -102,6 +102,7 @@ enum class PrefName(val data: Pref) { //TODO: Split this into multiple files
|
||||||
UseProxyForTimeStamps(Pref(Location.Player, Boolean::class, false)),
|
UseProxyForTimeStamps(Pref(Location.Player, Boolean::class, false)),
|
||||||
ShowTimeStampButton(Pref(Location.Player, Boolean::class, true)),
|
ShowTimeStampButton(Pref(Location.Player, Boolean::class, true)),
|
||||||
AutoSkipOPED(Pref(Location.Player, Boolean::class, false)),
|
AutoSkipOPED(Pref(Location.Player, Boolean::class, false)),
|
||||||
|
AutoSkipRecap(Pref(Location.Player, Boolean::class, false )),
|
||||||
AutoPlay(Pref(Location.Player, Boolean::class, true)),
|
AutoPlay(Pref(Location.Player, Boolean::class, true)),
|
||||||
AutoSkipFiller(Pref(Location.Player, Boolean::class, false)),
|
AutoSkipFiller(Pref(Location.Player, Boolean::class, false)),
|
||||||
AskIndividualPlayer(Pref(Location.Player, Boolean::class, true)),
|
AskIndividualPlayer(Pref(Location.Player, Boolean::class, true)),
|
||||||
|
|
|
@ -607,6 +607,37 @@
|
||||||
android:text="@string/requires_time_stamps_to_be_enabled"
|
android:text="@string/requires_time_stamps_to_be_enabled"
|
||||||
android:textSize="14sp" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
|
<com.google.android.material.materialswitch.MaterialSwitch
|
||||||
|
android:id="@+id/playerSettingsAutoSkipRecap"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:checked="false"
|
||||||
|
android:drawableStart="@drawable/ic_round_play_disabled_24"
|
||||||
|
android:drawablePadding="16dp"
|
||||||
|
android:elegantTextHeight="true"
|
||||||
|
android:fontFamily="@font/poppins_bold"
|
||||||
|
android:minHeight="64dp"
|
||||||
|
android:paddingHorizontal="32dp"
|
||||||
|
android:text="@string/auto_skip_recap"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textColor="@color/bg_opp"
|
||||||
|
app:cornerRadius="0dp"
|
||||||
|
app:drawableTint="?attr/colorPrimary"
|
||||||
|
app:showText="false"
|
||||||
|
app:thumbTint="@color/button_switch_track" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="-8dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:alpha="0.58"
|
||||||
|
android:fontFamily="@font/poppins_family"
|
||||||
|
android:paddingHorizontal="32dp"
|
||||||
|
android:text="@string/requires_time_stamps_to_be_enabled"
|
||||||
|
android:textSize="14sp" />
|
||||||
|
|
||||||
<com.google.android.material.materialswitch.MaterialSwitch
|
<com.google.android.material.materialswitch.MaterialSwitch
|
||||||
android:id="@+id/playerSettingsAutoPlay"
|
android:id="@+id/playerSettingsAutoPlay"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
@ -889,4 +889,5 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
|
||||||
<string name="media">Media</string>
|
<string name="media">Media</string>
|
||||||
<string name="users">Users</string>
|
<string name="users">Users</string>
|
||||||
<string name="social">Social</string>
|
<string name="social">Social</string>
|
||||||
|
<string name="auto_skip_recap">Auto Skip Recap</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue