recloudstream/cloudstream
3
3
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,11 +1,12 @@
package com.lagradost.cloudstream3.animeproviders package com.lagradost.cloudstream3.animeproviders
import com.lagradost.cloudstream3.* 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 java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
class AnimeflvnetProvider:MainAPI() { class AnimeflvnetProvider : MainAPI() {
companion object { companion object {
fun getType(t: String): TvType { fun getType(t: String): TvType {
return if (t.contains("OVA") || t.contains("Especial")) TvType.ONA return if (t.contains("OVA") || t.contains("Especial")) TvType.ONA
@ -13,10 +14,9 @@ class AnimeflvnetProvider:MainAPI() {
else TvType.Anime else TvType.Anime
} }
} }
override val mainUrl: String
get() = "https://m.animeflv.net" override val mainUrl = "https://m.animeflv.net"
override val name: String override val name = "AnimeFLV"
get() = "AnimeFLV"
override val lang = "es" override val lang = "es"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = true override val hasChromecastSupport = true
@ -27,8 +27,6 @@ class AnimeflvnetProvider:MainAPI() {
TvType.Anime, TvType.Anime,
) )
override suspend fun getMainPage(): HomePageResponse { override suspend fun getMainPage(): HomePageResponse {
val urls = listOf( val urls = listOf(
Pair("$mainUrl/browse?type[]=movie&order=updated", "Peliculas actualizadas"), Pair("$mainUrl/browse?type[]=movie&order=updated", "Peliculas actualizadas"),
@ -50,7 +48,9 @@ class AnimeflvnetProvider:MainAPI() {
TvType.Anime, TvType.Anime,
fixUrl(poster), fixUrl(poster),
null, 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, TvType.Anime,
fixUrl(image), fixUrl(image),
null, 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) return ArrayList(episodes)
@ -87,19 +89,21 @@ class AnimeflvnetProvider:MainAPI() {
override suspend fun load(url: String): LoadResponse { override suspend fun load(url: String): LoadResponse {
val doc = app.get(url).document val doc = app.get(url).document
val title = doc.selectFirst("h1.Title").text() 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 poster = doc.selectFirst(".Image img").attr("src")
val episodes = doc.select("li.Episode").map { li -> val episodes = doc.select("li.Episode").map { li ->
val href = fixUrl(li.selectFirst("a").attr("href")) val href = fixUrl(li.selectFirst("a").attr("href"))
AnimeEpisode( 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 type = doc.selectFirst("span.Type.A").text()
val genre = doc.select("a.Tag") val genre = doc.select("a.Tag")
.map { it?.text()?.trim().toString() } .map { it?.text()?.trim().toString() }
val status = when (doc.selectFirst("article.Anime.Single.Bglg header p strong.Anm-On")?.text()) { val status =
when (doc.selectFirst("article.Anime.Single.Bglg header p strong.Anm-On")?.text()) {
"En emisión" -> ShowStatus.Ongoing "En emisión" -> ShowStatus.Ongoing
"Finalizado" -> ShowStatus.Completed "Finalizado" -> ShowStatus.Completed
else -> null else -> null
@ -112,6 +116,7 @@ class AnimeflvnetProvider:MainAPI() {
tags = genre tags = genre
} }
} }
override suspend fun loadLinks( override suspend fun loadLinks(
data: String, data: String,
isCasting: Boolean, isCasting: Boolean,
@ -121,24 +126,19 @@ class AnimeflvnetProvider:MainAPI() {
//There might be a better way to do this, but this one works //There might be a better way to do this, but this one works
val html = app.get(data).text val html = app.get(data).text
val linkRegex = Regex("""(https:.*?\.html.*)""") val linkRegex = Regex("""(https:.*?\.html.*)""")
val videos = linkRegex.findAll(html).map { val videos = linkRegex.findAll(html).map {
it.value.replace("\\/", "/") it.value.replace("\\/", "/")
}.toList() }.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 return true
} }
} }

47
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.*
import com.lagradost.cloudstream3.extractors.FEmbed import com.lagradost.cloudstream3.extractors.FEmbed
import java.util.*
import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.extractorApis
import com.lagradost.cloudstream3.utils.loadExtractor import com.lagradost.cloudstream3.utils.loadExtractor
import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
class MonoschinosProvider : MainAPI() {
class MonoschinosProvider:MainAPI() {
companion object { companion object {
fun getType(t: String): TvType { fun getType(t: String): TvType {
return if (t.contains("OVA") || t.contains("Especial")) TvType.ONA return if (t.contains("OVA") || t.contains("Especial")) TvType.ONA
@ -20,10 +17,8 @@ class MonoschinosProvider:MainAPI() {
} }
} }
override val mainUrl: String override val mainUrl = "https://monoschinos2.com"
get() = "https://monoschinos2.com" override val name = "Monoschinos"
override val name: String
get() = "Monoschinos"
override val lang = "es" override val lang = "es"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = true override val hasChromecastSupport = true
@ -37,17 +32,24 @@ class MonoschinosProvider:MainAPI() {
override suspend fun getMainPage(): HomePageResponse { override suspend fun getMainPage(): HomePageResponse {
val urls = listOf( val urls = listOf(
Pair("$mainUrl/emision", "En emisión"), 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"), Pair("$mainUrl/animes", "Animes"),
) )
val items = ArrayList<HomePageList>() val items = ArrayList<HomePageList>()
items.add(HomePageList("Capítulos actualizados", app.get(mainUrl, timeout = 120).document.select(".col-6").map{ items.add(
HomePageList(
"Capítulos actualizados",
app.get(mainUrl, timeout = 120).document.select(".col-6").map {
val title = it.selectFirst("p.animetitles").text() val title = it.selectFirst("p.animetitles").text()
val poster = it.selectFirst(".animeimghv").attr("data-src") val poster = it.selectFirst(".animeimghv").attr("data-src")
val epRegex = Regex("episodio-(\\d+)") val epRegex = Regex("episodio-(\\d+)")
val url = it.selectFirst("a").attr("href").replace("ver/","anime/").replace(epRegex,"sub-espanol") val url = it.selectFirst("a").attr("href").replace("ver/", "anime/")
.replace(epRegex, "sub-espanol")
val epNum = it.selectFirst(".positioning h5").text().toIntOrNull() val epNum = it.selectFirst(".positioning h5").text().toIntOrNull()
AnimeSearchResponse( AnimeSearchResponse(
title, title,
@ -56,11 +58,14 @@ class MonoschinosProvider:MainAPI() {
TvType.Anime, TvType.Anime,
poster, poster,
null, 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),
subEpisodes = epNum, subEpisodes = epNum,
dubEpisodes = epNum, dubEpisodes = epNum,
) )
})) })
)
for (i in urls) { for (i in urls) {
try { try {
@ -74,7 +79,9 @@ class MonoschinosProvider:MainAPI() {
TvType.Anime, TvType.Anime,
fixUrl(poster), fixUrl(poster),
null, 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,7 +96,8 @@ class MonoschinosProvider:MainAPI() {
} }
override suspend fun search(query: String): ArrayList<SearchResponse> { override suspend fun search(query: String): ArrayList<SearchResponse> {
val search = app.get("$mainUrl/buscar?q=$query", timeout = 120).document.select(".col-6").map { val search =
app.get("$mainUrl/buscar?q=$query", timeout = 120).document.select(".col-6").map {
val title = it.selectFirst(".seristitles").text() val title = it.selectFirst(".seristitles").text()
val href = fixUrl(it.selectFirst("a").attr("href")) val href = fixUrl(it.selectFirst("a").attr("href"))
val image = it.selectFirst("img.animemainimg").attr("src") val image = it.selectFirst("img.animemainimg").attr("src")
@ -100,17 +108,20 @@ class MonoschinosProvider:MainAPI() {
TvType.Anime, TvType.Anime,
fixUrl(image), fixUrl(image),
null, 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(search) return ArrayList(search)
} }
override suspend fun load(url: String): LoadResponse { override suspend fun load(url: String): LoadResponse {
val doc = app.get(url, timeout = 120).document val doc = app.get(url, timeout = 120).document
val poster = doc.selectFirst(".chapterpic img").attr("src") val poster = doc.selectFirst(".chapterpic img").attr("src")
val title = doc.selectFirst(".chapterdetails h1").text() val title = doc.selectFirst(".chapterdetails h1").text()
val type = doc.selectFirst("div.chapterdetls2").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 genres = doc.select(".breadcrumb-item a").map { it.text() }
val status = when (doc.selectFirst("button.btn1")?.text()) { val status = when (doc.selectFirst("button.btn1")?.text()) {
"Estreno" -> ShowStatus.Ongoing "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.* import java.util.*
class CinecalidadProvider:MainAPI() { class CinecalidadProvider:MainAPI() {
override val mainUrl: String override val mainUrl = "https://cinecalidad.lol"
get() = "https://cinecalidad.lol" override val name = "Cinecalidad"
override val name: String
get() = "Cinecalidad"
override val lang = "es" override val lang = "es"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = 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 override val mainUrl = "https://doramasyt.com"
get() = "https://doramasyt.com" override val name = "DoramasYT"
override val name: String
get() = "DoramasYT"
override val lang = "es" override val lang = "es"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = 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 import java.util.ArrayList
class PeliSmartProvider: MainAPI() { class PeliSmartProvider: MainAPI() {
override val mainUrl: String override val mainUrl = "https://pelismart.com"
get() = "https://pelismart.com" override val name = "PeliSmart"
override val name: String
get() = "PeliSmart"
override val lang = "es" override val lang = "es"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = 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.* import java.util.*
class PelisplusHDProvider:MainAPI() { class PelisplusHDProvider:MainAPI() {
override val mainUrl: String override val mainUrl = "https://pelisplushd.net"
get() = "https://pelisplushd.net" override val name = "PelisplusHD"
override val name: String
get() = "PelisplusHD"
override val lang = "es" override val lang = "es"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = 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"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -14,24 +14,28 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
app:cardCornerRadius="100dp" app:cardCornerRadius="100dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="35dp" android:layout_width="35dp"
android:layout_height="35dp"> android:layout_height="35dp">
<ImageView <ImageView
android:id="@+id/account_profile_picture" android:id="@+id/account_profile_picture"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription"> tools:ignore="ContentDescription" />
</ImageView>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="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 <TextView
android:id="@+id/account_name" android:id="@+id/account_name"
@ -41,8 +45,8 @@
android:textColor="?attr/textColor" android:textColor="?attr/textColor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_rowWeight="1" android:layout_rowWeight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</TextView>
<TextView <TextView
android:id="@+id/account_site" android:id="@+id/account_site"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -51,20 +55,21 @@
android:textColor="?attr/grayTextColor" android:textColor="?attr/grayTextColor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_rowWeight="1" android:layout_rowWeight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</TextView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/account_switch_account" android:id="@+id/account_switch_account"
android:text="@string/switch_account" android:text="@string/switch_account"
style="@style/SettingsItem"> style="@style/SettingsItem" />
</TextView>
<TextView <TextView
android:id="@+id/account_logout" android:id="@+id/account_logout"
android:text="@string/logout" android:text="@string/logout"
style="@style/SettingsItem"> style="@style/SettingsItem">
<requestFocus/>
<requestFocus />
</TextView> </TextView>
</LinearLayout> </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:foreground="?android:attr/selectableItemBackgroundBorderless"
android:orientation="horizontal" android:orientation="horizontal"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools" android:layout_height="wrap_content" android:layout_width="match_parent">
android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -11,19 +12,18 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp"> android:layout_height="30dp">
<ImageView <ImageView
android:id="@+id/account_profile_picture" android:id="@+id/account_profile_picture"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription"> tools:ignore="ContentDescription" />
</ImageView>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <TextView
android:foreground="@null" android:foreground="@null"
android:id="@+id/account_name" android:id="@+id/account_name"
tools:text="Account 1" tools:text="Account 1"
style="@style/SettingsItem"> style="@style/SettingsItem" />
</TextView>
</LinearLayout> </LinearLayout>

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

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

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

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

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

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

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

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

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

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

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -14,8 +13,8 @@
app:cardBackgroundColor="@color/transparent" app:cardBackgroundColor="@color/transparent"
app:cardElevation="0dp" app:cardElevation="0dp"
android:foreground="@drawable/outline_drawable" android:foreground="@drawable/outline_drawable"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp">
>
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/download_child_episode_progress" android:id="@+id/download_child_episode_progress"
@ -26,12 +25,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
tools:progress="50" tools:progress="50"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_height="5dp"> android:layout_height="5dp" />
</androidx.core.widget.ContentLoadingProgressBar>
<GridLayout <GridLayout
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:id="@+id/download_child_episode_play" android:id="@+id/download_child_episode_play"
android:visibility="gone" android:visibility="gone"
@ -39,14 +39,15 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_baseline_play_arrow_24" android:src="@drawable/ic_baseline_play_arrow_24"
android:contentDescription="@string/episode_play_img_des"/> android:contentDescription="@string/episode_play_img_des" />
<LinearLayout <LinearLayout
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="50dp" android:layout_marginEnd="50dp"
android:layout_width="match_parent" android:layout_width="match_parent">
>
<TextView <TextView
android:id="@+id/download_child_episode_text" android:id="@+id/download_child_episode_text"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -62,8 +63,8 @@
android:textColor="?attr/textColor" android:textColor="?attr/textColor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent" />
</TextView>
<TextView <TextView
android:id="@+id/download_child_episode_text_extra" android:id="@+id/download_child_episode_text_extra"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -73,14 +74,15 @@
tools:text="128MB / 237MB" tools:text="128MB / 237MB"
android:textColor="?attr/grayTextColor" android:textColor="?attr/grayTextColor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent" />
</TextView>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:layout_marginStart="-50dp" android:layout_marginStart="-50dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/download_child_episode_progress_downloaded" android:id="@+id/download_child_episode_progress_downloaded"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
@ -95,8 +97,8 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
android:progress="0" android:progress="0"
android:visibility="visible" android:visibility="visible" />
/>
<ImageView <ImageView
android:nextFocusRight="@id/download_child_episode_holder" android:nextFocusRight="@id/download_child_episode_holder"
android:nextFocusLeft="@id/download_child_episode_holder" android:nextFocusLeft="@id/download_child_episode_holder"
@ -112,7 +114,7 @@
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_baseline_play_arrow_24" android:src="@drawable/ic_baseline_play_arrow_24"
app:tint="?attr/textColor" app:tint="?attr/textColor"
android:contentDescription="@string/download"/> android:contentDescription="@string/download" />
</FrameLayout> </FrameLayout>
</GridLayout> </GridLayout>
</androidx.cardview.widget.CardView> </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"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
app:cardBackgroundColor="?attr/boxItemBackground" app:cardBackgroundColor="?attr/boxItemBackground"
android:id="@+id/episode_holder" android:id="@+id/episode_holder"
android:foreground="@drawable/outline_drawable" android:foreground="@drawable/outline_drawable"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp">
>
<LinearLayout <LinearLayout
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -19,17 +18,17 @@
<!--app:cardCornerRadius="@dimen/roundedImageRadius"--> <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="104dp" android:layout_height="104dp">
>
<ImageView <ImageView
android:id="@+id/download_header_poster" android:id="@+id/download_header_poster"
tools:src="@drawable/example_poster" tools:src="@drawable/example_poster"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/episode_poster_img_des"> android:contentDescription="@string/episode_poster_img_des" />
</ImageView>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:orientation="vertical" android:orientation="vertical"
@ -37,21 +36,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginEnd="70dp" android:layout_marginEnd="70dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/download_header_title" android:id="@+id/download_header_title"
tools:text="Perfect Run" tools:text="Perfect Run"
android:textStyle="bold" android:textStyle="bold"
android:textColor="?attr/textColor" android:textColor="?attr/textColor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</TextView>
<TextView <TextView
android:id="@+id/download_header_info" android:id="@+id/download_header_info"
tools:text="1 episode | 285MB" tools:text="1 episode | 285MB"
android:textColor="?attr/grayTextColor" android:textColor="?attr/grayTextColor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</TextView>
</LinearLayout> </LinearLayout>
<ImageView <ImageView
@ -61,13 +60,14 @@
android:id="@+id/download_header_goto_child" android:id="@+id/download_header_goto_child"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:src="@drawable/ic_baseline_keyboard_arrow_right_24" android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
android:contentDescription="@string/download"/> android:contentDescription="@string/download" />
<FrameLayout <FrameLayout
android:layout_marginStart="-50dp" android:layout_marginStart="-50dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -82,8 +82,8 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:progress="0" android:progress="0"
android:visibility="visible" android:visibility="visible" />
/>
<ImageView <ImageView
android:visibility="visible" 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"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
xmlns:app="http://schemas.android.com/apk/res-auto">
<fragment <fragment
android:id="@+id/nav_host_fragment" android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment" android:name="androidx.navigation.fragment.NavHostFragment"
@ -13,6 +14,5 @@
app:layout_constraintWidth="match_parent" app:layout_constraintWidth="match_parent"
app:layout_constraintHeight="match_parent" app:layout_constraintHeight="match_parent"
app:layout_constraintStart_toEndOf="parent" app:layout_constraintStart_toEndOf="parent"
app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toBottomOf="parent" />
/>
</androidx.constraintlayout.widget.ConstraintLayout> </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"?> <?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:background="?attr/primaryGrayBackground"
android:id="@+id/download_child_root" android:id="@+id/download_child_root"
android:orientation="vertical" 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.download.DownloadFragment"> tools:context=".ui.download.DownloadFragment">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/download_child_toolbar" android:id="@+id/download_child_toolbar"
android:paddingTop="@dimen/navbar_height" android:paddingTop="@dimen/navbar_height"
@ -21,8 +22,8 @@
app:navigationIconTint="?attr/iconColor" app:navigationIconTint="?attr/iconColor"
app:titleTextColor="?attr/textColor" app:titleTextColor="?attr/textColor"
app:layout_scrollFlags="scroll|enterAlways" app:layout_scrollFlags="scroll|enterAlways"
android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_width="match_parent"
</com.google.android.material.appbar.MaterialToolbar> android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -34,6 +35,5 @@
tools:listitem="@layout/download_child_episode" tools:listitem="@layout/download_child_episode"
android:id="@+id/download_child_list" android:id="@+id/download_child_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent" />
</androidx.recyclerview.widget.RecyclerView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

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

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

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

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

@ -459,12 +459,14 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:textStyle="bold" android:textStyle="bold"
android:textSize="16sp" android:textSize="16sp"
android:text="MyAnimeList" android:text="MyAnimeList"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:visibility="visible" android:visibility="visible"
android:orientation="horizontal" android:orientation="horizontal"
@ -501,9 +503,11 @@
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -521,6 +525,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="0dp" android:layout_marginStart="0dp"
style="@style/BlackButton" /> style="@style/BlackButton" />
<TextView <TextView
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -539,6 +544,7 @@
android:layout_marginStart="0dp" android:layout_marginStart="0dp"
style="@style/BlackButton" /> style="@style/BlackButton" />
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:visibility="gone" android:visibility="gone"
android:paddingTop="12dp" android:paddingTop="12dp"
@ -546,11 +552,12 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/home_parent_item_title" android:id="@+id/home_parent_item_title"
style="@style/WatchHeaderText" style="@style/WatchHeaderText"
tools:text="Recommended" tools:text="Recommended" />
/>
<ImageView <ImageView
app:tint="?attr/textColor" app:tint="?attr/textColor"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
@ -558,8 +565,7 @@
android:src="@drawable/ic_baseline_arrow_forward_24" android:src="@drawable/ic_baseline_arrow_forward_24"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/home_more_info"> android:contentDescription="@string/home_more_info" />
</ImageView>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
@ -580,6 +586,7 @@
android:layout_marginStart="0dp" android:layout_marginStart="0dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
style="@style/WhiteButton" /> style="@style/WhiteButton" />
<LinearLayout <LinearLayout
tools:visibility="gone" tools:visibility="gone"
android:layout_marginTop="5dp" 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"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -10,18 +9,20 @@
android:orientation="vertical" android:orientation="vertical"
android:background="?attr/primaryGrayBackground" android:background="?attr/primaryGrayBackground"
android:layout_marginTop="@dimen/navbar_height"> android:layout_marginTop="@dimen/navbar_height">
<FrameLayout <FrameLayout
android:visibility="visible" android:visibility="visible"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/search_background" android:background="@drawable/search_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp">
>
<FrameLayout <FrameLayout
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginEnd="30dp" android:layout_marginEnd="30dp"
android:layout_height="30dp"> android:layout_height="30dp">
<androidx.appcompat.widget.SearchView <androidx.appcompat.widget.SearchView
android:nextFocusUp="@id/nav_rail_view" android:nextFocusUp="@id/nav_rail_view"
android:nextFocusRight="@id/search_filter" android:nextFocusRight="@id/search_filter"
@ -43,11 +44,13 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
app:iconifiedByDefault="false" app:iconifiedByDefault="false"
tools:ignore="RtlSymmetry"> tools:ignore="RtlSymmetry">
<requestFocus/>
<requestFocus />
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/search_loading_bar" 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" android:layout_marginStart="-35dp"
style="@style/Widget.AppCompat.ProgressBar" style="@style/Widget.AppCompat.ProgressBar"
android:foregroundTint="@color/white" android:foregroundTint="@color/white"
@ -61,6 +64,7 @@
--> -->
</androidx.appcompat.widget.SearchView> </androidx.appcompat.widget.SearchView>
</FrameLayout> </FrameLayout>
<ImageView <ImageView
android:nextFocusUp="@id/nav_rail_view" android:nextFocusUp="@id/nav_rail_view"
android:nextFocusRight="@id/main_search" android:nextFocusRight="@id/main_search"
@ -75,8 +79,7 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
app:tint="?attr/textColor" app:tint="?attr/textColor"
android:contentDescription="@string/change_providers_img_des"> android:contentDescription="@string/change_providers_img_des" />
</ImageView>
</FrameLayout> </FrameLayout>
<com.lagradost.cloudstream3.ui.AutofitRecyclerView <com.lagradost.cloudstream3.ui.AutofitRecyclerView
@ -93,8 +96,8 @@
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:id="@+id/search_autofit_results" android:id="@+id/search_autofit_results"
tools:listitem="@layout/search_result_grid" tools:listitem="@layout/search_result_grid"
android:orientation="vertical" android:orientation="vertical" />
/>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:nextFocusLeft="@id/nav_rail_view" android:nextFocusLeft="@id/nav_rail_view"
android:descendantFocusability="afterDescendants" android:descendantFocusability="afterDescendants"
@ -103,6 +106,5 @@
android:id="@+id/search_master_recycler" android:id="@+id/search_master_recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:listitem="@layout/homepage_parent" tools:listitem="@layout/homepage_parent" />
/>
</LinearLayout> </LinearLayout>

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

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

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

@ -2,7 +2,9 @@
<!-- android:layout_width="114dp" <!-- android:layout_width="114dp"
android:layout_height="180dp"--> 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:foreground="@drawable/outline_drawable"
android:layout_margin="2dp" android:layout_margin="2dp"
android:layout_width="148dp" android:layout_width="148dp"
@ -11,9 +13,8 @@
android:elevation="10dp" android:elevation="10dp"
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
android:id="@+id/backgroundCard" android:id="@+id/backgroundCard"
app:cardBackgroundColor="?attr/primaryGrayBackground" 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">
<ImageView <ImageView
android:duplicateParentState="true" android:duplicateParentState="true"
android:id="@+id/imageView" android:id="@+id/imageView"
@ -22,7 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/search_poster_img_des"/> android:contentDescription="@string/search_poster_img_des" />
<!-- <!--
<LinearLayout <LinearLayout
android:orientation="vertical" 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_width="114dp"
android:layout_height="180dp"--> 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:foreground="@drawable/outline_drawable"
android:layout_margin="2dp" android:layout_margin="2dp"
android:layout_width="114dp" android:layout_width="114dp"
@ -11,9 +13,8 @@
android:elevation="10dp" android:elevation="10dp"
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
android:id="@+id/backgroundCard" android:id="@+id/backgroundCard"
app:cardBackgroundColor="?attr/primaryGrayBackground" 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">
<ImageView <ImageView
android:duplicateParentState="true" android:duplicateParentState="true"
android:id="@+id/imageView" android:id="@+id/imageView"
@ -22,15 +23,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/search_poster_img_des"/> android:contentDescription="@string/search_poster_img_des" />
<ImageView <ImageView
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:src="@drawable/title_shadow" android:src="@drawable/title_shadow"
android:layout_gravity="bottom" tools:ignore="ContentDescription"> android:layout_gravity="bottom"
</ImageView> tools:ignore="ContentDescription" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -44,15 +47,14 @@
android:maxLines="2" android:maxLines="2"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:ellipsize="end" android:ellipsize="end" />
/>
<ImageView <ImageView
android:id="@+id/search_item_download_play" android:id="@+id/search_item_download_play"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/play_button" android:src="@drawable/play_button"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp"> android:layout_height="60dp" />
</ImageView>
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:layout_marginBottom="-1.5dp" android:layout_marginBottom="-1.5dp"
@ -63,8 +65,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
tools:progress="50" tools:progress="50"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_height="5dp"> android:layout_height="5dp" />
</androidx.core.widget.ContentLoadingProgressBar>
<!--<View <!--<View
android:id="@+id/search_result_lang" android:id="@+id/search_result_lang"
@ -108,8 +109,9 @@
android:minWidth="50dp" android:minWidth="50dp"
android:gravity="center" android:gravity="center"
android:background="@drawable/dub_bg_color" android:background="@drawable/dub_bg_color"
android:layout_width="wrap_content" android:layout_height="wrap_content"> android:layout_width="wrap_content"
</TextView> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/text_is_sub" android:id="@+id/text_is_sub"
android:text="@string/app_subbed_text" android:text="@string/app_subbed_text"
@ -122,7 +124,7 @@
android:minWidth="50dp" android:minWidth="50dp"
android:gravity="center" android:gravity="center"
android:background="@drawable/sub_bg_color" 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> </LinearLayout>
</androidx.cardview.widget.CardView> </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"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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_width="match_parent"
android:layout_height="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"> android:orientation="vertical">
<ListView <ListView
@ -19,8 +19,8 @@
tools:listitem="@layout/sort_bottom_single_choice" tools:listitem="@layout/sort_bottom_single_choice"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_rowWeight="1" android:layout_rowWeight="1" />
/>
<HorizontalScrollView <HorizontalScrollView
android:layout_marginTop="-60dp" android:layout_marginTop="-60dp"
android:paddingStart="10dp" android:paddingStart="10dp"
@ -30,6 +30,7 @@
android:requiresFadingEdge="horizontal" android:requiresFadingEdge="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -54,36 +55,41 @@
android:id="@+id/home_select_movies" android:id="@+id/home_select_movies"
android:text="@string/movies" android:text="@string/movies"
style="@style/RoundedSelectableButton"/> style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_movies" android:nextFocusLeft="@id/home_select_movies"
android:nextFocusRight="@id/home_select_anime" android:nextFocusRight="@id/home_select_anime"
android:id="@+id/home_select_tv_series" android:id="@+id/home_select_tv_series"
android:text="@string/tv_series" android:text="@string/tv_series"
style="@style/RoundedSelectableButton"/> style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_tv_series" android:nextFocusLeft="@id/home_select_tv_series"
android:nextFocusRight="@id/home_select_cartoons" android:nextFocusRight="@id/home_select_cartoons"
android:id="@+id/home_select_anime" android:id="@+id/home_select_anime"
android:text="@string/anime" android:text="@string/anime"
style="@style/RoundedSelectableButton"/> style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_anime" android:nextFocusLeft="@id/home_select_anime"
android:nextFocusRight="@id/home_select_documentaries" android:nextFocusRight="@id/home_select_documentaries"
android:id="@+id/home_select_cartoons" android:id="@+id/home_select_cartoons"
android:text="@string/cartoons" android:text="@string/cartoons"
style="@style/RoundedSelectableButton"/> style="@style/RoundedSelectableButton" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:nextFocusLeft="@id/home_select_cartoons" android:nextFocusLeft="@id/home_select_cartoons"
android:id="@+id/home_select_documentaries" android:id="@+id/home_select_documentaries"
android:text="@string/documentaries" android:text="@string/documentaries"
style="@style/RoundedSelectableButton"/> style="@style/RoundedSelectableButton" />
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
<LinearLayout <LinearLayout
android:visibility="gone" android:visibility="gone"
android:id="@+id/apply_btt_holder" android:id="@+id/apply_btt_holder"
@ -98,14 +104,13 @@
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:text="@string/sort_apply" android:text="@string/sort_apply"
android:id="@+id/apply_btt" android:id="@+id/apply_btt"
android:layout_width="wrap_content" android:layout_width="wrap_content" />
/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/BlackButton" style="@style/BlackButton"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:text="@string/sort_cancel" android:text="@string/sort_cancel"
android:id="@+id/cancel_btt" android:id="@+id/cancel_btt"
android:layout_width="wrap_content" android:layout_width="wrap_content" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

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

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

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

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

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?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:paddingTop="@dimen/loading_margin"
android:paddingBottom="@dimen/loading_margin" android:paddingBottom="@dimen/loading_margin"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content">
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout <LinearLayout
android:layout_marginBottom="@dimen/loading_margin" android:layout_marginBottom="@dimen/loading_margin"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,9 +19,8 @@
app:cardCornerRadius="@dimen/loading_radius" app:cardCornerRadius="@dimen/loading_radius"
android:layout_width="126dp" android:layout_width="126dp"
android:layout_height="72dp" android:layout_height="72dp"
android:foreground="@drawable/outline_drawable" android:foreground="@drawable/outline_drawable" />
>
</androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:orientation="vertical" android:orientation="vertical"
@ -28,10 +28,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginEnd="50dp" android:layout_marginEnd="50dp"
android:layout_height="wrap_content"> 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>
</LinearLayout> </LinearLayout>
<include layout="@layout/loading_line"/>
<include layout="@layout/loading_line"/> <include layout="@layout/loading_line" />
</LinearLayout>
<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"?> <?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" app:cardCornerRadius="@dimen/loading_radius"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/loading_line_height" android:layout_height="@dimen/loading_line_height"
android:layout_marginBottom="@dimen/loading_margin" android:layout_marginBottom="@dimen/loading_margin"
android:background="@color/grayShimmer" android:background="@color/grayShimmer"
xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="ContentDescription" />
tools:ignore="ContentDescription"
xmlns:app="http://schemas.android.com/apk/res-auto"/>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -14,14 +13,15 @@
app:cardBackgroundColor="?attr/boxItemBackground" app:cardBackgroundColor="?attr/boxItemBackground"
android:foreground="@drawable/outline_drawable" android:foreground="@drawable/outline_drawable"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp">
>
<LinearLayout <LinearLayout
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:padding="10dp" android:padding="10dp"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
@ -30,8 +30,8 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="126dp" android:layout_width="126dp"
android:layout_height="72dp" android:layout_height="72dp"
android:foreground="@drawable/outline_drawable" android:foreground="@drawable/outline_drawable">
>
<ImageView <ImageView
android:nextFocusLeft="@id/result_episode_download" android:nextFocusLeft="@id/result_episode_download"
android:nextFocusRight="@id/episode_holder" android:nextFocusRight="@id/episode_holder"
@ -43,15 +43,15 @@
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/episode_poster_img_des"> android:contentDescription="@string/episode_poster_img_des" />
</ImageView>
<ImageView <ImageView
android:src="@drawable/play_button" android:src="@drawable/play_button"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:contentDescription="@string/play_episode"> android:contentDescription="@string/play_episode" />
</ImageView>
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:layout_marginBottom="-1.5dp" android:layout_marginBottom="-1.5dp"
android:id="@+id/episode_progress" android:id="@+id/episode_progress"
@ -61,9 +61,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
tools:progress="50" tools:progress="50"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_height="5dp"> android:layout_height="5dp" />
</androidx.core.widget.ContentLoadingProgressBar>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:orientation="vertical" android:orientation="vertical"
@ -76,12 +76,14 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:layout_gravity="start" android:layout_gravity="start"
style="@style/SmallBlackButton" style="@style/SmallBlackButton"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:text="@string/filler" android:text="@string/filler"
android:id="@+id/episode_filler" /> android:id="@+id/episode_filler" />
<TextView <TextView
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:id="@+id/episode_text" android:id="@+id/episode_text"
@ -89,8 +91,7 @@
android:textStyle="bold" android:textStyle="bold"
android:textColor="?attr/textColor" android:textColor="?attr/textColor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</TextView>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -98,14 +99,15 @@
tools:text="Rated: 8.8" tools:text="Rated: 8.8"
android:textColor="?attr/grayTextColor" android:textColor="?attr/grayTextColor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</TextView>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:layout_marginStart="-50dp" android:layout_marginStart="-50dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.core.widget.ContentLoadingProgressBar <androidx.core.widget.ContentLoadingProgressBar
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -120,8 +122,8 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
android:progress="0" android:progress="0"
android:visibility="visible" android:visibility="visible" />
/>
<ImageView <ImageView
android:nextFocusLeft="@id/episode_poster" android:nextFocusLeft="@id/episode_poster"
android:nextFocusRight="@id/episode_holder" android:nextFocusRight="@id/episode_holder"
@ -140,13 +142,14 @@
app:tint="?attr/white" /> app:tint="?attr/white" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:id="@+id/episode_descript" android:id="@+id/episode_descript"
android:textColor="?attr/grayTextColor" 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. " 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"> android:layout_width="match_parent"
</TextView> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </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"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="2dp"
android:paddingLeft="2dp" android:paddingRight="2dp" android:paddingRight="2dp"
android:paddingTop="-10dp" android:paddingTop="-10dp"
android:layout_marginTop="-4dp" android:layout_marginTop="-4dp"
android:layout_marginBottom="-4dp" android:layout_marginBottom="-4dp">
>
<!--app:strokeColor="@color/colorAccent"--> <!--app:strokeColor="@color/colorAccent"-->
<com.google.android.material.button.MaterialButton <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"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:layoutDirection="ltr" android:layoutDirection="ltr">
>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
@ -22,13 +20,14 @@
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
app:cardBackgroundColor="?attr/boxItemBackground" app:cardBackgroundColor="?attr/boxItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true">
>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:elevation="0dp" android:elevation="0dp"
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
android:layout_width="54dp" android:layout_width="54dp"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:layout_gravity="left" android:layout_gravity="left"
android:id="@+id/imageView" android:id="@+id/imageView"
@ -36,7 +35,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
@ -45,6 +44,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="64dp"> android:layout_marginStart="64dp">
<TextView <TextView
tools:text="@string/no_data" tools:text="@string/no_data"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -53,8 +53,8 @@
android:textColor="?attr/textColor" android:textColor="?attr/textColor"
android:id="@+id/imageText" android:id="@+id/imageText"
android:textStyle="bold" android:textStyle="bold"
android:maxLines="3" android:maxLines="3" />
/>
<TextView <TextView
tools:text="@string/no_data" tools:text="@string/no_data"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -63,8 +63,8 @@
android:id="@+id/imageTextExtra" android:id="@+id/imageTextExtra"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" android:textStyle="bold"
android:maxLines="3" android:maxLines="3" />
/>
<TextView <TextView
tools:text="Rated 4.13" tools:text="Rated 4.13"
android:visibility="gone" android:visibility="gone"
@ -72,8 +72,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?attr/colorPrimary" android:textColor="?attr/colorPrimary"
android:id="@+id/imageTextProvider" android:id="@+id/imageTextProvider"
android:maxLines="1" android:maxLines="1" />
/>
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

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

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:foreground="@drawable/outline_drawable" android:foreground="@drawable/outline_drawable"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
android:id="@+id/search_result_root" android:id="@+id/search_result_root">
>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_margin="2dp" android:layout_margin="2dp"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -19,8 +19,7 @@
android:elevation="10dp" android:elevation="10dp"
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
android:id="@+id/backgroundCard" android:id="@+id/backgroundCard"
app:cardBackgroundColor="?attr/primaryGrayBackground" app:cardBackgroundColor="?attr/primaryGrayBackground">
>
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
@ -30,15 +29,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/search_poster_img_des"/> android:contentDescription="@string/search_poster_img_des" />
<ImageView <ImageView
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:src="@drawable/title_shadow" android:src="@drawable/title_shadow"
android:layout_gravity="bottom" tools:ignore="ContentDescription"> android:layout_gravity="bottom"
</ImageView> tools:ignore="ContentDescription" />
<TextView <TextView
android:id="@+id/imageText" android:id="@+id/imageText"
@ -53,8 +54,7 @@
android:maxLines="2" android:maxLines="2"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:ellipsize="end" android:ellipsize="end" />
/>
<!--<View <!--<View
android:id="@+id/search_result_lang" android:id="@+id/search_result_lang"
android:layout_gravity="bottom" android:layout_gravity="bottom"
@ -113,8 +113,9 @@
android:minWidth="50dp" android:minWidth="50dp"
android:gravity="center" android:gravity="center"
android:background="@drawable/dub_bg_color" android:background="@drawable/dub_bg_color"
android:layout_width="wrap_content" android:layout_height="wrap_content"> android:layout_width="wrap_content"
</TextView> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/text_is_sub" android:id="@+id/text_is_sub"
android:text="@string/app_subbed_text" android:text="@string/app_subbed_text"
@ -127,9 +128,8 @@
android:minWidth="50dp" android:minWidth="50dp"
android:gravity="center" android:gravity="center"
android:background="@drawable/sub_bg_color" 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" />
</TextView>
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </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"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp">
>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:id="@+id/backgroundCard" android:id="@+id/backgroundCard"
@ -18,14 +17,14 @@
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
app:cardBackgroundColor="?attr/boxItemBackground" app:cardBackgroundColor="?attr/boxItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true">
>
<!-- USING CROP RATIO (182/268), centerCrop for fill --> <!-- USING CROP RATIO (182/268), centerCrop for fill -->
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
app:cardCornerRadius="@dimen/rounded_image_radius" app:cardCornerRadius="@dimen/rounded_image_radius"
android:layout_width="35dp" android:layout_width="35dp"
android:elevation="0dp" android:elevation="0dp"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:layout_gravity="left" android:layout_gravity="left"
android:id="@+id/imageView" android:id="@+id/imageView"
@ -34,7 +33,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackgroundBorderless" android:foreground="?android:attr/selectableItemBackgroundBorderless"
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
android:contentDescription="@string/search_poster_img_des"/> android:contentDescription="@string/search_poster_img_des" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
@ -43,6 +42,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="45dp"> android:layout_marginStart="45dp">
<TextView <TextView
tools:text="@string/no_data" tools:text="@string/no_data"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -51,8 +51,8 @@
android:textColor="?attr/textColor" android:textColor="?attr/textColor"
android:id="@+id/imageText" android:id="@+id/imageText"
android:textStyle="normal" android:textStyle="normal"
android:maxLines="3" android:maxLines="3" />
/>
<TextView <TextView
tools:text="@string/no_data" tools:text="@string/no_data"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -62,8 +62,8 @@
android:id="@+id/imageTextExtra" android:id="@+id/imageTextExtra"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" android:textStyle="bold"
android:maxLines="3" android:maxLines="3" />
/>
<TextView <TextView
tools:text="Rated 4.13" tools:text="Rated 4.13"
android:visibility="gone" android:visibility="gone"
@ -71,8 +71,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?attr/colorPrimary" android:textColor="?attr/colorPrimary"
android:id="@+id/imageTextProvider" android:id="@+id/imageTextProvider"
android:maxLines="1" android:maxLines="1" />
/>
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
</LinearLayout> </LinearLayout>

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

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

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

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

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

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