MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor refactor

Browse source
This commit is contained in:
LagradOst 2022-01-29 19:57:19 +01:00
parent 45567fb4f4
commit 06801ba6ab
47 changed files with 862 additions and 774 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/com/lagradost/cloudstream3/animeproviders/AllAnimeProvider.kt
View file

@ -223,19 +223,24 @@ class AllAnimeProvider : MainAPI() {
@JsonProperty("episodeIframeHead") val episodeIframeHead: String
)
private fun getM3u8Qualities(m3u8Link: String, referer: String, qualityName: String): ArrayList<ExtractorLink> {
return ArrayList(hlsHelper.m3u8Generation(M3u8Helper.M3u8Stream(m3u8Link, null), true).map { stream ->
val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
ExtractorLink(
this.name,
"${this.name} - $qualityName $qualityString",
stream.streamUrl,
referer,
getQualityFromName(stream.quality.toString()),
true,
stream.headers
)
})
private fun getM3u8Qualities(
m3u8Link: String,
referer: String,
qualityName: String
): ArrayList<ExtractorLink> {
return ArrayList(
hlsHelper.m3u8Generation(M3u8Helper.M3u8Stream(m3u8Link, null), true).map { stream ->
val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
ExtractorLink(
this.name,
"${this.name} - $qualityName $qualityString",
stream.streamUrl,
referer,
getQualityFromName(stream.quality.toString()),
true,
stream.headers
)
})
}
override suspend fun loadLinks(
@ -244,8 +249,10 @@ class AllAnimeProvider : MainAPI() {
subtitleCallback: (SubtitleFile) -> Unit,
callback: (ExtractorLink) -> Unit
): Boolean {
var apiEndPoint = mapper.readValue<ApiEndPoint>(app.get("$mainUrl/getVersion").text).episodeIframeHead
if (apiEndPoint.endsWith("/")) apiEndPoint = apiEndPoint.slice(0 until apiEndPoint.length - 1)
var apiEndPoint =
mapper.readValue<ApiEndPoint>(app.get("$mainUrl/getVersion").text).episodeIframeHead
if (apiEndPoint.endsWith("/")) apiEndPoint =
apiEndPoint.slice(0 until apiEndPoint.length - 1)
val html = app.get(data).text

60
app/src/main/java/com/lagradost/cloudstream3/animeproviders/AnimeflvProvider.kt
View file

@ -1,11 +1,12 @@
package com.lagradost.cloudstream3.animeproviders
import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.utils.*
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.loadExtractor
import java.util.*
import kotlin.collections.ArrayList
class AnimeflvnetProvider:MainAPI() {
class AnimeflvnetProvider : MainAPI() {
companion object {
fun getType(t: String): TvType {
return if (t.contains("OVA") || t.contains("Especial")) TvType.ONA
@ -13,10 +14,9 @@ class AnimeflvnetProvider:MainAPI() {
else TvType.Anime
}
}
override val mainUrl: String
get() = "https://m.animeflv.net"
override val name: String
get() = "AnimeFLV"
override val mainUrl = "https://m.animeflv.net"
override val name = "AnimeFLV"
override val lang = "es"
override val hasMainPage = true
override val hasChromecastSupport = true
@ -27,8 +27,6 @@ class AnimeflvnetProvider:MainAPI() {
TvType.Anime,
)
override suspend fun getMainPage(): HomePageResponse {
val urls = listOf(
Pair("$mainUrl/browse?type[]=movie&order=updated", "Peliculas actualizadas"),
@ -50,7 +48,9 @@ class AnimeflvnetProvider:MainAPI() {
TvType.Anime,
fixUrl(poster),
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(DubStatus.Dubbed) else EnumSet.of(DubStatus.Subbed),
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(
DubStatus.Dubbed
) else EnumSet.of(DubStatus.Subbed),
)
}
@ -78,7 +78,9 @@ class AnimeflvnetProvider:MainAPI() {
TvType.Anime,
fixUrl(image),
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(DubStatus.Dubbed) else EnumSet.of(DubStatus.Subbed),
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(DubStatus.Dubbed) else EnumSet.of(
DubStatus.Subbed
),
)
}
return ArrayList(episodes)
@ -87,23 +89,25 @@ class AnimeflvnetProvider:MainAPI() {
override suspend fun load(url: String): LoadResponse {
val doc = app.get(url).document
val title = doc.selectFirst("h1.Title").text()
val description = doc.selectFirst(".Anime > header:nth-child(1) > p:nth-child(3)").text().replace("Sinopsis: ","")
val description = doc.selectFirst(".Anime > header:nth-child(1) > p:nth-child(3)").text()
.replace("Sinopsis: ", "")
val poster = doc.selectFirst(".Image img").attr("src")
val episodes = doc.select("li.Episode").map { li ->
val href = fixUrl(li.selectFirst("a").attr("href"))
AnimeEpisode(
fixUrl(href), "Episodio" + li.selectFirst("a").text().replace(title,"")
fixUrl(href), "Episodio" + li.selectFirst("a").text().replace(title, "")
)
}
val type = doc.selectFirst("span.Type.A").text()
val genre = doc.select("a.Tag")
.map { it?.text()?.trim().toString() }
val status = when (doc.selectFirst("article.Anime.Single.Bglg header p strong.Anm-On")?.text()) {
"En emisión" -> ShowStatus.Ongoing
"Finalizado" -> ShowStatus.Completed
else -> null
}
val status =
when (doc.selectFirst("article.Anime.Single.Bglg header p strong.Anm-On")?.text()) {
"En emisión" -> ShowStatus.Ongoing
"Finalizado" -> ShowStatus.Completed
else -> null
}
return newAnimeLoadResponse(title, url, getType(type)) {
posterUrl = fixUrl(poster)
addEpisodes(DubStatus.Subbed, episodes)
@ -112,6 +116,7 @@ class AnimeflvnetProvider:MainAPI() {
tags = genre
}
}
override suspend fun loadLinks(
data: String,
isCasting: Boolean,
@ -121,24 +126,19 @@ class AnimeflvnetProvider:MainAPI() {
//There might be a better way to do this, but this one works
val html = app.get(data).text
val linkRegex = Regex("""(https:.*?\.html.*)""")
val videos = linkRegex.findAll(html).map {
it.value.replace("\\/", "/")
}.toList()
val serversRegex = Regex("(https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*))")
val links = serversRegex.findAll(videos.toString()).map {
it.value.replace("https://embedsb.com","https://watchsb.com")
}.toList()
for (link in links) {
for (extractor in extractorApis) {
if (link.startsWith(extractor.mainUrl)) {
extractor.getSafeUrl(link, data)?.forEach {
callback(it)
}
}
}
val serversRegex =
Regex("(https?://(www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))")
serversRegex.findAll(videos.toString()).map {
it.value.replace("https://embedsb.com", "https://watchsb.com")
}.forEach { link ->
loadExtractor(link, data, callback)
}
return true
}
}

99
app/src/main/java/com/lagradost/cloudstream3/animeproviders/MonoschinosProvider.kt
View file

@ -2,16 +2,13 @@ package com.lagradost.cloudstream3.animeproviders
import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.extractors.FEmbed
import java.util.*
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.extractorApis
import com.lagradost.cloudstream3.utils.loadExtractor
import java.util.*
import kotlin.collections.ArrayList
class MonoschinosProvider:MainAPI() {
class MonoschinosProvider : MainAPI() {
companion object {
fun getType(t: String): TvType {
return if (t.contains("OVA") || t.contains("Especial")) TvType.ONA
@ -20,10 +17,8 @@ class MonoschinosProvider:MainAPI() {
}
}
override val mainUrl: String
get() = "https://monoschinos2.com"
override val name: String
get() = "Monoschinos"
override val mainUrl = "https://monoschinos2.com"
override val name = "Monoschinos"
override val lang = "es"
override val hasMainPage = true
override val hasChromecastSupport = true
@ -37,30 +32,40 @@ class MonoschinosProvider:MainAPI() {
override suspend fun getMainPage(): HomePageResponse {
val urls = listOf(
Pair("$mainUrl/emision", "En emisión"),
Pair("$mainUrl/animes?categoria=pelicula&genero=false&fecha=false&letra=false", "Peliculas"),
Pair(
"$mainUrl/animes?categoria=pelicula&genero=false&fecha=false&letra=false",
"Peliculas"
),
Pair("$mainUrl/animes", "Animes"),
)
val items = ArrayList<HomePageList>()
items.add(HomePageList("Capítulos actualizados", app.get(mainUrl, timeout = 120).document.select(".col-6").map{
val title = it.selectFirst("p.animetitles").text()
val poster = it.selectFirst(".animeimghv").attr("data-src")
val epRegex = Regex("episodio-(\\d+)")
val url = it.selectFirst("a").attr("href").replace("ver/","anime/").replace(epRegex,"sub-espanol")
val epNum = it.selectFirst(".positioning h5").text().toIntOrNull()
AnimeSearchResponse(
title,
url,
this.name,
TvType.Anime,
poster,
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(DubStatus.Dubbed) else EnumSet.of(DubStatus.Subbed),
subEpisodes = epNum,
dubEpisodes = epNum,
)
}))
items.add(
HomePageList(
"Capítulos actualizados",
app.get(mainUrl, timeout = 120).document.select(".col-6").map {
val title = it.selectFirst("p.animetitles").text()
val poster = it.selectFirst(".animeimghv").attr("data-src")
val epRegex = Regex("episodio-(\\d+)")
val url = it.selectFirst("a").attr("href").replace("ver/", "anime/")
.replace(epRegex, "sub-espanol")
val epNum = it.selectFirst(".positioning h5").text().toIntOrNull()
AnimeSearchResponse(
title,
url,
this.name,
TvType.Anime,
poster,
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(
DubStatus.Dubbed
) else EnumSet.of(DubStatus.Subbed),
subEpisodes = epNum,
dubEpisodes = epNum,
)
})
)
for (i in urls) {
try {
@ -74,7 +79,9 @@ class MonoschinosProvider:MainAPI() {
TvType.Anime,
fixUrl(poster),
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(DubStatus.Dubbed) else EnumSet.of(DubStatus.Subbed),
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(
DubStatus.Dubbed
) else EnumSet.of(DubStatus.Subbed),
)
}
@ -89,28 +96,32 @@ class MonoschinosProvider:MainAPI() {
}
override suspend fun search(query: String): ArrayList<SearchResponse> {
val search = app.get("$mainUrl/buscar?q=$query", timeout = 120).document.select(".col-6").map {
val title = it.selectFirst(".seristitles").text()
val href = fixUrl(it.selectFirst("a").attr("href"))
val image = it.selectFirst("img.animemainimg").attr("src")
AnimeSearchResponse(
title,
href,
this.name,
TvType.Anime,
fixUrl(image),
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(DubStatus.Dubbed) else EnumSet.of(DubStatus.Subbed),
)
}
val search =
app.get("$mainUrl/buscar?q=$query", timeout = 120).document.select(".col-6").map {
val title = it.selectFirst(".seristitles").text()
val href = fixUrl(it.selectFirst("a").attr("href"))
val image = it.selectFirst("img.animemainimg").attr("src")
AnimeSearchResponse(
title,
href,
this.name,
TvType.Anime,
fixUrl(image),
null,
if (title.contains("Latino") || title.contains("Castellano")) EnumSet.of(
DubStatus.Dubbed
) else EnumSet.of(DubStatus.Subbed),
)
}
return ArrayList(search)
}
override suspend fun load(url: String): LoadResponse {
val doc = app.get(url, timeout = 120).document
val poster = doc.selectFirst(".chapterpic img").attr("src")
val title = doc.selectFirst(".chapterdetails h1").text()
val type = doc.selectFirst("div.chapterdetls2").text()
val description = doc.selectFirst("p.textComplete").text().replace("Ver menos","")
val description = doc.selectFirst("p.textComplete").text().replace("Ver menos", "")
val genres = doc.select(".breadcrumb-item a").map { it.text() }
val status = when (doc.selectFirst("button.btn1")?.text()) {
"Estreno" -> ShowStatus.Ongoing

6
app/src/main/java/com/lagradost/cloudstream3/movieproviders/CinecalidadProvider.kt
View file

@ -5,10 +5,8 @@ import com.lagradost.cloudstream3.utils.*
import java.util.*
class CinecalidadProvider:MainAPI() {
override val mainUrl: String
get() = "https://cinecalidad.lol"
override val name: String
get() = "Cinecalidad"
override val mainUrl = "https://cinecalidad.lol"
override val name = "Cinecalidad"
override val lang = "es"
override val hasMainPage = true
override val hasChromecastSupport = true

6
app/src/main/java/com/lagradost/cloudstream3/movieproviders/DoramasYTProvider.kt
View file

@ -19,10 +19,8 @@ class DoramasYTProvider:MainAPI() {
}
}
override val mainUrl: String
get() = "https://doramasyt.com"
override val name: String
get() = "DoramasYT"
override val mainUrl = "https://doramasyt.com"
override val name = "DoramasYT"
override val lang = "es"
override val hasMainPage = true
override val hasChromecastSupport = true

6
app/src/main/java/com/lagradost/cloudstream3/movieproviders/PeliSmartProvider.kt
View file

@ -6,10 +6,8 @@ import com.lagradost.cloudstream3.utils.extractorApis
import java.util.ArrayList
class PeliSmartProvider: MainAPI() {
override val mainUrl: String
get() = "https://pelismart.com"
override val name: String
get() = "PeliSmart"
override val mainUrl = "https://pelismart.com"
override val name = "PeliSmart"
override val lang = "es"
override val hasMainPage = true
override val hasChromecastSupport = true

6
app/src/main/java/com/lagradost/cloudstream3/movieproviders/PelisplusHDProvider.kt
View file

@ -5,10 +5,8 @@ import com.lagradost.cloudstream3.utils.*
import java.util.*
class PelisplusHDProvider:MainAPI() {
override val mainUrl: String
get() = "https://pelisplushd.net"
override val name: String
get() = "PelisplusHD"
override val mainUrl = "https://pelisplushd.net"
override val name = "PelisplusHD"
override val lang = "es"
override val hasMainPage = true
override val hasChromecastSupport = true

29
app/src/main/res/layout/account_managment.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
@ -14,24 +14,28 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
app:cardCornerRadius="100dp"
android:layout_gravity="center_vertical"
android:layout_width="35dp"
android:layout_height="35dp">
<ImageView
android:id="@+id/account_profile_picture"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:ignore="ContentDescription">
</ImageView>
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/account_name"
@ -41,8 +45,8 @@
android:textColor="?attr/textColor"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_site"
android:layout_gravity="center_vertical"
@ -51,20 +55,21 @@
android:textColor="?attr/grayTextColor"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/account_switch_account"
android:text="@string/switch_account"
style="@style/SettingsItem">
</TextView>
style="@style/SettingsItem" />
<TextView
android:id="@+id/account_logout"
android:text="@string/logout"
style="@style/SettingsItem">
<requestFocus/>
<requestFocus />
</TextView>
</LinearLayout>

16
app/src/main/res/layout/account_single.xml
View file

@ -1,9 +1,10 @@
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:orientation="horizontal"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_height="wrap_content"
android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="wrap_content"
android:layout_width="match_parent">
<androidx.cardview.widget.CardView
android:layout_marginStart="10dp"
@ -11,19 +12,18 @@
android:layout_gravity="center_vertical"
android:layout_width="30dp"
android:layout_height="30dp">
<ImageView
android:id="@+id/account_profile_picture"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:ignore="ContentDescription">
</ImageView>
tools:ignore="ContentDescription" />
</androidx.cardview.widget.CardView>
<TextView
android:foreground="@null"
android:id="@+id/account_name"
tools:text="Account 1"
style="@style/SettingsItem">
</TextView>
style="@style/SettingsItem" />
</LinearLayout>

11
app/src/main/res/layout/account_switch.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
@ -13,12 +13,13 @@
tools:listitem="@layout/account_single"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="wrap_content">
</androidx.recyclerview.widget.RecyclerView>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_add"
android:text="@string/add_account"
style="@style/SettingsItem">
<requestFocus/>
<requestFocus />
</TextView>
</LinearLayout>

17
app/src/main/res/layout/activity_main.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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:id="@+id/homeRoot"
@ -8,9 +7,11 @@
android:layout_height="match_parent"
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
android:paddingTop="0dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_height="match_parent"
android:layout_width="match_parent">
<com.google.android.material.navigationrail.NavigationRailView
android:layout_width="62dp"
android:layout_height="match_parent"
@ -40,7 +41,8 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/bottom_nav_menu"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toBottomOf="parent" />
<fragment
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
@ -51,7 +53,8 @@
app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
app:layout_constraintBottom_toTopOf="@+id/cast_mini_controller_holder"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent" />
<LinearLayout
tools:layout_height="100dp"
android:layout_width="0dp"
@ -59,8 +62,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/nav_view"
android:id="@+id/cast_mini_controller_holder"
>
android:id="@+id/cast_mini_controller_holder">
<!--com.google.android.gms.cast.framework.media.widget.MiniControllerFragment-->
<fragment
app:customCastBackgroundColor="?attr/primaryGrayBackground"
@ -70,8 +72,7 @@
android:layout_height="wrap_content"
android:visibility="gone"
class="com.lagradost.cloudstream3.ui.MyMiniControllerFragment"
tools:ignore="FragmentTagUsage">
</fragment>
tools:ignore="FragmentTagUsage" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

14
app/src/main/res/layout/activity_main_tv.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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:id="@+id/homeRoot"
@ -8,9 +7,11 @@
android:layout_height="match_parent"
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
android:paddingTop="0dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_height="match_parent"
android:layout_width="match_parent">
<com.google.android.material.navigationrail.NavigationRailView
android:layout_width="62dp"
android:layout_height="match_parent"
@ -37,7 +38,8 @@
app:layout_constraintBottom_toTopOf="@id/cast_mini_controller_holder"
app:navGraph="@navigation/mobile_navigation"
app:layout_constraintStart_toEndOf="@id/nav_rail_view"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent" />
<LinearLayout
app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
app:layout_constraintEnd_toEndOf="parent"
@ -45,8 +47,7 @@
tools:layout_height="100dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/cast_mini_controller_holder"
>
android:id="@+id/cast_mini_controller_holder">
<!--com.google.android.gms.cast.framework.media.widget.MiniControllerFragment-->
<fragment
app:customCastBackgroundColor="?attr/primaryGrayBackground"
@ -56,8 +57,7 @@
android:layout_height="wrap_content"
android:visibility="gone"
class="com.lagradost.cloudstream3.ui.MyMiniControllerFragment"
tools:ignore="FragmentTagUsage">
</fragment>
tools:ignore="FragmentTagUsage" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

18
app/src/main/res/layout/bottom_selection_dialog.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
@ -18,8 +17,8 @@
android:layout_width="match_parent"
android:layout_rowWeight="1"
tools:text="Test"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<ListView
android:nextFocusRight="@id/cancel_btt"
android:nextFocusLeft="@id/apply_btt"
@ -31,8 +30,8 @@
tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_rowWeight="1"
/>
android:layout_rowWeight="1" />
<LinearLayout
android:id="@+id/apply_btt_holder"
android:orientation="horizontal"
@ -47,14 +46,13 @@
android:layout_gravity="center_vertical|end"
android:text="@string/sort_apply"
android:id="@+id/apply_btt"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
<com.google.android.material.button.MaterialButton
style="@style/BlackButton"
android:layout_gravity="center_vertical|end"
android:text="@string/sort_cancel"
android:id="@+id/cancel_btt"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
</LinearLayout>
</LinearLayout>

13
app/src/main/res/layout/dialog_loading.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="Loading..." android:textColor="?attr/textColor" android:textSize="20sp"
@ -16,12 +17,12 @@
android:textColor="@color/textColor"
android:textSize="20sp"
android:textStyle="bold"
android:layout_margin="10dp"/>
android:layout_margin="10dp" />
<ProgressBar
android:layout_margin="20dp"
android:layout_gravity="center"
android:layout_width="60dp"
android:layout_height="60dp"
/>
android:layout_height="60dp" />
</LinearLayout>

34
app/src/main/res/layout/download_child_episode.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView 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"
@ -14,8 +13,8 @@
app:cardBackgroundColor="@color/transparent"
app:cardElevation="0dp"
android:foreground="@drawable/outline_drawable"
android:layout_marginBottom="5dp"
>
android:layout_marginBottom="5dp">
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/download_child_episode_progress"
@ -26,12 +25,13 @@
android:layout_width="match_parent"
tools:progress="50"
android:layout_gravity="bottom"
android:layout_height="5dp">
</androidx.core.widget.ContentLoadingProgressBar>
android:layout_height="5dp" />
<GridLayout
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/download_child_episode_play"
android:visibility="gone"
@ -39,14 +39,15 @@
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_baseline_play_arrow_24"
android:contentDescription="@string/episode_play_img_des"/>
android:contentDescription="@string/episode_play_img_des" />
<LinearLayout
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_marginEnd="50dp"
android:layout_width="match_parent"
>
android:layout_width="match_parent">
<TextView
android:id="@+id/download_child_episode_text"
android:layout_marginStart="10dp"
@ -62,8 +63,8 @@
android:textColor="?attr/textColor"
android:layout_width="match_parent"
android:layout_height="match_parent">
</TextView>
android:layout_height="match_parent" />
<TextView
android:id="@+id/download_child_episode_text_extra"
android:layout_marginStart="10dp"
@ -73,14 +74,15 @@
tools:text="128MB / 237MB"
android:textColor="?attr/grayTextColor"
android:layout_width="wrap_content"
android:layout_height="match_parent">
</TextView>
android:layout_height="match_parent" />
</LinearLayout>
<FrameLayout
android:layout_marginStart="-50dp"
android:layout_gravity="end"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/download_child_episode_progress_downloaded"
android:layout_marginEnd="10dp"
@ -95,8 +97,8 @@
android:layout_margin="5dp"
android:layout_gravity="end|center_vertical"
android:progress="0"
android:visibility="visible"
/>
android:visibility="visible" />
<ImageView
android:nextFocusRight="@id/download_child_episode_holder"
android:nextFocusLeft="@id/download_child_episode_holder"
@ -112,7 +114,7 @@
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_baseline_play_arrow_24"
app:tint="?attr/textColor"
android:contentDescription="@string/download"/>
android:contentDescription="@string/download" />
</FrameLayout>
</GridLayout>
</androidx.cardview.widget.CardView>

34
app/src/main/res/layout/download_header_episode.xml
View file

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
<androidx.cardview.widget.CardView 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="wrap_content"
app:cardCornerRadius="@dimen/rounded_image_radius"
app:cardBackgroundColor="?attr/boxItemBackground"
android:id="@+id/episode_holder"
android:foreground="@drawable/outline_drawable"
android:layout_marginBottom="10dp"
>
android:layout_marginBottom="10dp">
<LinearLayout
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:layout_width="match_parent"
@ -19,17 +18,17 @@
<!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
<androidx.cardview.widget.CardView
android:layout_width="70dp"
android:layout_height="104dp"
>
android:layout_height="104dp">
<ImageView
android:id="@+id/download_header_poster"
tools:src="@drawable/example_poster"
android:scaleType="centerCrop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/episode_poster_img_des">
</ImageView>
android:contentDescription="@string/episode_poster_img_des" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_marginStart="15dp"
android:orientation="vertical"
@ -37,21 +36,21 @@
android:layout_width="match_parent"
android:layout_marginEnd="70dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/download_header_title"
tools:text="Perfect Run"
android:textStyle="bold"
android:textColor="?attr/textColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/download_header_info"
tools:text="1 episode | 285MB"
android:textColor="?attr/grayTextColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
</LinearLayout>
<ImageView
@ -61,13 +60,14 @@
android:id="@+id/download_header_goto_child"
android:layout_gravity="center_vertical|end"
android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
android:contentDescription="@string/download"/>
android:contentDescription="@string/download" />
<FrameLayout
android:layout_marginStart="-50dp"
android:layout_gravity="end"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
@ -82,8 +82,8 @@
android:layout_margin="5dp"
android:layout_gravity="center_vertical"
android:progress="0"
android:visibility="visible"
/>
android:visibility="visible" />
<ImageView
android:visibility="visible"

8
app/src/main/res/layout/empty_layout.xml
View file

@ -1,8 +1,9 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<fragment
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
@ -13,6 +14,5 @@
app:layout_constraintWidth="match_parent"
app:layout_constraintHeight="match_parent"
app:layout_constraintStart_toEndOf="parent"
app:layout_constraintTop_toBottomOf="parent"
/>
app:layout_constraintTop_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

16
app/src/main/res/layout/fragment_child_downloads.xml
View file

@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:background="?attr/primaryGrayBackground"
android:id="@+id/download_child_root"
android:orientation="vertical"
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"
tools:context=".ui.download.DownloadFragment">
<com.google.android.material.appbar.AppBarLayout
android:background="@android:color/transparent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/download_child_toolbar"
android:paddingTop="@dimen/navbar_height"
@ -21,8 +22,8 @@
app:navigationIconTint="?attr/iconColor"
app:titleTextColor="?attr/textColor"
app:layout_scrollFlags="scroll|enterAlways"
android:layout_width="match_parent" android:layout_height="wrap_content">
</com.google.android.material.appbar.MaterialToolbar>
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
@ -34,6 +35,5 @@
tools:listitem="@layout/download_child_episode"
android:id="@+id/download_child_list"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
android:layout_height="match_parent" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

66
app/src/main/res/layout/fragment_downloads.xml
View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/download_root"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/download_root"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryGrayBackground"
@ -25,41 +24,47 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:textColor="?attr/textColor"
android:layout_marginBottom="5dp"
android:text="@string/download_storage_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<LinearLayout
android:layout_marginBottom="5dp"
android:layout_width="fill_parent"
android:layout_height="12dp"
android:orientation="horizontal">
<View
android:layout_weight="0.5"
android:id="@+id/download_used"
android:background="?attr/white"
android:layout_width="0dp"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<View
android:id="@+id/download_app"
android:layout_weight="0.10"
android:background="?attr/colorPrimary"
android:layout_width="0dp"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<View
android:id="@+id/download_free"
android:layout_weight="0.10"
android:background="?attr/grayTextColor"
android:layout_width="0dp"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View
android:layout_marginEnd="5dp"
android:layout_marginTop="5dp"
@ -67,7 +72,8 @@
android:layout_gravity="center_vertical"
android:background="?attr/white"
android:layout_width="10dp"
android:layout_height="10dp"/>
android:layout_height="10dp" />
<TextView
android:id="@+id/download_used_txt"
android:layout_gravity="center_vertical"
@ -75,14 +81,15 @@
android:textSize="12sp"
android:textColor="?attr/textColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<View
android:layout_margin="5dp"
android:layout_gravity="center_vertical"
android:background="?attr/colorPrimary"
android:layout_width="10dp"
android:layout_height="10dp"/>
android:layout_height="10dp" />
<TextView
android:id="@+id/download_app_txt"
android:layout_gravity="center_vertical"
@ -90,13 +97,15 @@
android:textSize="12sp"
android:textColor="?attr/textColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<View
android:layout_margin="5dp"
android:layout_gravity="center_vertical"
android:background="?attr/grayTextColor"
android:layout_width="10dp"
android:layout_height="10dp"/>
android:layout_height="10dp" />
<TextView
android:id="@+id/download_free_txt"
android:textSize="12sp"
@ -104,11 +113,11 @@
tools:text="Free • 30.58GB"
android:textColor="?attr/textColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:nextFocusLeft="@id/nav_rail_view"
android:descendantFocusability="afterDescendants"
@ -119,8 +128,8 @@
android:id="@+id/download_list"
android:layout_width="match_parent"
tools:listitem="@layout/download_header_episode"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
android:layout_height="match_parent" />
<TextView
android:id="@+id/text_no_downloads"
android:layout_width="match_parent"
@ -133,7 +142,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toBottomOf="parent" />
<!--
<ProgressBar
@ -155,18 +164,25 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_marginStart="@dimen/loading_margin"
android:layout_marginEnd="@dimen/loading_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/loading_downloads"/>
<include layout="@layout/loading_downloads"/>
<include layout="@layout/loading_downloads"/>
<include layout="@layout/loading_downloads"/>
<include layout="@layout/loading_downloads"/>
<include layout="@layout/loading_downloads"/>
<include layout="@layout/loading_downloads" />
<include layout="@layout/loading_downloads" />
<include layout="@layout/loading_downloads" />
<include layout="@layout/loading_downloads" />
<include layout="@layout/loading_downloads" />
<include layout="@layout/loading_downloads" />
</LinearLayout>
</com.facebook.shimmer.ShimmerFrameLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/layout/fragment_player.xml
View file

@ -88,7 +88,7 @@
android:focusable="true"
android:clickable="true"
android:background="@drawable/video_tap_button_always_white"
android:contentDescription="@string/go_back_img_des"/>
android:contentDescription="@string/go_back_img_des" />
</FrameLayout>
</FrameLayout>

15
app/src/main/res/layout/fragment_result.xml
View file

@ -459,12 +459,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:textStyle="bold"
android:textSize="16sp"
android:text="MyAnimeList"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:visibility="visible"
android:orientation="horizontal"
@ -501,9 +503,11 @@
android:layout_gravity="end|center_vertical"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_gravity="center_vertical"
android:padding="10dp"
@ -521,6 +525,7 @@
android:layout_gravity="center_vertical"
android:layout_marginStart="0dp"
style="@style/BlackButton" />
<TextView
android:layout_gravity="center_vertical"
android:padding="10dp"
@ -539,6 +544,7 @@
android:layout_marginStart="0dp"
style="@style/BlackButton" />
</LinearLayout>
<FrameLayout
android:visibility="gone"
android:paddingTop="12dp"
@ -546,11 +552,12 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/home_parent_item_title"
style="@style/WatchHeaderText"
tools:text="Recommended"
/>
tools:text="Recommended" />
<ImageView
app:tint="?attr/textColor"
android:layout_marginEnd="5dp"
@ -558,8 +565,7 @@
android:src="@drawable/ic_baseline_arrow_forward_24"
android:layout_width="30dp"
android:layout_height="match_parent"
android:contentDescription="@string/home_more_info">
</ImageView>
android:contentDescription="@string/home_more_info" />
</FrameLayout>
</LinearLayout>
@ -580,6 +586,7 @@
android:layout_marginStart="0dp"
android:layout_marginBottom="10dp"
style="@style/WhiteButton" />
<LinearLayout
tools:visibility="gone"
android:layout_marginTop="5dp"

26
app/src/main/res/layout/fragment_search.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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"
@ -10,18 +9,20 @@
android:orientation="vertical"
android:background="?attr/primaryGrayBackground"
android:layout_marginTop="@dimen/navbar_height">
<FrameLayout
android:visibility="visible"
android:layout_margin="10dp"
android:background="@drawable/search_background"
android:layout_width="match_parent"
android:layout_height="45dp"
>
android:layout_height="45dp">
<FrameLayout
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_marginEnd="30dp"
android:layout_height="30dp">
<androidx.appcompat.widget.SearchView
android:nextFocusUp="@id/nav_rail_view"
android:nextFocusRight="@id/search_filter"
@ -43,11 +44,13 @@
android:layout_gravity="center_vertical"
app:iconifiedByDefault="false"
tools:ignore="RtlSymmetry">
<requestFocus/>
<requestFocus />
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/search_loading_bar"
android:layout_width="20dp" android:layout_height="20dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-35dp"
style="@style/Widget.AppCompat.ProgressBar"
android:foregroundTint="@color/white"
@ -61,6 +64,7 @@
-->
</androidx.appcompat.widget.SearchView>
</FrameLayout>
<ImageView
android:nextFocusUp="@id/nav_rail_view"
android:nextFocusRight="@id/main_search"
@ -75,8 +79,7 @@
android:layout_margin="10dp"
android:layout_gravity="end|center_vertical"
app:tint="?attr/textColor"
android:contentDescription="@string/change_providers_img_des">
</ImageView>
android:contentDescription="@string/change_providers_img_des" />
</FrameLayout>
<com.lagradost.cloudstream3.ui.AutofitRecyclerView
@ -93,8 +96,8 @@
android:paddingEnd="8dp"
android:id="@+id/search_autofit_results"
tools:listitem="@layout/search_result_grid"
android:orientation="vertical"
/>
android:orientation="vertical" />
<androidx.recyclerview.widget.RecyclerView
android:nextFocusLeft="@id/nav_rail_view"
android:descendantFocusability="afterDescendants"
@ -103,6 +106,5 @@
android:id="@+id/search_master_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/homepage_parent"
/>
tools:listitem="@layout/homepage_parent" />
</LinearLayout>

18
app/src/main/res/layout/home_episodes_expanded.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
@ -15,27 +14,28 @@
android:padding="12dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<requestFocus/>
<requestFocus />
<TextView
android:id="@+id/home_expanded_text"
style="@style/WatchHeaderText"
tools:text="Trending"
/>
tools:text="Trending" />
<ImageView
android:layout_marginEnd="5dp"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_baseline_keyboard_arrow_down_24"
android:layout_width="30dp"
android:layout_height="match_parent"
android:contentDescription="@string/home_expanded_hide">
</ImageView>
android:contentDescription="@string/home_expanded_hide" />
</FrameLayout>
<com.lagradost.cloudstream3.ui.AutofitRecyclerView
android:descendantFocusability="afterDescendants"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/home_expanded_recycler"
tools:listitem="@layout/search_result_grid"
/>
tools:listitem="@layout/search_result_grid" />
</LinearLayout>

11
app/src/main/res/layout/home_result_big_grid.xml
View file

@ -2,7 +2,9 @@
<!-- android:layout_width="114dp"
android:layout_height="180dp"-->
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView 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:foreground="@drawable/outline_drawable"
android:layout_margin="2dp"
android:layout_width="148dp"
@ -11,9 +13,8 @@
android:elevation="10dp"
app:cardCornerRadius="@dimen/rounded_image_radius"
android:id="@+id/backgroundCard"
app:cardBackgroundColor="?attr/primaryGrayBackground"
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">
app:cardBackgroundColor="?attr/primaryGrayBackground">
<ImageView
android:duplicateParentState="true"
android:id="@+id/imageView"
@ -22,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/search_poster_img_des"/>
android:contentDescription="@string/search_poster_img_des" />
<!--
<LinearLayout
android:orientation="vertical"

36
app/src/main/res/layout/home_result_grid.xml
View file

@ -2,7 +2,9 @@
<!-- android:layout_width="114dp"
android:layout_height="180dp"-->
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView 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:foreground="@drawable/outline_drawable"
android:layout_margin="2dp"
android:layout_width="114dp"
@ -11,9 +13,8 @@
android:elevation="10dp"
app:cardCornerRadius="@dimen/rounded_image_radius"
android:id="@+id/backgroundCard"
app:cardBackgroundColor="?attr/primaryGrayBackground"
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">
app:cardBackgroundColor="?attr/primaryGrayBackground">
<ImageView
android:duplicateParentState="true"
android:id="@+id/imageView"
@ -22,15 +23,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/search_poster_img_des"/>
android:contentDescription="@string/search_poster_img_des" />
<ImageView
android:focusable="false"
android:clickable="false"
android:layout_width="match_parent"
android:layout_height="50dp"
android:src="@drawable/title_shadow"
android:layout_gravity="bottom" tools:ignore="ContentDescription">
</ImageView>
android:layout_gravity="bottom"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -44,15 +47,14 @@
android:maxLines="2"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:ellipsize="end"
/>
android:ellipsize="end" />
<ImageView
android:id="@+id/search_item_download_play"
android:layout_gravity="center"
android:src="@drawable/play_button"
android:layout_width="60dp"
android:layout_height="60dp">
</ImageView>
android:layout_height="60dp" />
<androidx.core.widget.ContentLoadingProgressBar
android:layout_marginBottom="-1.5dp"
@ -63,8 +65,7 @@
android:layout_width="match_parent"
tools:progress="50"
android:layout_gravity="bottom"
android:layout_height="5dp">
</androidx.core.widget.ContentLoadingProgressBar>
android:layout_height="5dp" />
<!--<View
android:id="@+id/search_result_lang"
@ -108,8 +109,9 @@
android:minWidth="50dp"
android:gravity="center"
android:background="@drawable/dub_bg_color"
android:layout_width="wrap_content" android:layout_height="wrap_content">
</TextView>
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/text_is_sub"
android:text="@string/app_subbed_text"
@ -122,7 +124,7 @@
android:minWidth="50dp"
android:gravity="center"
android:background="@drawable/sub_bg_color"
android:layout_width="wrap_content" android:layout_height="wrap_content"
/>
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.cardview.widget.CardView>

33
app/src/main/res/layout/home_select_mainpage.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<ListView
@ -19,8 +19,8 @@
tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
/>
android:layout_rowWeight="1" />
<HorizontalScrollView
android:layout_marginTop="-60dp"
android:paddingStart="10dp"
@ -30,6 +30,7 @@
android:requiresFadingEdge="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
@ -54,36 +55,41 @@
android:id="@+id/home_select_movies"
android:text="@string/movies"
style="@style/RoundedSelectableButton"/>
style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_movies"
android:nextFocusRight="@id/home_select_anime"
android:id="@+id/home_select_tv_series"
android:text="@string/tv_series"
style="@style/RoundedSelectableButton"/>
style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_tv_series"
android:nextFocusRight="@id/home_select_cartoons"
android:id="@+id/home_select_anime"
android:text="@string/anime"
style="@style/RoundedSelectableButton"/>
style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_anime"
android:nextFocusRight="@id/home_select_documentaries"
android:id="@+id/home_select_cartoons"
android:text="@string/cartoons"
style="@style/RoundedSelectableButton"/>
style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_cartoons"
android:id="@+id/home_select_documentaries"
android:text="@string/documentaries"
style="@style/RoundedSelectableButton"/>
style="@style/RoundedSelectableButton" />
</LinearLayout>
</HorizontalScrollView>
<LinearLayout
android:visibility="gone"
android:id="@+id/apply_btt_holder"
@ -98,14 +104,13 @@
android:layout_gravity="center_vertical|end"
android:text="@string/sort_apply"
android:id="@+id/apply_btt"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
<com.google.android.material.button.MaterialButton
style="@style/BlackButton"
android:layout_gravity="center_vertical|end"
android:text="@string/sort_cancel"
android:id="@+id/cancel_btt"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
</LinearLayout>
</LinearLayout>

14
app/src/main/res/layout/homepage_parent.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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:orientation="vertical"
@ -13,11 +12,12 @@
android:padding="12dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/home_parent_item_title"
style="@style/WatchHeaderText"
tools:text="Trending"
/>
tools:text="Trending" />
<ImageView
app:tint="?attr/textColor"
android:layout_marginEnd="5dp"
@ -25,8 +25,7 @@
android:src="@drawable/ic_baseline_arrow_forward_24"
android:layout_width="30dp"
android:layout_height="match_parent"
android:contentDescription="@string/home_more_info">
</ImageView>
android:contentDescription="@string/home_more_info" />
</FrameLayout>
<androidx.recyclerview.widget.RecyclerView
@ -41,6 +40,5 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/home_result_grid"
/>
tools:listitem="@layout/home_result_grid" />
</LinearLayout>

14
app/src/main/res/layout/loading_downloads.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingBottom="@dimen/loading_margin"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/loading_poster"/>
android:layout_height="wrap_content">
<include layout="@layout/loading_poster" />
<LinearLayout
android:layout_marginStart="15dp"
@ -15,7 +15,9 @@
android:layout_width="match_parent"
android:layout_marginEnd="50dp"
android:layout_height="wrap_content">
<include layout="@layout/loading_line"/>
<include layout="@layout/loading_line_short"/>
<include layout="@layout/loading_line" />
<include layout="@layout/loading_line_short" />
</LinearLayout>
</LinearLayout>

56
app/src/main/res/layout/loading_episode.xml
View file

@ -1,37 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="@dimen/loading_margin"
android:paddingBottom="@dimen/loading_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="wrap_content">
<LinearLayout
android:layout_marginBottom="@dimen/loading_margin"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_height="wrap_content">
<!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
<androidx.cardview.widget.CardView
android:background="@color/grayShimmer"
app:cardCornerRadius="@dimen/loading_radius"
android:layout_width="126dp"
android:layout_height="72dp"
android:foreground="@drawable/outline_drawable" />
<LinearLayout
android:layout_marginBottom="@dimen/loading_margin"
android:layout_marginStart="15dp"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginEnd="50dp"
android:layout_height="wrap_content">
<!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
<androidx.cardview.widget.CardView
android:background="@color/grayShimmer"
app:cardCornerRadius="@dimen/loading_radius"
android:layout_width="126dp"
android:layout_height="72dp"
android:foreground="@drawable/outline_drawable"
>
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_marginStart="15dp"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_marginEnd="50dp"
android:layout_height="wrap_content">
<include layout="@layout/loading_line"/>
<include layout="@layout/loading_line_short"/>
</LinearLayout>
<include layout="@layout/loading_line" />
<include layout="@layout/loading_line_short" />
</LinearLayout>
<include layout="@layout/loading_line"/>
<include layout="@layout/loading_line"/>
</LinearLayout>
<include layout="@layout/loading_line" />
<include layout="@layout/loading_line" />
</LinearLayout>

9
app/src/main/res/layout/loading_line.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:cardCornerRadius="@dimen/loading_radius"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/loading_line_height"
android:layout_marginBottom="@dimen/loading_margin"
android:background="@color/grayShimmer"
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="ContentDescription"
xmlns:app="http://schemas.android.com/apk/res-auto"/>
tools:ignore="ContentDescription" />

9
app/src/main/res/layout/loading_line_short.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:cardCornerRadius="@dimen/loading_radius"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="120dp"
android:layout_height="@dimen/loading_line_height"
android:layout_marginBottom="@dimen/loading_margin"
android:background="@color/grayShimmer"
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="ContentDescription"
xmlns:app="http://schemas.android.com/apk/res-auto"/>
tools:ignore="ContentDescription" />

9
app/src/main/res/layout/loading_line_short_center.xml
View file

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:cardCornerRadius="@dimen/loading_radius"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="200dp"
android:layout_gravity="center"
android:layout_height="@dimen/loading_line_height"
android:layout_marginBottom="@dimen/loading_margin"
android:background="@color/grayShimmer"
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="ContentDescription"
xmlns:app="http://schemas.android.com/apk/res-auto"/>
tools:ignore="ContentDescription" />

71
app/src/main/res/layout/loading_list.xml
View file

@ -1,30 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingTop="@dimen/loading_margin"
android:paddingBottom="@dimen/loading_margin"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="200dp" android:layout_width="match_parent">
<include layout="@layout/loading_line_short"/>
android:layout_height="200dp"
android:layout_width="match_parent">
<include layout="@layout/loading_line_short" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">
<include layout="@layout/loading_poster"/>
<View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
<View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
<View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
<View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
<View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
<View android:layout_height="match_parent" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
<View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
<include layout="@layout/loading_poster"/>
android:layout_height="wrap_content">
<include layout="@layout/loading_poster" />
<View
android:layout_height="wrap_content"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
<View
android:layout_height="wrap_content"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
<View
android:layout_height="wrap_content"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
<View
android:layout_height="wrap_content"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
<View
android:layout_height="wrap_content"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
<View
android:layout_height="match_parent"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
<View
android:layout_height="wrap_content"
android:layout_width="@dimen/loading_margin" />
<include layout="@layout/loading_poster" />
</LinearLayout>
</LinearLayout>

9
app/src/main/res/layout/loading_poster.xml
View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:cardCornerRadius="@dimen/loading_radius"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="100dp"
android:layout_height="140dp"
android:background="@color/grayShimmer"
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="ContentDescription"
xmlns:app="http://schemas.android.com/apk/res-auto"/>
tools:ignore="ContentDescription" />

1
app/src/main/res/layout/player_custom_layout.xml
View file

@ -211,6 +211,7 @@
android:id="@+id/player_pause_play_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
app:tint="@color/white"
android:id="@+id/player_pause_play"

482
app/src/main/res/layout/player_custom_layout_tv.xml
View file

@ -1,24 +1,24 @@
<FrameLayout 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:id="@+id/player_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:screenOrientation="landscape"
tools:orientation="vertical"
android:tag="television">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/player_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:screenOrientation="landscape"
tools:orientation="vertical"
android:tag="television">
<FrameLayout
android:id="@+id/subtitle_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:id="@+id/subtitle_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/shadow_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/player_gradient_tv" />
android:id="@+id/shadow_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/player_gradient_tv" />
</FrameLayout>
<!--
<LinearLayout android:layout_width="match_parent"
@ -56,40 +56,40 @@
-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/player_video_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
android:id="@+id/player_video_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
<FrameLayout
android:id="@+id/player_top_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:id="@+id/player_top_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/player_video_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="32dp"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:text="Hello world" />
android:id="@+id/player_video_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="32dp"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:text="Hello world" />
<TextView
android:id="@+id/player_video_title_rez"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="32dp"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="1920x1080" />
android:id="@+id/player_video_title_rez"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="80dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="32dp"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="1920x1080" />
<!-- Removed as it has no use anymore-->
<!--<androidx.mediarouter.app.MediaRouteButton
@ -104,266 +104,266 @@
app:layout_constraintTop_toTopOf="parent" />-->
<FrameLayout
android:id="@+id/player_go_back_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:id="@+id/player_go_back_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:src="@drawable/ic_baseline_arrow_back_24"
app:tint="@android:color/white"
android:contentDescription="@string/go_back_img_des" />
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:src="@drawable/ic_baseline_arrow_back_24"
app:tint="@android:color/white"
android:contentDescription="@string/go_back_img_des" />
<ImageView
android:id="@+id/player_go_back"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/video_tap_button_always_white"
android:clickable="true"
android:contentDescription="@string/go_back_img_des"
android:focusable="true" />
android:id="@+id/player_go_back"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/video_tap_button_always_white"
android:clickable="true"
android:contentDescription="@string/go_back_img_des"
android:focusable="true" />
</FrameLayout>
</FrameLayout>
<!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
<ProgressBar
android:id="@+id/player_buffering"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/player_buffering"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="20dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="20dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<ImageButton
android:id="@id/exo_prev"
style="@style/ExoMediaButton.Previous"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
android:id="@id/exo_prev"
style="@style/ExoMediaButton.Previous"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
<ImageButton
android:id="@id/exo_repeat_toggle"
style="@style/ExoMediaButton"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
android:id="@id/exo_repeat_toggle"
style="@style/ExoMediaButton"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
<ImageButton
android:id="@id/exo_next"
style="@style/ExoMediaButton.Next"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
android:id="@id/exo_next"
style="@style/ExoMediaButton.Next"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
<ImageButton
android:id="@id/exo_vr"
style="@style/ExoMediaButton.VR"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
android:id="@id/exo_vr"
style="@style/ExoMediaButton.VR"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
<ImageButton
android:id="@id/exo_play"
android:layout_width="0dp"
android:layout_height="0dp"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
android:id="@id/exo_play"
android:layout_width="0dp"
android:layout_height="0dp"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
<ImageButton
android:id="@id/exo_pause"
android:layout_width="0dp"
android:layout_height="0dp"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
android:id="@id/exo_pause"
android:layout_width="0dp"
android:layout_height="0dp"
android:tintMode="src_in"
app:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_player_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="64dp"
android:layout_marginEnd="64dp"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/player_video_bar"
android:id="@+id/bottom_player_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_marginStart="64dp"
android:layout_marginEnd="64dp"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/player_video_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/player_pause_play"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginStart="20dp"
android:background="@drawable/video_tap_button"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusUp="@id/player_go_back"
android:nextFocusDown="@id/player_lock"
android:id="@+id/player_pause_play"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_marginStart="20dp"
android:background="@drawable/video_tap_button"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusUp="@id/player_go_back"
android:nextFocusDown="@id/player_lock"
android:src="@drawable/netflix_pause"
app:tint="@color/player_button_tv"
tools:ignore="ContentDescription" />
android:src="@drawable/netflix_pause"
app:tint="@color/player_button_tv"
tools:ignore="ContentDescription" />
<TextView
android:id="@id/exo_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="end"
android:includeFontPadding="false"
android:minWidth="50dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textColor="@android:color/white"
android:textSize="14sp"
android:textStyle="normal"
tools:text="15:30" />
android:id="@id/exo_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="end"
android:includeFontPadding="false"
android:minWidth="50dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textColor="@android:color/white"
android:textSize="14sp"
android:textStyle="normal"
tools:text="15:30" />
<!--app:buffered_color="@color/videoCache"-->
<com.google.android.exoplayer2.ui.DefaultTimeBar
android:id="@id/exo_progress"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_weight="1"
android:focusable="false"
android:focusableInTouchMode="false"
app:bar_height="2dp"
app:played_color="?attr/colorPrimary"
app:scrubber_color="?attr/colorPrimary"
app:scrubber_dragged_size="26dp"
app:scrubber_enabled_size="24dp"
app:unplayed_color="@color/videoProgress" />
android:id="@id/exo_progress"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_weight="1"
android:focusable="false"
android:focusableInTouchMode="false"
app:bar_height="2dp"
app:played_color="?attr/colorPrimary"
app:scrubber_color="?attr/colorPrimary"
app:scrubber_dragged_size="26dp"
app:scrubber_enabled_size="24dp"
app:unplayed_color="@color/videoProgress" />
<!-- exo_duration-->
<TextView
android:id="@id/exo_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="20dp"
android:includeFontPadding="false"
android:minWidth="50dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textColor="@android:color/white"
android:textSize="14sp"
android:textStyle="normal"
tools:text="23:20" />
android:id="@id/exo_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="20dp"
android:includeFontPadding="false"
android:minWidth="50dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textColor="@android:color/white"
android:textSize="14sp"
android:textStyle="normal"
tools:text="23:20" />
</LinearLayout>
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:layout_gravity="center">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/player_lock"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_skip_episode"
android:nextFocusRight="@id/player_resize_btt"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_lock"
app:icon="@drawable/video_locked" />
android:id="@+id/player_lock"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_skip_episode"
android:nextFocusRight="@id/player_resize_btt"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_lock"
app:icon="@drawable/video_locked" />
<LinearLayout
android:id="@+id/player_lock_holder"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
android:id="@+id/player_lock_holder"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/player_resize_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_lock"
android:nextFocusRight="@id/player_speed_btt"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_aspect_ratio_resize"
app:icon="@drawable/ic_baseline_aspect_ratio_24" />
android:id="@+id/player_resize_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_lock"
android:nextFocusRight="@id/player_speed_btt"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_aspect_ratio_resize"
app:icon="@drawable/ic_baseline_aspect_ratio_24" />
<com.google.android.material.button.MaterialButton
android:id="@+id/player_speed_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_resize_btt"
android:nextFocusRight="@id/player_sources_btt"
android:nextFocusUp="@id/player_pause_play"
app:icon="@drawable/ic_baseline_speed_24"
tools:text="Speed" />
android:id="@+id/player_speed_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_resize_btt"
android:nextFocusRight="@id/player_sources_btt"
android:nextFocusUp="@id/player_pause_play"
app:icon="@drawable/ic_baseline_speed_24"
tools:text="Speed" />
<com.google.android.material.button.MaterialButton
android:id="@+id/player_sources_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_speed_btt"
android:nextFocusRight="@id/player_skip_op"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_source"
app:icon="@drawable/ic_baseline_playlist_play_24" />
android:id="@+id/player_sources_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_speed_btt"
android:nextFocusRight="@id/player_skip_op"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_source"
app:icon="@drawable/ic_baseline_playlist_play_24" />
<com.google.android.material.button.MaterialButton
android:id="@+id/player_skip_op"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_sources_btt"
android:nextFocusRight="@id/player_skip_episode"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_skip_op"
app:icon="@drawable/ic_baseline_fast_forward_24" />
android:id="@+id/player_skip_op"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_sources_btt"
android:nextFocusRight="@id/player_skip_episode"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_skip_op"
app:icon="@drawable/ic_baseline_fast_forward_24" />
<com.google.android.material.button.MaterialButton
android:id="@+id/player_skip_episode"
style="@style/VideoButtonTV"
android:id="@+id/player_skip_episode"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_skip_op"
android:nextFocusRight="@id/player_lock"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/next_episode"
app:icon="@drawable/ic_baseline_skip_next_24" />
android:nextFocusLeft="@id/player_skip_op"
android:nextFocusRight="@id/player_lock"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/next_episode"
app:icon="@drawable/ic_baseline_skip_next_24" />
</LinearLayout>
</LinearLayout>
</HorizontalScrollView>

25
app/src/main/res/layout/provider_list.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:background="?attr/primaryBlackBackground"
@ -27,8 +27,10 @@
tools:text="Search"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<requestFocus/>
<requestFocus />
</com.google.android.material.switchmaterial.SwitchMaterial>
<ListView
android:nextFocusRight="@id/cancel_btt"
android:nextFocusLeft="@id/apply_btt"
@ -44,8 +46,8 @@
tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_rowWeight="1"
/>
android:layout_rowWeight="1" />
<ListView
android:nextFocusRight="@id/cancel_btt"
android:nextFocusLeft="@id/apply_btt"
@ -61,8 +63,8 @@
tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_rowWeight="1"
/>
android:layout_rowWeight="1" />
<LinearLayout
android:id="@+id/apply_btt_holder"
android:orientation="horizontal"
@ -80,8 +82,8 @@
style="@style/WhiteButton"
android:layout_gravity="center_vertical|end"
android:text="@string/sort_apply"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
<com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/apply_btt"
android:nextFocusRight="@id/apply_btt"
@ -90,7 +92,6 @@
style="@style/BlackButton"
android:layout_gravity="center_vertical|end"
android:text="@string/sort_cancel"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
</LinearLayout>
</LinearLayout>

27
app/src/main/res/layout/quick_search.xml
View file

@ -1,19 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<LinearLayout 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:id="@+id/quick_search_root"
android:background="?attr/primaryGrayBackground"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical">
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:visibility="visible"
android:layout_margin="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<ImageView
android:id="@+id/quick_search_back"
android:layout_gravity="center"
@ -23,14 +24,17 @@
app:tint="@android:color/white"
android:layout_width="25dp"
android:layout_height="wrap_content">
<requestFocus/>
<requestFocus />
</ImageView>
<FrameLayout
android:layout_marginStart="10dp"
android:background="@drawable/search_background"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="45dp">
<androidx.appcompat.widget.SearchView
android:nextFocusRight="@id/search_filter"
android:nextFocusLeft="@id/search_filter"
@ -54,7 +58,8 @@
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/quick_search_loading_bar"
android:layout_width="20dp" android:layout_height="20dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="-35dp"
style="@style/Widget.AppCompat.ProgressBar"
android:foregroundTint="@color/white"
@ -69,6 +74,7 @@
</androidx.appcompat.widget.SearchView>
</FrameLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:descendantFocusability="afterDescendants"
@ -76,6 +82,5 @@
android:id="@+id/quick_search_master_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/homepage_parent"
/>
tools:listitem="@layout/homepage_parent" />
</LinearLayout>

45
app/src/main/res/layout/result_episode_large.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView 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"
@ -14,14 +13,15 @@
app:cardBackgroundColor="?attr/boxItemBackground"
android:foreground="@drawable/outline_drawable"
android:layout_marginBottom="10dp"
>
android:layout_marginBottom="10dp">
<LinearLayout
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:padding="10dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:orientation="horizontal"
@ -30,8 +30,8 @@
<androidx.cardview.widget.CardView
android:layout_width="126dp"
android:layout_height="72dp"
android:foreground="@drawable/outline_drawable"
>
android:foreground="@drawable/outline_drawable">
<ImageView
android:nextFocusLeft="@id/result_episode_download"
android:nextFocusRight="@id/episode_holder"
@ -43,15 +43,15 @@
android:scaleType="centerCrop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/episode_poster_img_des">
</ImageView>
android:contentDescription="@string/episode_poster_img_des" />
<ImageView
android:src="@drawable/play_button"
android:layout_gravity="center"
android:layout_width="36dp"
android:layout_height="36dp"
android:contentDescription="@string/play_episode">
</ImageView>
android:contentDescription="@string/play_episode" />
<androidx.core.widget.ContentLoadingProgressBar
android:layout_marginBottom="-1.5dp"
android:id="@+id/episode_progress"
@ -61,9 +61,9 @@
android:layout_width="match_parent"
tools:progress="50"
android:layout_gravity="bottom"
android:layout_height="5dp">
</androidx.core.widget.ContentLoadingProgressBar>
android:layout_height="5dp" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_marginStart="15dp"
android:orientation="vertical"
@ -76,21 +76,22 @@
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:layout_gravity="start"
style="@style/SmallBlackButton"
android:layout_marginEnd="10dp"
android:text="@string/filler"
android:id="@+id/episode_filler" />
<TextView
android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical"
android:id="@+id/episode_text"
tools:text="1. Jobless"
android:textStyle="bold"
android:textColor="?attr/textColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
@ -98,14 +99,15 @@
tools:text="Rated: 8.8"
android:textColor="?attr/grayTextColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
</LinearLayout>
<FrameLayout
android:layout_marginStart="-50dp"
android:layout_gravity="end"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
@ -120,8 +122,8 @@
android:layout_margin="5dp"
android:layout_gravity="end|center_vertical"
android:progress="0"
android:visibility="visible"
/>
android:visibility="visible" />
<ImageView
android:nextFocusLeft="@id/episode_poster"
android:nextFocusRight="@id/episode_holder"
@ -140,13 +142,14 @@
app:tint="?attr/white" />
</FrameLayout>
</LinearLayout>
<TextView
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:id="@+id/episode_descript"
android:textColor="?attr/grayTextColor"
tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. "
android:layout_width="match_parent" android:layout_height="wrap_content">
</TextView>
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.cardview.widget.CardView>

12
app/src/main/res/layout/result_tag.xml
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingLeft="2dp" android:paddingRight="2dp"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:paddingTop="-10dp"
android:layout_marginTop="-4dp"
android:layout_marginBottom="-4dp"
>
android:layout_marginBottom="-4dp">
<!--app:strokeColor="@color/colorAccent"-->
<com.google.android.material.button.MaterialButton

25
app/src/main/res/layout/search_result_compact.xml
View file

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginBottom="0dp"
android:layoutDirection="ltr"
>
android:layoutDirection="ltr">
<androidx.cardview.widget.CardView
android:foreground="?android:attr/selectableItemBackgroundBorderless"
@ -22,13 +20,14 @@
app:cardCornerRadius="@dimen/rounded_image_radius"
app:cardBackgroundColor="?attr/boxItemBackground"
android:clickable="true"
android:focusable="true"
>
android:focusable="true">
<androidx.cardview.widget.CardView
android:elevation="0dp"
app:cardCornerRadius="@dimen/rounded_image_radius"
android:layout_width="54dp"
android:layout_height="match_parent">
<ImageView
android:layout_gravity="left"
android:id="@+id/imageView"
@ -36,7 +35,7 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
tools:ignore="RtlHardcoded"/>
tools:ignore="RtlHardcoded" />
</androidx.cardview.widget.CardView>
<LinearLayout
@ -45,6 +44,7 @@
android:orientation="vertical"
android:layout_gravity="center_vertical"
android:layout_marginStart="64dp">
<TextView
tools:text="@string/no_data"
android:layout_width="match_parent"
@ -53,8 +53,8 @@
android:textColor="?attr/textColor"
android:id="@+id/imageText"
android:textStyle="bold"
android:maxLines="3"
/>
android:maxLines="3" />
<TextView
tools:text="@string/no_data"
android:layout_width="match_parent"
@ -63,8 +63,8 @@
android:id="@+id/imageTextExtra"
android:textSize="13sp"
android:textStyle="bold"
android:maxLines="3"
/>
android:maxLines="3" />
<TextView
tools:text="Rated 4.13"
android:visibility="gone"
@ -72,8 +72,7 @@
android:layout_height="wrap_content"
android:textColor="?attr/colorPrimary"
android:id="@+id/imageTextProvider"
android:maxLines="1"
/>
android:maxLines="1" />
</LinearLayout>
</androidx.cardview.widget.CardView>

66
app/src/main/res/layout/search_result_grid.xml
View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="wrap_content"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:foreground="@drawable/outline_drawable"
android:focusable="true"
android:clickable="true"
android:id="@+id/search_result_root"
>
android:id="@+id/search_result_root">
<androidx.cardview.widget.CardView
android:layout_margin="2dp"
android:layout_width="match_parent"
@ -19,8 +19,7 @@
android:elevation="10dp"
app:cardCornerRadius="@dimen/rounded_image_radius"
android:id="@+id/backgroundCard"
app:cardBackgroundColor="?attr/primaryGrayBackground"
>
app:cardBackgroundColor="?attr/primaryGrayBackground">
<ImageView
android:id="@+id/imageView"
@ -30,15 +29,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/search_poster_img_des"/>
android:contentDescription="@string/search_poster_img_des" />
<ImageView
android:focusable="false"
android:clickable="false"
android:layout_width="match_parent"
android:layout_height="50dp"
android:src="@drawable/title_shadow"
android:layout_gravity="bottom" tools:ignore="ContentDescription">
</ImageView>
android:layout_gravity="bottom"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/imageText"
@ -53,8 +54,7 @@
android:maxLines="2"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:ellipsize="end"
/>
android:ellipsize="end" />
<!--<View
android:id="@+id/search_result_lang"
android:layout_gravity="bottom"
@ -78,21 +78,21 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- <TextView
android:text="Movie"
android:textColor="?attr/textColor"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:paddingTop="4dp"
android:layout_marginBottom="5dp"
android:layout_gravity="end"
android:paddingBottom="8dp"
android:minWidth="50dp"
android:gravity="end"
android:background="@drawable/type_bg_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>-->
<!-- <TextView
android:text="Movie"
android:textColor="?attr/textColor"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:paddingTop="4dp"
android:layout_marginBottom="5dp"
android:layout_gravity="end"
android:paddingBottom="8dp"
android:minWidth="50dp"
android:gravity="end"
android:background="@drawable/type_bg_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>-->
<!--
<ImageView android:id="@+id/text_is_dub" android:tint="?attr/colorPrimary"
@ -113,8 +113,9 @@
android:minWidth="50dp"
android:gravity="center"
android:background="@drawable/dub_bg_color"
android:layout_width="wrap_content" android:layout_height="wrap_content">
</TextView>
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/text_is_sub"
android:text="@string/app_subbed_text"
@ -127,9 +128,8 @@
android:minWidth="50dp"
android:gravity="center"
android:background="@drawable/sub_bg_color"
android:layout_width="wrap_content" android:layout_height="wrap_content"
>
</TextView>
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.cardview.widget.CardView>

25
app/src/main/res/layout/search_result_super_compact.xml
View file

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="3dp"
>
android:layout_marginBottom="3dp">
<androidx.cardview.widget.CardView
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:id="@+id/backgroundCard"
@ -18,14 +17,14 @@
app:cardCornerRadius="@dimen/rounded_image_radius"
app:cardBackgroundColor="?attr/boxItemBackground"
android:clickable="true"
android:focusable="true"
>
android:focusable="true">
<!-- USING CROP RATIO (182/268), centerCrop for fill -->
<androidx.cardview.widget.CardView
app:cardCornerRadius="@dimen/rounded_image_radius"
android:layout_width="35dp"
android:elevation="0dp"
android:layout_height="match_parent">
<ImageView
android:layout_gravity="left"
android:id="@+id/imageView"
@ -34,7 +33,7 @@
android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
tools:ignore="RtlHardcoded"
android:contentDescription="@string/search_poster_img_des"/>
android:contentDescription="@string/search_poster_img_des" />
</androidx.cardview.widget.CardView>
<LinearLayout
@ -43,6 +42,7 @@
android:orientation="vertical"
android:layout_gravity="center_vertical"
android:layout_marginStart="45dp">
<TextView
tools:text="@string/no_data"
android:layout_width="match_parent"
@ -51,8 +51,8 @@
android:textColor="?attr/textColor"
android:id="@+id/imageText"
android:textStyle="normal"
android:maxLines="3"
/>
android:maxLines="3" />
<TextView
tools:text="@string/no_data"
android:layout_width="match_parent"
@ -62,8 +62,8 @@
android:id="@+id/imageTextExtra"
android:textSize="13sp"
android:textStyle="bold"
android:maxLines="3"
/>
android:maxLines="3" />
<TextView
tools:text="Rated 4.13"
android:visibility="gone"
@ -71,8 +71,7 @@
android:layout_height="wrap_content"
android:textColor="?attr/colorPrimary"
android:id="@+id/imageTextProvider"
android:maxLines="1"
/>
android:maxLines="1" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

20
app/src/main/res/layout/sort_bottom_sheet.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
@ -12,6 +11,7 @@
android:layout_height="0dp"
android:orientation="vertical"
android:layout_weight="50">
<TextView
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@ -23,8 +23,8 @@
android:textColor="?attr/textColor"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<ListView
android:layout_marginTop="-10dp"
android:paddingTop="10dp"
@ -34,15 +34,16 @@
tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_rowWeight="1"
/>
android:layout_rowWeight="1" />
</LinearLayout>
<LinearLayout
android:id="@+id/sort_subtitles_holder"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
android:layout_weight="50">
<TextView
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@ -54,8 +55,8 @@
android:textColor="?attr/textColor"
android:layout_rowWeight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<ListView
android:layout_marginTop="-10dp"
android:paddingTop="10dp"
@ -65,7 +66,6 @@
tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="match_parent">
</ListView>
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>

3
app/src/main/res/layout/sort_bottom_single_choice.xml
View file

@ -13,8 +13,7 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView 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"
style="@style/AppTextViewStyle"

72
app/src/main/res/layout/subtitle_settings.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/subs_root"
android:background="?attr/primaryBlackBackground"
>
android:background="?attr/primaryBlackBackground">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:paddingStart="20dp"
android:paddingEnd="20dp"
@ -21,25 +21,26 @@
android:textColor="?attr/textColor"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="75sp">
<FrameLayout android:layout_width="match_parent" android:layout_height="75sp">
<ImageView
android:scaleType="centerCrop"
android:src="@drawable/subtitles_preview_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/preview_background_img_des">
</ImageView>
android:contentDescription="@string/preview_background_img_des" />
<com.google.android.exoplayer2.ui.SubtitleView
android:id="@+id/subtitle_text"
android:layout_width="match_parent"
android:layout_gravity="center"
android:foregroundGravity="center"
android:layout_height="match_parent">
</com.google.android.exoplayer2.ui.SubtitleView>
android:layout_height="match_parent" />
</FrameLayout>
<TextView
@ -49,8 +50,8 @@
android:id="@+id/subs_font"
android:text="@string/subs_font"
style="@style/SettingsItem">
</TextView>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_font"
android:nextFocusDown="@id/subs_text_color"
@ -59,8 +60,8 @@
android:id="@+id/subs_font_size"
android:text="@string/subs_font_size"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_font_size"
android:nextFocusDown="@id/subs_outline_color"
@ -69,8 +70,8 @@
android:id="@+id/subs_text_color"
android:text="@string/subs_text_color"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_text_color"
android:nextFocusDown="@id/subs_background_color"
@ -79,8 +80,8 @@
android:id="@+id/subs_outline_color"
android:text="@string/subs_outline_color"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_outline_color"
android:nextFocusDown="@id/subs_window_color"
@ -89,8 +90,8 @@
android:id="@+id/subs_background_color"
android:text="@string/subs_background_color"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_background_color"
android:nextFocusDown="@id/subs_edge_type"
@ -99,8 +100,8 @@
android:id="@+id/subs_window_color"
android:text="@string/subs_window_color"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_window_color"
android:nextFocusDown="@id/subs_subtitle_elevation"
@ -109,8 +110,8 @@
android:id="@+id/subs_edge_type"
android:text="@string/subs_edge_type"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_edge_type"
android:nextFocusDown="@id/subs_auto_select_language"
@ -119,8 +120,8 @@
android:id="@+id/subs_subtitle_elevation"
android:text="@string/subs_subtitle_elevation"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_subtitle_elevation"
android:nextFocusDown="@id/subs_download_languages"
@ -129,8 +130,8 @@
android:id="@+id/subs_auto_select_language"
android:text="@string/subs_auto_select_language"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:nextFocusUp="@id/subs_auto_select_language"
android:nextFocusDown="@id/apply_btt"
@ -139,8 +140,8 @@
android:id="@+id/subs_download_languages"
android:text="@string/subs_download_languages"
style="@style/SettingsItem"
/>
style="@style/SettingsItem" />
<TextView
android:gravity="center"
android:text="@string/subs_hold_to_reset_to_default"
@ -149,8 +150,7 @@
android:textColor="?attr/textColor"
android:layout_width="match_parent"
android:layout_rowWeight="1"
android:layout_height="wrap_content">
</TextView>
android:layout_height="wrap_content" />
<LinearLayout
android:orientation="horizontal"
@ -168,7 +168,8 @@
android:text="@string/sort_apply"
android:id="@+id/apply_btt"
android:layout_width="wrap_content">
<requestFocus/>
<requestFocus />
</com.google.android.material.button.MaterialButton>
<com.google.android.material.button.MaterialButton
@ -178,8 +179,7 @@
android:layout_gravity="center_vertical|end"
android:text="@string/sort_cancel"
android:id="@+id/cancel_btt"
android:layout_width="wrap_content"
/>
android:layout_width="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>

5
app/src/main/res/layout/toast.xml
View file

@ -1,5 +1,4 @@
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toast_layout_root"
android:orientation="horizontal"
@ -15,6 +14,6 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="?attr/textColor"/>
android:textColor="?attr/textColor" />
</androidx.cardview.widget.CardView>