Skip to content

Commit

Permalink
fixing issues with layout
Browse files Browse the repository at this point in the history
  • Loading branch information
kl3jvi committed Nov 5, 2021
1 parent 1165b22 commit 9f97ba4
Show file tree
Hide file tree
Showing 23 changed files with 12,398 additions and 9,838 deletions.
1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/src/main/java/com/kl3jvi/animity/utils/Constants.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.kl3jvi.animity.utils.parser.HtmlParser
class Constants {
companion object {

const val RECENT_SUB: String= "RECENT_SUB"
const val INTRO_SKIP_TIME = 85000
const val ANIME_TITLE: String = "ANIME_TITLE"
const val EPISODE_DETAILS: String = "episodeInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder
import com.google.android.exoplayer2.upstream.DataSource
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
import com.google.android.exoplayer2.util.Log
import com.google.android.exoplayer2.util.Util
import com.google.android.material.snackbar.Snackbar
import com.google.firebase.analytics.FirebaseAnalytics
Expand All @@ -32,6 +33,7 @@ import com.google.firebase.ktx.Firebase
import com.kl3jvi.animity.R
import com.kl3jvi.animity.application.AnimityApplication
import com.kl3jvi.animity.databinding.ActivityPlayerBinding
import com.kl3jvi.animity.model.entities.AnimeMetaModel
import com.kl3jvi.animity.model.entities.EpisodeModel
import com.kl3jvi.animity.services.VideoDownloadService
import com.kl3jvi.animity.utils.Constants
Expand Down Expand Up @@ -144,6 +146,7 @@ class PlayerActivity : AppCompatActivity() {
.setContentType(C.CONTENT_TYPE_MOVIE)
.build()

// downloadMedia(videoM3U8Url)

player = SimpleExoPlayer.Builder(this)
.setAudioAttributes(audioAttributes, true)
Expand All @@ -153,7 +156,6 @@ class PlayerActivity : AppCompatActivity() {
viewBinding.videoView.player = exoPlayer
val videoSource: MediaSource =
buildMediaSource(Uri.parse(videoM3U8Url))
// downloadMedia(videoM3U8Url)
exoPlayer.setMediaSource(videoSource)
exoPlayer.playWhenReady = playWhenReady
exoPlayer.seekTo(currentWindow, playbackPosition)
Expand Down Expand Up @@ -371,34 +373,32 @@ class PlayerActivity : AppCompatActivity() {
}

private fun downloadMedia(videoM3U8Url: String) {
CoroutineScope(Dispatchers.IO).launch {
val uri = Uri.parse(videoM3U8Url)
val mediaItem: MediaItem = MediaItem.fromUri(uri)
val helper = DownloadHelper.forMediaItem(this@PlayerActivity, mediaItem)
helper.prepare(object : DownloadHelper.Callback {
override fun onPrepared(helper: DownloadHelper) {
val json = JSONObject()
json.put("anime title", animeTitlePassed)
json.put("episode", episodeNumber)
val downloadRequest =
helper.getDownloadRequest(
DOWNLOAD_CHANNEL_ID,
Util.getUtf8Bytes(json.toString())
)
DownloadService.sendAddDownload(
this@PlayerActivity,
VideoDownloadService::class.java,
downloadRequest,
false
)
}
override fun onPrepareError(helper: DownloadHelper, e: IOException) {
e.printStackTrace()
}
})

}
val uri = Uri.parse(videoM3U8Url)
val mediaItem: MediaItem = MediaItem.fromUri(uri)
val helper = DownloadHelper.forMediaItem(this@PlayerActivity, mediaItem)
helper.prepare(object : DownloadHelper.Callback {
override fun onPrepared(helper: DownloadHelper) {
val json = JSONObject()
json.put("anime title", animeTitlePassed)
json.put("episode", episodeNumber)
val downloadRequest =
helper.getDownloadRequest(
DOWNLOAD_CHANNEL_ID,
Util.getUtf8Bytes(json.toString())
)
DownloadService.sendAddDownload(
this@PlayerActivity,
VideoDownloadService::class.java,
downloadRequest,
false
)
}

override fun onPrepareError(helper: DownloadHelper, e: IOException) {
e.printStackTrace()
}
})
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.kl3jvi.animity.view.adapters

import android.content.Intent
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.view.isVisible
Expand All @@ -10,6 +11,8 @@ import coil.request.CachePolicy

import com.kl3jvi.animity.databinding.ItemCardAnimeBinding
import com.kl3jvi.animity.model.entities.AnimeMetaModel
import com.kl3jvi.animity.utils.Constants
import com.kl3jvi.animity.view.activities.player.PlayerActivity
import com.kl3jvi.animity.view.fragments.home.HomeFragment

class CustomHorizontalAdapter(
Expand Down Expand Up @@ -57,7 +60,7 @@ class CustomHorizontalAdapter(
override fun getItemCount() = animes.size

fun addAnimes(animes: List<AnimeMetaModel>) {
this.animes.apply {
this.animes.apply {
clear()
addAll(animes)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ import com.kl3jvi.animity.view.activities.player.PlayerActivity
import com.kl3jvi.animity.view.adapters.CustomEpisodeAdapter
import com.kl3jvi.animity.viewmodels.DetailsViewModel
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.withContext
import org.json.JSONObject
import java.io.IOException

Expand Down Expand Up @@ -214,7 +216,6 @@ class DetailsFragment : Fragment() {
episodeAdapter.getEpisodeInfo(episodeList)
false
}

}
if (episodeList.isNotEmpty()) {
binding.resultPlayMovie.setOnClickListener {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
package com.kl3jvi.animity.view.fragments.downloads

import android.os.Bundle
import android.os.Message
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.google.android.exoplayer2.offline.DownloadCursor
import com.google.android.exoplayer2.util.Util
import com.kl3jvi.animity.application.AnimityApplication
import com.kl3jvi.animity.databinding.FragmentDownloadsBinding
import dagger.hilt.android.AndroidEntryPoint
import org.json.JSONObject

@AndroidEntryPoint
class DownloadsFragment : Fragment() {
Expand All @@ -25,24 +22,22 @@ class DownloadsFragment : Fragment() {
): View {
_binding = FragmentDownloadsBinding.inflate(inflater, container, false)
getDownloadedItems().forEach {
binding.numd.append(it)
// binding.numd.append(it)
}
return binding.root
}

private fun getDownloadedItems(): ArrayList<String> {
/*Asumming this is your Media item data class
data class Media(var url: String, var artist: String, var title: String)
*/
/*Asumming this is your Media item data class
data class Media(var url: String, var artist:
String, var title: String)*/
val downloadedTracks = ArrayList<String>()
val downloadCursor: DownloadCursor =
(context?.applicationContext as AnimityApplication).appContainer.downloadManager.downloadIndex.getDownloads()
if (downloadCursor.moveToFirst()) {
do {

downloadCursor.download.bytesDownloaded
val uri = downloadCursor.download.request.uri

downloadedTracks.add(uri.toString())
} while (downloadCursor.moveToNext())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
class SearchFragment : Fragment() {


private var _binding: FragmentSearchBinding? = null
private val binding get() = _binding!!
private val viewModel: SearchViewModel by viewModels()
Expand Down Expand Up @@ -54,7 +53,6 @@ class SearchFragment : Fragment() {
getSearchData()
val sv = binding.mainSearch
sv.setOnQueryTextListener(object : SearchView.OnQueryTextListener {

override fun onQueryTextChange(newText: String): Boolean {
return false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ import com.kl3jvi.animity.domain.GetAnimeDetailsUseCase
import com.kl3jvi.animity.model.database.AnimeRepository
import com.kl3jvi.animity.model.entities.AnimeMetaModel
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.internal.assertThreadDoesntHoldLock
import javax.inject.Inject

Expand All @@ -32,7 +35,7 @@ class DetailsViewModel @Inject constructor(
info.data?.endEpisode,
info.data?.alias
)
}.asLiveData()
}.asLiveData(Dispatchers.Default + viewModelScope.coroutineContext)
}

val isOnDatabase = Transformations.switchMap(_animeId) { id ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ class FavoritesViewModel @Inject constructor(
) : ViewModel() {
val favoriteAnimesList: LiveData<List<AnimeMetaModel>> =
animeRepository.getFavoriteAnimes.asLiveData()

}
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ class HomeViewModel @Inject constructor(
fetchMovies()
}




private fun fetchRecentSubOrDub() {
getAnimesUseCase.fetchRecentSubOrDub().onEach {
_recentSubDub.value = it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ class PlayerViewModel @Inject constructor(
delay(1000)
}
}
}.flowOn(Dispatchers.Main).asLiveData()
}.flowOn(Dispatchers.Main).asLiveData(Dispatchers.Default + viewModelScope.coroutineContext)

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.lifecycle.*
import com.kl3jvi.animity.domain.GetAnimeDetailsUseCase
import com.kl3jvi.animity.domain.GetSearchResultUseCase
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
Expand All @@ -17,12 +18,10 @@ class SearchViewModel @Inject constructor(
private val _query = MutableLiveData<String>()

val searchResult = Transformations.switchMap(_query) { query ->
getSearchResultUseCase.getSearchData(query).asLiveData()
getSearchResultUseCase.getSearchData(query)
.asLiveData(Dispatchers.IO + viewModelScope.coroutineContext)
}




fun passQuery(query: String) {
_query.value = query
}
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_download_folder.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="@color/white"
android:pathData="M20,6a2,2 0,0 1,2 2v10a2,2 0,0 1,-2 2H4a2,2 0,0 1,-2 -2V6c0,-1.11 0.89,-2 2,-2h6l2,2h8m-0.75,7H16V9h-2v4h-3.25L15,17.25" />
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_profile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
</vector>
2 changes: 0 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:background="@color/primaryBlackBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">


<me.ibrahimsn.lib.SmoothBottomBar
android:id="@+id/nav_view"
android:layout_width="0dp"
Expand Down
20 changes: 13 additions & 7 deletions app/src/main/res/layout/fragment_downloads.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:layout_height="match_parent">

<TextView
android:id="@+id/numd"
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/nothingSaved"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="#FFFFFF"
android:gravity="center"
tools:text="asdadfad"/>
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:lottie_autoPlay="true"
app:lottie_loop="true"
app:lottie_rawRes="@raw/download" />
</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_favorites.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:alpha="0.7"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_episode_number.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:layout_height="50dp"
android:layout_marginBottom="5dp"
android:foreground="@drawable/outline_drawable"
app:cardBackgroundColor="@color/iconGrayBackground"
app:cardBackgroundColor="@color/primaryGrayBackground"
app:cardCornerRadius="@dimen/roundedImageRadius"
app:cardElevation="0dp">

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/menu/bottom_nav_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

<item
android:id="@+id/navigation_downloads"
android:icon="@drawable/ic_downloading"
android:icon="@drawable/ic_download_folder"
android:title="" />

</menu>
Loading

0 comments on commit 9f97ba4

Please sign in to comment.