etc
/
VancedManager
mirror of https://github.com/YTVanced/VancedManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test vanced downloading

This commit is contained in:
X1nto 2020-05-23 21:17:27 +04:00
parent 94941db1b6
commit caba3f7510
18 changed files with 254 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vanced/manager/core/Main.kt
View File

@ -12,6 +12,7 @@ import com.dezlum.codelabs.getjson.GetJson
import com.vanced.manager.R
import com.vanced.manager.core.base.BaseActivity
import zlc.season.rxdownload4.file
import java.io.File
// This activity will NOT be used in manifest
// since MainActivity will extend it
@ -21,7 +22,6 @@ open class Main: BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (ContextCompat.checkSelfPermission(this,
android.Manifest.permission.READ_EXTERNAL_STORAGE) +
ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)

71
app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt
View File

@ -1,10 +1,24 @@
package com.vanced.manager.core.base
import android.annotation.SuppressLint
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Environment
import android.view.View
import android.widget.ProgressBar
import android.widget.Toast
import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.navigation.findNavController
import com.vanced.manager.R
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.subscribeBy
import kotlinx.android.synthetic.main.activity_main.*
import zlc.season.rxdownload4.download
import zlc.season.rxdownload4.file
import zlc.season.rxdownload4.task.Task
import zlc.season.rxdownload4.utils.getFileNameFromUrl
open class BaseFragment : Fragment() {
@ -24,4 +38,61 @@ open class BaseFragment : Fragment() {
}
}
@SuppressLint("CheckResult")
fun downloadSplit(apk: String, apkVar: String, isInstalling: Boolean, loadBar: ProgressBar, navigate: Int) {
val baseurl = "https://x1nto.github.io/VancedFiles/Splits/"
val url: String =
when(apk) {
"theme" -> baseurl + "Theme/" + apkVar + ".apk"
"lang" -> baseurl + "Language/split_config." + apkVar + ".apk"
"arch" -> baseurl + "Config/config." + apkVar + ".apk"
else -> return
}
if (url.file().exists())
url.file().delete()
activity?.filesDir?.path?.let {
Task(url = url, saveName = getFileNameFromUrl(url), savePath = it)
.download()
.observeOn(AndroidSchedulers.mainThread())
.subscribeBy(
onNext = { progress ->
loadBar.visibility = View.VISIBLE
loadBar.progress = progress.percent().toInt()
},
onComplete = {
if (isInstalling) {
//So we should implement installation here.
//That will be done later
}
view?.findNavController()?.navigate(navigate)
},
onError = { throwable ->
Toast.makeText(requireContext(), throwable.toString(), Toast.LENGTH_SHORT).show()
}
)
}
}
fun downloadEn() {
val url = "https://x1nto.github.io/VancedFiles/Splits/Language/split_config.en.apk"
activity?.filesDir?.path?.let {
Task(url = url, saveName = getFileNameFromUrl(url), savePath = it)
.download()
.observeOn(AndroidSchedulers.mainThread())
.subscribeBy(
onNext = {
},
onComplete = {
},
onError = { throwable ->
Toast.makeText(requireContext(), throwable.toString(), Toast.LENGTH_SHORT).show()
}
)
}
}
}

4
app/src/main/java/com/vanced/manager/core/fragments/Home.kt
View File

