Forgot stuff when merging with main
This commit is contained in:
parent
76ffc77781
commit
551d1e4865
|
|
@ -19,7 +19,7 @@ fun String.execute() = ByteArrayOutputStream().use { baot ->
|
|||
workingDir = projectDir
|
||||
commandLine = this@execute.split(Regex("\\s"))
|
||||
standardOutput = baot
|
||||
}.exitValue == 0)
|
||||
}.exitValue == 0)
|
||||
String(baot.toByteArray()).trim()
|
||||
else null
|
||||
}
|
||||
|
|
@ -47,8 +47,8 @@ android {
|
|||
minSdk = 21
|
||||
targetSdk = 33
|
||||
|
||||
versionCode = 55
|
||||
versionName = "1.0.3"
|
||||
versionCode = 57
|
||||
versionName = "1.0.4"
|
||||
|
||||
resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
|
||||
|
||||
|
|
@ -220,6 +220,9 @@ dependencies {
|
|||
|
||||
// Library/extensions searching with Levenshtein distance
|
||||
implementation("me.xdrop:fuzzywuzzy:1.4.0")
|
||||
|
||||
// color pallette for images -> colors
|
||||
implementation("androidx.palette:palette-ktx:1.0.0")
|
||||
}
|
||||
|
||||
tasks.register("androidSourcesJar", Jar::class) {
|
||||
|
|
|
|||
|
|
@ -2,56 +2,61 @@
|
|||
<resources>
|
||||
<color name="colorPrimary">#FFFFFF</color>
|
||||
<color name="colorPrimarySecond">@color/colorPrimary</color>
|
||||
<color name="colorSearch">#303135</color>
|
||||
<!-- #3444D1 @color/itemBackground -->
|
||||
<color name="colorOngoing">#F53B66</color>
|
||||
<!-- FF8181 -->
|
||||
<color name="colorSearch">#303135</color> <!--#3444D1 @color/itemBackground-->
|
||||
<color name="colorOngoing">#F53B66</color> <!--FF8181-->
|
||||
<color name="colorPrimaryDark">#5F6267</color>
|
||||
<color name="colorAccent">#FFFFFF</color>
|
||||
<!-- 818fff -->
|
||||
<color name="primaryGrayBackground">#2B2C30</color>
|
||||
<!-- 0f0f10 0E0E10 303135 2B2C30 -->
|
||||
<color name="primaryBlackBackground">#111111</color>
|
||||
<!-- 1C1C20 191a1f 19181E 202125 1C1C20 -->
|
||||
<color name="iconGrayBackground">#1C1C20</color>
|
||||
<!-- 141419 202125 -->
|
||||
<color name="boxItemBackground">#161616</color>
|
||||
<!-- 17171B 1B1B20 -->
|
||||
<color name="textColor">#e9eaee</color>
|
||||
<!-- FFF -->
|
||||
<color name="grayTextColor">#9ba0a4</color>
|
||||
<!-- 5e5f62 -->
|
||||
<color name="grayShimmer">#DCDCDC</color>
|
||||
<!-- 5e5f62 -->
|
||||
<color name="searchColorTransparent">#1AFFFFFF</color>
|
||||
<!-- DADADA -->
|
||||
<color name="colorAccent">#FFFFFF</color> <!-- 818fff-->
|
||||
|
||||
<color name="primaryGrayBackground">#2B2C30</color> <!--0f0f10 0E0E10 303135 2B2C30-->
|
||||
<color name="primaryBlackBackground">#111111</color> <!--1C1C20 191a1f 19181E 202125 1C1C20-->
|
||||
<color name="iconGrayBackground">#1C1C20</color> <!--141419 202125-->
|
||||
<color name="boxItemBackground">#161616</color> <!-- 17171B 1B1B20-->
|
||||
|
||||
<color name="textColor">#e9eaee</color> <!--FFF-->
|
||||
<color name="semiWhite">#1AFFFFFF</color> <!--FFF-->
|
||||
<color name="grayTextColor">#9ba0a4</color> <!-- 5e5f62-->
|
||||
<color name="grayShimmer">#DCDCDC</color> <!-- 5e5f62-->
|
||||
|
||||
<color name="searchColorTransparent">#1AFFFFFF</color> <!--DADADA-->
|
||||
<color name="transparent">#00000000</color>
|
||||
|
||||
<color name="white">#FFF</color>
|
||||
<color name="black">#000</color>
|
||||
<color name="dubColor">#3d50fa</color>
|
||||
<!-- 3b65f5 f18c82 8294F1 -->
|
||||
|
||||
<color name="whiteText">#FFF</color>
|
||||
<color name="blackText">#000</color>
|
||||
|
||||
<color name="progressBackgroundColor">#1AFFFFFF</color>
|
||||
|
||||
<color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1-->
|
||||
<color name="amoledModeLight">#121213</color>
|
||||
|
||||
<color name="dubColorBg">#1D327A</color>
|
||||
<color name="subColor">#F54A3B</color>
|
||||
<!-- F53B66 FA3D79 -->
|
||||
<color name="subColorText">#571711</color> <!--F53B66 FA3D79-->
|
||||
<color name="subColorBg">#621728</color>
|
||||
<color name="typeColor">#3BF585</color>
|
||||
<color name="adultColor">#F54A3B</color> <!-- same as sub color -->
|
||||
<color name="typeColorText">#BEC8FF</color>
|
||||
<color name="typeColorBg">?attr/colorPrimaryDark</color>
|
||||
<color name="ratingColor">#4C3115</color>
|
||||
<color name="ratingColorBg">#FFA662</color>
|
||||
|
||||
<color name="adultColor">#FF6F63</color> <!-- same as sub color -->
|
||||
|
||||
<color name="video_ripple">#80FFFFFF</color>
|
||||
<color name="video_button_ripple">#32FFFFFF</color>
|
||||
|
||||
<color name="black_overlay">#66000000</color>
|
||||
<color name="darkBarTransparent">#C0121212</color>
|
||||
<color name="skipOpTransparent">#4D121212</color>
|
||||
<color name="darkBar">#121212</color>
|
||||
<color name="videoProgress">#66B5B5B5</color>
|
||||
<!-- 66B5B5B5 -->
|
||||
<!-- <color name="videoCache">#663D50FA</color> -->
|
||||
<!-- 66B5B5B5 -->
|
||||
<color name="iconColor">#9ba0a6</color>
|
||||
<!-- <color name="usedStorageColor">?attr/white</color>#fff -->
|
||||
<!-- <color name="freeStorageColor">?attr/grayTextColor</color> #676767 -->
|
||||
<color name="videoProgress">#66B5B5B5</color> <!--66B5B5B5-->
|
||||
<!--<color name="videoCache">#663D50FA</color>--> <!--66B5B5B5-->
|
||||
|
||||
<!-- Light Mode -->
|
||||
<color name="iconColor">#9ba0a6</color>
|
||||
|
||||
<!-- <color name="usedStorageColor">?attr/white</color>#fff-->
|
||||
<!-- <color name="freeStorageColor">?attr/grayTextColor</color> #676767-->
|
||||
|
||||
<!--Light Mode -->
|
||||
<color name="lightPrimaryGrayBackground">#f1f1f1</color>
|
||||
<color name="lightBitDarkerGrayBackground">#fff</color>
|
||||
<color name="lightGrayBackground">#eeeeee</color>
|
||||
|
|
@ -60,6 +65,7 @@
|
|||
<color name="lightGrayTextColor">#5f6267</color>
|
||||
<color name="lightIconColor">#5f6267</color>
|
||||
|
||||
<!--Other Colors -->
|
||||
<color name="colorPrimaryBlue">#5664B7</color>
|
||||
<color name="colorPrimaryRed">#D50000</color>
|
||||
<color name="colorPrimaryPurple">#6200EA</color> <!-- Burple-->
|
||||
|
|
@ -77,4 +83,4 @@
|
|||
<color name="colorPrimaryCoolBlue">#408cac</color>
|
||||
<color name="colorPrimaryBrown">#622C00</color>
|
||||
<color name="colorPrimaryOrange">#CE8500</color>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,86 +1,92 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen 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">
|
||||
<Preference
|
||||
android:key="@string/locale_key"
|
||||
android:title="@string/app_language"
|
||||
android:icon="@drawable/ic_baseline_language_24" />
|
||||
|
||||
<Preference
|
||||
android:key="@string/override_site_key"
|
||||
android:title="@string/add_site_pref"
|
||||
android:summary="@string/add_site_summary"
|
||||
android:icon="@drawable/ic_baseline_add_24" />
|
||||
android:key="@string/override_site_key"
|
||||
android:title="@string/add_site_pref"
|
||||
android:summary="@string/add_site_summary"
|
||||
android:icon="@drawable/ic_baseline_add_24" />
|
||||
|
||||
<Preference
|
||||
android:key="@string/dns_key"
|
||||
android:title="@string/dns_pref"
|
||||
android:summary="@string/dns_pref_summary"
|
||||
android:icon="@drawable/ic_baseline_dns_24" />
|
||||
android:key="@string/dns_key"
|
||||
android:title="@string/dns_pref"
|
||||
android:summary="@string/dns_pref_summary"
|
||||
android:icon="@drawable/ic_baseline_dns_24" />
|
||||
|
||||
<Preference
|
||||
android:key="@string/download_path_key"
|
||||
android:title="@string/download_path_pref"
|
||||
android:icon="@drawable/netflix_download" />
|
||||
android:key="@string/download_path_key"
|
||||
android:title="@string/download_path_pref"
|
||||
android:icon="@drawable/netflix_download" />
|
||||
|
||||
<Preference
|
||||
android:key="@string/legal_notice_key"
|
||||
android:title="@string/legal_notice"
|
||||
android:icon="@drawable/ic_baseline_warning_24" />
|
||||
android:key="@string/legal_notice_key"
|
||||
android:title="@string/legal_notice"
|
||||
android:icon="@drawable/ic_baseline_warning_24" />
|
||||
|
||||
<Preference
|
||||
android:key="@string/benene_count"
|
||||
android:title="@string/benene"
|
||||
android:icon="@drawable/benene"
|
||||
app:summary="@string/benene_des" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="@string/pref_category_links">
|
||||
|
||||
<Preference
|
||||
android:title="@string/github"
|
||||
android:icon="@drawable/ic_github_logo"
|
||||
app:summary="https://github.com/KillerDogeEmpire/AquaStream">
|
||||
<intent
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/KillerDogeEmpire/AquaStream" />
|
||||
</Preference>
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:title="Main App"
|
||||
android:icon="@drawable/ic_github_logo"
|
||||
app:summary="https://github.com/recloudstream/cloudstream">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/recloudstream/cloudstream" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="Main App"
|
||||
android:icon="@drawable/ic_github_logo"
|
||||
app:summary="https://github.com/recloudstream/cloudstream">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/recloudstream/cloudstream" />
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
<Preference
|
||||
android:title="@string/lightnovel"
|
||||
android:icon="@drawable/quick_novel_icon"
|
||||
app:summary="https://github.com/KillerDogeEmpire/QuickNovel">
|
||||
<intent
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/KillerDogeEmpire/QuickNovel" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="Main Quick Novel"
|
||||
android:icon="@drawable/quick_novel_icon"
|
||||
app:summary="https://github.com/LagradOst/QuickNovel">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/LagradOst/QuickNovel" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="@string/discord_fork"
|
||||
android:icon="@drawable/ic_baseline_discord_24"
|
||||
app:summary="https://discord.gg/W8yeGuTwWQ">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://discord.gg/W8yeGuTwWQ" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="@string/discord"
|
||||
android:icon="@drawable/ic_baseline_discord_24"
|
||||
app:summary="https://discord.gg/5Hus6fM">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://discord.gg/5Hus6fM" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:key="@string/benene_count"
|
||||
android:title="@string/benene"
|
||||
android:icon="@drawable/benene"
|
||||
app:summary="@string/benene_des" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="Main Quick Novel"
|
||||
android:icon="@drawable/quick_novel_icon"
|
||||
app:summary="https://github.com/LagradOst/QuickNovel">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/LagradOst/QuickNovel" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="@string/discord_fork"
|
||||
android:icon="@drawable/ic_baseline_discord_24"
|
||||
app:summary="https://discord.gg/W8yeGuTwWQ">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://discord.gg/W8yeGuTwWQ" />
|
||||
</Preference>
|
||||
<Preference
|
||||
android:title="@string/discord"
|
||||
android:icon="@drawable/ic_baseline_discord_24"
|
||||
app:summary="https://discord.gg/5Hus6fM">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://discord.gg/5Hus6fM" />
|
||||
</Preference>
|
||||
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Loading…
Reference in New Issue