Lightemerald/Dantotsu
1
0
Fork 0
mirror of https://github.com/rebelonion/Dantotsu.git synced 2026-01-31 03:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean

Browse Source
This commit is contained in:
rebel onion
2025-01-06 08:22:44 -06:00
parent 31a67c8edb
commit f9f9767ecc
106 changed files with 855 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/ani/dantotsu/home/AnimeFragment.kt
View File

@@ -22,9 +22,9 @@ import androidx.recyclerview.widget.RecyclerView
import ani.dantotsu.R
import ani.dantotsu.Refresh
import ani.dantotsu.bottomBar
import ani.dantotsu.connections.anilist.AniMangaSearchResults
import ani.dantotsu.connections.anilist.Anilist
import ani.dantotsu.connections.anilist.AnilistAnimeViewModel
import ani.dantotsu.connections.anilist.AniMangaSearchResults
import ani.dantotsu.connections.anilist.getUserId
import ani.dantotsu.databinding.FragmentAnimeBinding
import ani.dantotsu.media.MediaAdaptor
@@ -277,8 +277,9 @@ class AnimeFragment : Fragment() {
running = true
scope.launch {
withContext(Dispatchers.IO) {
Anilist.userid = PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
?.toIntOrNull()
Anilist.userid =
PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
?.toIntOrNull()
if (Anilist.userid == null) {
getUserId(requireContext()) {
load()

11
app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
View File

@@ -20,7 +20,6 @@ import androidx.viewpager2.widget.ViewPager2
import ani.dantotsu.MediaPageTransformer
import ani.dantotsu.R
import ani.dantotsu.connections.anilist.Anilist
import ani.dantotsu.connections.anilist.AnilistSearch.SearchType.Companion.toAnilistString
import ani.dantotsu.databinding.ItemAnimePageBinding
import ani.dantotsu.databinding.LayoutTrendingBinding
import ani.dantotsu.getAppString
@@ -266,7 +265,15 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
}
}
fun init(adaptor: MediaAdaptor, recyclerView: RecyclerView, progress: View, title: View , more: View , string: String, media : MutableList<Media>) {
fun init(
adaptor: MediaAdaptor,
recyclerView: RecyclerView,
progress: View,
title: View,
more: View,
string: String,
media: MutableList<Media>
) {
progress.visibility = View.GONE
recyclerView.adapter = adaptor
recyclerView.layoutManager =

4
app/src/main/java/ani/dantotsu/home/HomeFragment.kt
View File

@@ -469,7 +469,9 @@ class HomeFragment : Fragment() {
scope.launch {
withContext(Dispatchers.IO) {
// Get user data first
Anilist.userid = PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)?.toIntOrNull()
Anilist.userid =
PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
?.toIntOrNull()
if (Anilist.userid == null) {
withContext(Dispatchers.Main) {
getUserId(requireContext()) {

2
app/src/main/java/ani/dantotsu/home/LoginFragment.kt
View File

@@ -102,7 +102,7 @@ class LoginFragment : Fragment() {
requireActivity().customAlertDialog().apply {
setTitle("Enter Password")
setCustomView(dialogView.root)
setPosButton(R.string.ok){
setPosButton(R.string.ok) {
val editText = dialogView.userAgentTextBox
if (editText.text?.isNotBlank() == true) {
editText.text?.toString()?.trim()?.toCharArray(password)

12
app/src/main/java/ani/dantotsu/home/MangaFragment.kt
View File

@@ -20,9 +20,9 @@ import androidx.recyclerview.widget.RecyclerView
import ani.dantotsu.R
import ani.dantotsu.Refresh
import ani.dantotsu.bottomBar
import ani.dantotsu.connections.anilist.AniMangaSearchResults
import ani.dantotsu.connections.anilist.Anilist
import ani.dantotsu.connections.anilist.AnilistMangaViewModel
import ani.dantotsu.connections.anilist.AniMangaSearchResults
import ani.dantotsu.connections.anilist.getUserId
import ani.dantotsu.databinding.FragmentMangaBinding
import ani.dantotsu.media.MediaAdaptor
@@ -169,7 +169,10 @@ class MangaFragment : Fragment() {
}
model.getPopularManga().observe(viewLifecycleOwner) {
if (it != null) {
mangaPageAdapter.updateTrendingManga(MediaAdaptor(0, it, requireActivity()), it)
mangaPageAdapter.updateTrendingManga(
MediaAdaptor(0, it, requireActivity()),
it
)
}
}
model.getPopularManhwa().observe(viewLifecycleOwner) {
@@ -262,8 +265,9 @@ class MangaFragment : Fragment() {
running = true
scope.launch {
withContext(Dispatchers.IO) {
Anilist.userid = PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
?.toIntOrNull()
Anilist.userid =
PrefManager.getNullableVal<String>(PrefName.AnilistUserId, null)
?.toIntOrNull()
if (Anilist.userid == null) {
getUserId(requireContext()) {
load()

6
app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
View File

@@ -266,10 +266,10 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
adaptor: MediaAdaptor,
recyclerView: RecyclerView,
progress: View,
title: View ,
more: View ,
title: View,
more: View,
string: String,
media : MutableList<Media>
media: MutableList<Media>
) {
progress.visibility = View.GONE
recyclerView.adapter = adaptor

6
app/src/main/java/ani/dantotsu/home/status/CircleView.kt
View File

@@ -38,7 +38,7 @@ class CircleView(context: Context, attrs: AttributeSet?) : View(context, attrs)
fun setColor(int: Int) {
paint.color = if (int < booleanList.size && booleanList[int]) {
Color.GRAY
Color.GRAY
} else {
if (isUser) secondColor else primaryColor
}
@@ -58,7 +58,7 @@ class CircleView(context: Context, attrs: AttributeSet?) : View(context, attrs)
} else {
val effectiveAngle = totalAngle / parts
for (i in 0 until parts) {
val startAngle = i * (effectiveAngle + gapAngle) -90f
val startAngle = i * (effectiveAngle + gapAngle) - 90f
path.reset()
path.addArc(
centerX - radius,
@@ -74,7 +74,7 @@ class CircleView(context: Context, attrs: AttributeSet?) : View(context, attrs)
}
fun setParts(parts: Int, list : List<Boolean> = mutableListOf(), isUser: Boolean) {
fun setParts(parts: Int, list: List<Boolean> = mutableListOf(), isUser: Boolean) {
this.parts = parts
this.booleanList = list
this.isUser = isUser

17
app/src/main/java/ani/dantotsu/home/status/StatusActivity.kt
View File

@@ -46,8 +46,8 @@ class StatusActivity : AppCompatActivity(), StoriesCallback {
val key = "activities"
val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
if (activity.getOrNull(position) != null) {
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
val startIndex = if ( startFrom > 0) startFrom else 0
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity)
val startIndex = if (startFrom > 0) startFrom else 0
binding.stories.setStoriesList(
activityList = activity[position].activity,
startIndex = startIndex + 1
@@ -58,6 +58,7 @@ class StatusActivity : AppCompatActivity(), StoriesCallback {
}
}
private fun findFirstNonMatch(watchedActivity: Set<Int>, activity: List<Activity>): Int {
for (activityItem in activity) {
if (activityItem.id !in watchedActivity) {
@@ -86,13 +87,14 @@ class StatusActivity : AppCompatActivity(), StoriesCallback {
binding.stories.pause()
}
}
override fun onStoriesEnd() {
position += 1
if (position < activity.size) {
val key = "activities"
val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
val startIndex= if ( startFrom > 0) startFrom else 0
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity)
val startIndex = if (startFrom > 0) startFrom else 0
binding.stories.startAnimation(slideOutLeft)
binding.stories.setStoriesList(activity[position].activity, startIndex + 1)
binding.stories.startAnimation(slideInRight)
@@ -106,15 +108,16 @@ class StatusActivity : AppCompatActivity(), StoriesCallback {
if (position >= 0 && activity[position].activity.isNotEmpty()) {
val key = "activities"
val watchedActivity = PrefManager.getCustomVal<Set<Int>>(key, setOf())
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity )
val startIndex = if ( startFrom > 0) startFrom else 0
val startFrom = findFirstNonMatch(watchedActivity, activity[position].activity)
val startIndex = if (startFrom > 0) startFrom else 0
binding.stories.startAnimation(slideOutRight)
binding.stories.setStoriesList(activity[position].activity,startIndex + 1)
binding.stories.setStoriesList(activity[position].activity, startIndex + 1)
binding.stories.startAnimation(slideInLeft)
} else {
finish()
}
}
companion object {
var user: ArrayList<User> = arrayListOf()
}

12
app/src/main/java/ani/dantotsu/home/status/Stories.kt
View File

@@ -262,8 +262,6 @@ class Stories @JvmOverloads constructor(
}
private fun rightPanelTouch() {
Logger.log("rightPanelTouch: $storyIndex")
if (storyIndex == activityList.size) {
@@ -366,8 +364,8 @@ class Stories @JvmOverloads constructor(
if (
story.status?.contains("completed") == false &&
!story.status.contains("plans") &&
!story.status.contains("repeating")&&
!story.status.contains("paused")&&
!story.status.contains("repeating") &&
!story.status.contains("paused") &&
!story.status.contains("dropped")
) {
"of ${story.media?.title?.userPreferred}"
@@ -469,6 +467,7 @@ class Stories @JvmOverloads constructor(
}
}
}
private var startClickTime = 0L
private var startX = 0f
private var startY = 0f
@@ -478,7 +477,8 @@ class Stories @JvmOverloads constructor(
onTouchView(view, event)
return true
}
private fun onTouchView(view: View, event: MotionEvent, isText: Boolean = false){
private fun onTouchView(view: View, event: MotionEvent, isText: Boolean = false) {
val maxClickDuration = 200
val screenWidth = view.width
val leftHalf = screenWidth / 2
@@ -492,6 +492,7 @@ class Stories @JvmOverloads constructor(
pause()
isLongPress = false
}
MotionEvent.ACTION_MOVE -> {
val deltaX = event.x - startX
val deltaY = event.y - startY
@@ -499,6 +500,7 @@ class Stories @JvmOverloads constructor(
isLongPress = true
}
}
MotionEvent.ACTION_UP -> {
val clickDuration = Calendar.getInstance().timeInMillis - startClickTime
if (isText) {

11
app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt
View File

@@ -46,7 +46,7 @@ class UserStatusAdapter(private val user: ArrayList<User>) :
.putExtra("type", "activity"),
null
)
}else{
} else {
ContextCompat.startActivity(
itemView.context,
Intent(
@@ -76,10 +76,15 @@ class UserStatusAdapter(private val user: ArrayList<User>) :
setAnimation(b.root.context, b.root)
val user = user[position]
b.profileUserAvatar.loadImage(user.pfp)
b.profileUserName.text = if (Anilist.userid == user.id) getAppString(R.string.your_story) else user.name
b.profileUserName.text =
if (Anilist.userid == user.id) getAppString(R.string.your_story) else user.name
val watchedActivity = PrefManager.getCustomVal<Set<Int>>("activities", setOf())
val booleanList = user.activity.map { watchedActivity.contains(it.id) }
b.profileUserStatusIndicator.setParts(user.activity.size, booleanList, user.id == Anilist.userid)
b.profileUserStatusIndicator.setParts(
user.activity.size,
booleanList,
user.id == Anilist.userid
)
}