@ -52,7 +52,7 @@ open class Home : BaseFragment() {
val microgStatus = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
val vancedStatus = pm?.let { isPackageInstalled("com.vanced.android.youtube", it) }
val vancedLatestTxt = view.findViewById<TextView>(R.id.vanced_latest_version)
/*val vancedLatestTxt = view.findViewById<TextView>(R.id.vanced_latest_version)
val microgLatestTxt = view.findViewById<TextView>(R.id.microg_latest_version)
if (GetJson().isConnected(requireContext())) {
@ -64,7 +64,7 @@ open class Home : BaseFragment() {
} else {
vancedLatestTxt.text = getString(R.string.unavailable)
microgLatestTxt.text = getString(R.string.unavailable)
}
}*/
vancedinstallbtn.setOnClickListener {
view.findNavController().navigate(R.id.toInstallThemeFragment)

17
app/src/main/java/com/vanced/manager/core/fragments/LanguageInstall.kt
View File

@ -3,20 +3,25 @@ package com.vanced.manager.core.fragments
import android.os.Bundle
import android.view.View
import android.widget.Button
import androidx.fragment.app.Fragment
import androidx.navigation.findNavController
import android.widget.ProgressBar
import android.widget.RadioGroup
import com.vanced.manager.R
import com.vanced.manager.ui.fragments.LanguageScrollviewFragment
import com.vanced.manager.core.base.BaseFragment
open class LanguageInstall : Fragment() {
open class LanguageInstall : BaseFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val finishButton = getView()?.findViewById(R.id.vanced_install_finish) as Button
val finishButton = view.findViewById<Button>(R.id.vanced_install_finish)
val loadBar = view.findViewById<ProgressBar>(R.id.vanlang_progress)
val langGroup = view.findViewById<RadioGroup>(R.id.lang_radiogroup)
val selectedLangId = langGroup.checkedRadioButtonId
finishButton.setOnClickListener {
view.findNavController().navigate(R.id.action_installTo_homeFragment)
if (selectedLangId.toString() != "en")
downloadEn()
downloadSplit("lang", selectedLangId.toString(), true, loadBar, R.id.action_installTo_homeFragment)
}
}

12
app/src/main/java/com/vanced/manager/core/fragments/ThemeInstall.kt
View File

@ -3,19 +3,25 @@ package com.vanced.manager.core.fragments
import android.os.Bundle
import android.view.View
import android.widget.Button
import android.widget.ProgressBar
import android.widget.RadioGroup
import androidx.fragment.app.Fragment
import androidx.navigation.findNavController
import com.vanced.manager.R
import com.vanced.manager.core.base.BaseFragment
open class ThemeInstall : Fragment() {
open class ThemeInstall : BaseFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val nextButton = getView()?.findViewById(R.id.vanced_next_to_variant) as Button
val nextButton = view.findViewById<Button>(R.id.vanced_next_to_variant)
val loadBar = view.findViewById<ProgressBar>(R.id.vantheme_progress)
val themeGroup = view.findViewById<RadioGroup>(R.id.lang_radiogroup)
val selectedThemeId = themeGroup.checkedRadioButtonId
nextButton.setOnClickListener {
view.findNavController().navigate(R.id.toInstallVariantFragment)
downloadSplit("theme", selectedThemeId.toString(), false, loadBar, R.id.toInstallVariantFragment)
}
}

20
app/src/main/java/com/vanced/manager/core/fragments/VariantInstall.kt
View File

@ -1,21 +1,31 @@
package com.vanced.manager.core.fragments
import android.os.Build
import android.os.Bundle
import android.view.View
import android.widget.Button
import androidx.fragment.app.Fragment
import androidx.navigation.findNavController
import android.widget.ProgressBar
import com.vanced.manager.R
import com.vanced.manager.core.base.BaseFragment
open class VariantInstall : Fragment() {
open class VariantInstall : BaseFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val nextButton = getView()?.findViewById(R.id.vanced_next_to_language) as Button
val nextButton = view.findViewById<Button>(R.id.vanced_next_to_language)
val loadBar = view.findViewById<ProgressBar>(R.id.vanvariant_progress)
nextButton.setOnClickListener {
view.findNavController().navigate(R.id.toInstallLanguageFragment)
val arch =
when {
Build.SUPPORTED_ABIS.contains("x86") -> "x86"
Build.SUPPORTED_ABIS.contains("arm64-v8a") -> "arm64-v8a"
Build.SUPPORTED_ABIS.contains("armeabi-v7a") -> "armeabi-v7a"
else -> "arm"
}
downloadSplit("arch", arch, false, loadBar, R.id.toInstallThemeFragment)
}
}
}

2
app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt
View File

@ -80,6 +80,7 @@ open class ThemedActivity : AppCompatActivity() {
"Red" -> setTheme(R.style.DarkTheme_Red)
"Green" -> setTheme(R.style.DarkTheme_Green)
"Yellow" -> setTheme(R.style.DarkTheme_Yellow)
"Purple" -> setTheme(R.style.DarkTheme_Purple)
}
}
@ -89,6 +90,7 @@ open class ThemedActivity : AppCompatActivity() {
"Red" -> setTheme(R.style.LightTheme_Red)
"Green" -> setTheme(R.style.LightTheme_Green)
"Yellow" -> setTheme(R.style.LightTheme_Yellow)
"Purple" -> setTheme(R.style.LightTheme_Purple)
}
}

2
app/src/main/java/com/vanced/manager/ui/fragments/DevSettingsFragment.kt
View File

@ -39,7 +39,7 @@ class DevSettingsFragment: PreferenceFragmentCompat() {
val archPref: Preference? = findPreference("device_arch")
val supportedAbis: Array<String> = Build.SUPPORTED_ABIS
if (supportedAbis.contains("arm64-v8a") && supportedAbis.contains("x86_64")) {
if (supportedAbis.contains("arm64-v8a") || supportedAbis.contains("x86_64")) {
archPref?.summary = "64bit"
} else {
archPref?.summary = "32bit"

64
app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
View File

@ -8,12 +8,15 @@ import android.net.NetworkCapabilities
import android.net.NetworkRequest
import android.os.Bundle
import android.view.*
import android.widget.Button
import android.widget.TextView
import androidx.core.animation.addListener
import androidx.viewpager2.widget.ViewPager2
import com.dezlum.codelabs.getjson.GetJson
import com.google.android.material.card.MaterialCardView
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
import com.google.gson.JsonObject
import com.vanced.manager.R
import com.vanced.manager.adapter.SectionPageAdapter
import com.vanced.manager.core.fragments.Home
@ -63,7 +66,7 @@ class HomeFragment : Home() {
private fun checkNetwork() {
if (!GetJson().isConnected(requireContext())) {
netAvailable()
netUnavailable()
}
@ -74,13 +77,27 @@ class HomeFragment : Home() {
override fun onLost(network: Network) {
super.onLost(network)
netAvailable()
netUnavailable()
}
override fun onAvailable(network: Network) {
super.onAvailable(network)
val microginstallbtn = view?.findViewById<Button>(R.id.microg_installbtn)
val vancedinstallbtn = view?.findViewById<Button>(R.id.vanced_installbtn)
microginstallbtn?.visibility = View.VISIBLE
vancedinstallbtn?.visibility = View.VISIBLE
val microgLatestTxt = view?.findViewById<TextView>(R.id.microg_latest_version)
val vancedLatestTxt = view?.findViewById<TextView>(R.id.vanced_latest_version)
val vancedVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json")
val microgVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json")
vancedLatestTxt?.text = vancedVer.get("version").asString
microgLatestTxt?.text = microgVer.get("version").asString
activity?.runOnUiThread {
val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
@ -102,28 +119,43 @@ class HomeFragment : Home() {
}
private fun netAvailable() {
private fun netUnavailable() {
val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
if (networkErrorLayout?.visibility != View.VISIBLE) {
val microginstallbtn = view?.findViewById<Button>(R.id.microg_installbtn)
val vancedinstallbtn = view?.findViewById<Button>(R.id.vanced_installbtn)
activity?.runOnUiThread {
microginstallbtn?.visibility = View.GONE
vancedinstallbtn?.visibility = View.GONE
val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", -1f, 0.3f)
val oa3 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0.3f, 0f)
val vancedLatestTxt = view?.findViewById<TextView>(R.id.vanced_latest_version)
val microgLatestTxt = view?.findViewById<TextView>(R.id.microg_latest_version)
if (GetJson().isConnected(requireContext())) {
vancedLatestTxt?.text = getString(R.string.unavailable)
microgLatestTxt?.text = getString(R.string.unavailable)
val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
if (networkErrorLayout?.visibility != View.VISIBLE) {
activity?.runOnUiThread {
val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", -1f, 0.3f)
val oa3 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0.3f, 0f)
oa2.apply {
oa2.addListener(onStart = {
networkErrorLayout?.visibility = View.VISIBLE
})
start()
oa2.apply {
oa2.addListener(onStart = {
networkErrorLayout?.visibility = View.VISIBLE
})
start()
}
oa3.start()
}
oa3.start()
}
}
}
}
private fun connectionStatus() {

9
app/src/main/res/layout/fragment_vanced_language_selection.xml
View File

@ -2,6 +2,7 @@
<com.vanced.manager.ui.core.SlidingConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -52,6 +53,14 @@
android:text="@string/finish"
app:icon="@drawable/ic_done_black_24dp" />
<ProgressBar
android:id="@+id/vanlang_progress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

13
app/src/main/res/layout/fragment_vanced_theme_selection.xml
View File

@ -2,6 +2,7 @@
<com.vanced.manager.ui.core.SlidingConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -26,7 +27,7 @@
android:checkedButton="@id/button_light_dark">
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/button_light_dark"
android:id="@+id/dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
@ -34,7 +35,7 @@
android:fontFamily="@font/exo_semibold"/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/button_light_black"
android:id="@+id/black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
@ -49,6 +50,14 @@
android:text="@string/next"
app:icon="@drawable/ic_keyboard_next" />
<ProgressBar
android:id="@+id/vantheme_progress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

9
app/src/main/res/layout/fragment_vanced_variant_selection.xml
View File

@ -2,6 +2,7 @@
<com.vanced.manager.ui.core.SlidingConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -49,6 +50,14 @@
android:text="@string/next"
app:icon="@drawable/ic_keyboard_next" />
<ProgressBar
android:id="@+id/vanvariant_progress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

63
app/src/main/res/layout/include_language_scrollview.xml
View File

@ -6,19 +6,16 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:fillViewport="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText">
<RadioGroup
android:id="@+id/lang_radiogroup"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:checkedButton="@id/English">
android:checkedButton="@id/en">
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/English"
android:id="@+id/en"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -26,15 +23,15 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Bahasa_Indonesia"
android:id="@+id/in"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Bahasa Indonesia"
android:text="Indonesian"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Catalian"
android:id="@+id/ca"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -42,7 +39,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Deutsch"
android:id="@+id/de"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -50,7 +47,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Spanish"
android:id="@+id/es"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -58,7 +55,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/French"
android:id="@+id/fr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -66,7 +63,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Hrvatski"
android:id="@+id/hr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -74,7 +71,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Italian"
android:id="@+id/it"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -90,15 +87,15 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Nederlands"
android:id="@+id/nl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Nederlands"
android:text="Dutch"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Polish"
android:id="@+id/pl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -106,7 +103,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Portugees"
android:id="@+id/pt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -114,7 +111,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Romanian"
android:id="@+id/ro"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -122,7 +119,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Suomi"
android:id="@+id/fi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -130,7 +127,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Svenska"
android:id="@+id/sv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -138,7 +135,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Tieng"
android:id="@+id/vi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -146,7 +143,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Turkish"
android:id="@+id/tr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -154,7 +151,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Armenian"
android:id="@+id/hy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -162,15 +159,15 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Bulgarian"
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Български (България)"
android:text="Български"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Russian"
android:id="@+id/ru"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -178,7 +175,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Ukrainian"
android:id="@+id/uk"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -186,7 +183,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Arabic"
android:id="@+id/ar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -194,7 +191,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Georgian"
android:id="@+id/ka"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -202,7 +199,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Japanese"
android:id="@+id/ja"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -210,7 +207,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Chinese"
android:id="@+id/zh"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
@ -218,7 +215,7 @@
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Korean"
android:id="@+id/ko"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"

12
app/src/main/res/menu/toolbar_menu.xml
View File

@ -2,16 +2,16 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/toolbar_settings"
android:title="@string/title_about"
android:icon="@drawable/ic_settings_black_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/toolbar_about"
android:title="@string/title_about"
android:icon="@drawable/ic_info_black_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/toolbar_settings"
android:title="@string/title_about"
android:icon="@drawable/ic_settings_black_24dp"
app:showAsAction="ifRoom" />
</menu>

31
app/src/main/res/values-night-v23/themes.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="DarkTheme.Blue" parent="Theme.MaterialComponents.NoActionBar">
<item name="colorPrimary">#1490D7</item>
<item name="colorPrimaryVariant">#2C7EB9</item>
<item name="colorSecondary">#3E78AF</item>
<item name="colorSecondaryVariant">#803E78AF</item>
<item name="colorSurface">#000000</item>
<item name="colorSurfaceVariant">#121111</item>
<item name="colorSurfaceSurfaceVariant">?colorSurface</item>
<item name="colorOnPrimary">#F9F9F9</item>
<item name="colorOnPrimaryVariant">#e8e8e8</item>
<item name="colorOnSecondary">#F9F9F9</item>
<item name="colorOnBackground">?colorOnSurface</item>
<item name="colorError">#CC0047</item>
<item name="colorOnError">#F9F9F9</item>
<item name="colorOnSurface">#444444</item>
<item name="colorOnSurfaceVariant">#FFFFFF</item>
<item name="colorDisabled">#808080</item>
<item name="colorDisabledVariant">#66808080</item>
<item name="iconColor">?colorPrimaryVariant</item>
<item name="toolbarIconColor">?colorOnPrimary</item>
<item name="DialogBG">#111111</item>
<item name="colorBackgroundFloating">#111111</item>
<item name="android:windowBackground">?colorSurface</item>
<item name="android:statusBarColor">#000000</item>
</style>
</resources>

18
app/src/main/res/values-night/themes.xml
View File

@ -49,11 +49,21 @@
<style name="DarkTheme.Yellow" parent="DarkTheme.Blue">
<item name="colorPrimary">#D7AD14</item>
<item name="colorPrimaryVariant">#B9B22C</item>
<item name="colorSecondary">#AFAD3E</item>
<item name="colorSecondaryVariant">#80AFAD3E</item>
<item name="colorPrimary">#ffd500</item>
<item name="colorPrimaryVariant">#A6FFD500</item>
<item name="colorSecondary">#D3B418</item>
<item name="colorSecondaryVariant">#B7D3B418</item>
</style>
<style name="DarkTheme.Purple" parent="DarkTheme.Blue">
<item name="colorPrimary">#9370DB</item>
<item name="colorPrimaryVariant">#B59370DB</item>
<item name="colorSecondary">#734BC7</item>
<item name="colorSecondaryVariant">#9A734BC7</item>
</style>
</resources>

2
app/src/main/res/values/arrays.xml
View File

@ -18,6 +18,7 @@
<item>@string/accent_red</item>
<item>@string/accent_green</item>
<item>@string/accent_yellow</item>
<item>Purple</item>
</string-array>
<string-array name="accent_color_values">
@ -25,6 +26,7 @@
<item>Red</item>
<item>Green</item>
<item>Yellow</item>
<item>Purple</item>
</string-array>
<string-array name="syke">

17
app/src/main/res/values/themes.xml
View File

@ -49,10 +49,19 @@
<style name="LightTheme.Yellow" parent="LightTheme.Blue">
<item name="colorPrimary">#D7AD14</item>
<item name="colorPrimaryVariant">#B9B22C</item>
<item name="colorSecondary">#AFAD3E</item>
<item name="colorSecondaryVariant">#80AFAD3E</item>
<item name="colorPrimary">#ffd500</item>
<item name="colorPrimaryVariant">#A6FFD500</item>
<item name="colorSecondary">#D3B418</item>
<item name="colorSecondaryVariant">#B7D3B418</item>
</style>
<style name="LightTheme.Purple" parent="LightTheme.Blue">
<item name="colorPrimary">#9370DB</item>
<item name="colorPrimaryVariant">#B59370DB</item>
<item name="colorSecondary">#734BC7</item>
<item name="colorSecondaryVariant">#9A734BC7</item>
</style>