etc/VancedManager
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedManager synced 2024-11-22 19:25:11 +00:00
Code Issues Projects Releases Wiki Activity

New Installer activity, string and resource reorganisation, moved all kotlin files into folders of their categories, added microg uninstall button, hardware acceleration and many more small things

Browse source
This commit is contained in:
X1nto 2020-04-09 21:31:13 +04:00
parent d6826e53e7
commit 4799470e16
42 changed files with 925 additions and 411 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/AndroidManifest.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
package="com.vanced.manager" > package="com.vanced.manager">
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<application <application
android:allowBackup="true" android:allowBackup="true"
@ -10,10 +12,10 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/LightTheme.Blue"> android:theme="@style/LightTheme.Blue"
android:hardwareAccelerated="true">
<activity <activity
android:name=".SplashScreenActivity" android:name=".ui.core.SplashScreenActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/SplashTheme"> android:theme="@style/SplashTheme">
<intent-filter> <intent-filter>
@ -22,17 +24,19 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.MainActivity" android:name=".ui.MainActivity"
android:label="@string/app_name"> android:label="@string/app_name" />
</activity>
<activity
android:name=".ui.VancedInstallActivity"
android:parentActivityName=".ui.MainActivity"
android:label="@string/app_name" />
<activity <activity
android:name=".ui.AboutActivity" android:name=".ui.AboutActivity"
android:parentActivityName=".ui.MainActivity" android:label="@string/app_name"
android:label="@string/app_name"> android:parentActivityName=".ui.MainActivity" />
</activity>
<meta-data <meta-data
android:name="preloaded_fonts" android:name="preloaded_fonts"

14
app/src/main/java/com/vanced/manager/ui/MainActivity.kt
View file

@ -8,9 +8,9 @@ import androidx.appcompat.app.AlertDialog
import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomnavigation.BottomNavigationView
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import com.google.android.material.appbar.MaterialToolbar import com.google.android.material.appbar.MaterialToolbar
import com.vanced.manager.HomeFragment import com.vanced.manager.ui.fragments.HomeFragment
import com.vanced.manager.R import com.vanced.manager.R
import com.vanced.manager.SettingsFragment import com.vanced.manager.ui.fragments.SettingsFragment
import com.vanced.manager.ui.core.ThemeActivity import com.vanced.manager.ui.core.ThemeActivity
class MainActivity : ThemeActivity() { class MainActivity : ThemeActivity() {
@ -18,7 +18,6 @@ class MainActivity : ThemeActivity() {
lateinit var homeFragment: HomeFragment lateinit var homeFragment: HomeFragment
lateinit var settingsFragment: SettingsFragment lateinit var settingsFragment: SettingsFragment
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(null) super.onCreate(null)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
@ -26,7 +25,6 @@ class MainActivity : ThemeActivity() {
val toolbar : MaterialToolbar = findViewById(R.id.home_toolbar) val toolbar : MaterialToolbar = findViewById(R.id.home_toolbar)
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
val prefs = getSharedPreferences("prefs", MODE_PRIVATE) val prefs = getSharedPreferences("prefs", MODE_PRIVATE)
val firstStart = prefs.getBoolean("firstStart", true) val firstStart = prefs.getBoolean("firstStart", true)
if (firstStart) { if (firstStart) {
@ -38,8 +36,8 @@ class MainActivity : ThemeActivity() {
homeFragment = HomeFragment() homeFragment = HomeFragment()
supportFragmentManager supportFragmentManager
.beginTransaction() .beginTransaction()
.replace(R.id.frame_layout, homeFragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.frame_layout, homeFragment)
.commit() .commit()
navView.setOnNavigationItemSelectedListener { item -> navView.setOnNavigationItemSelectedListener { item ->
@ -51,8 +49,8 @@ class MainActivity : ThemeActivity() {
homeFragment = HomeFragment() homeFragment = HomeFragment()
supportFragmentManager supportFragmentManager
.beginTransaction() .beginTransaction()
.replace(R.id.frame_layout, homeFragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.frame_layout, homeFragment)
.commit() .commit()
return@setOnNavigationItemSelectedListener true return@setOnNavigationItemSelectedListener true
} }
@ -61,8 +59,8 @@ class MainActivity : ThemeActivity() {
settingsFragment = SettingsFragment() settingsFragment = SettingsFragment()
supportFragmentManager supportFragmentManager
.beginTransaction() .beginTransaction()
.replace(R.id.frame_layout, settingsFragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.frame_layout, settingsFragment)
.commit() .commit()
return@setOnNavigationItemSelectedListener true return@setOnNavigationItemSelectedListener true
} }
@ -94,7 +92,7 @@ class MainActivity : ThemeActivity() {
.setTitle("Welcome!") .setTitle("Welcome!")
.setMessage("Before we implement a proper security system to check whether app was modified or not, please be sure that you downloaded manager from vanced.app/github") .setMessage("Before we implement a proper security system to check whether app was modified or not, please be sure that you downloaded manager from vanced.app/github")
.setPositiveButton("close" .setPositiveButton("close"
) { dialog, which -> dialog.dismiss() } ) { dialog, _ -> dialog.dismiss() }
.create().show() .create().show()
val prefs = getSharedPreferences("prefs", MODE_PRIVATE) val prefs = getSharedPreferences("prefs", MODE_PRIVATE)

35
app/src/main/java/com/vanced/manager/ui/VancedInstallActivity.kt Normal file
View file

@ -0,0 +1,35 @@
package com.vanced.manager.ui
import android.os.Bundle
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction
import com.google.android.material.appbar.MaterialToolbar
import com.vanced.manager.R
import com.vanced.manager.ui.core.ThemeActivity
import com.vanced.manager.ui.fragments.VancedThemeSelectionFragment
class VancedInstallActivity : ThemeActivity() {
lateinit var vancedThemeSelectionFragment: VancedThemeSelectionFragment
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_vanced_install)
val toolbar : MaterialToolbar = findViewById(R.id.vanced_install_toolbar)
toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
setSupportActionBar(toolbar)
toolbar.setNavigationOnClickListener {
finish()
}
supportActionBar!!.title = "Install"
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
vancedThemeSelectionFragment = VancedThemeSelectionFragment()
supportFragmentManager
.beginTransaction()
.setCustomAnimations(android.R.anim.fade_in, R.animator.fragment_exit)
.replace(R.id.vanced_install_frame, vancedThemeSelectionFragment)
.commit()
}
}

3
app/src/main/java/com/vanced/manager/SplashScreenActivity.kt → app/src/main/java/com/vanced/manager/ui/core/SplashScreenActivity.kt
View file

@ -1,8 +1,9 @@
package com.vanced.manager package com.vanced.manager.ui.core
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.vanced.manager.R
import com.vanced.manager.ui.MainActivity import com.vanced.manager.ui.MainActivity
class SplashScreenActivity : AppCompatActivity() { class SplashScreenActivity : AppCompatActivity() {

5
app/src/main/java/com/vanced/manager/ui/core/Theme.kt
View file

@ -1,6 +1,7 @@
package com.vanced.manager.ui.core package com.vanced.manager.ui.core
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.ActivityManager
import android.content.SharedPreferences import android.content.SharedPreferences
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
@ -16,7 +17,7 @@ open class ThemeActivity : AppCompatActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
pref = PreferenceManager.getDefaultSharedPreferences(this) pref = PreferenceManager.getDefaultSharedPreferences(this)
currentTheme = pref.getString("theme_modes", "").toString() currentTheme = pref.getString("theme_mode", "").toString()
setFinalTheme(currentTheme) setFinalTheme(currentTheme)
@ -24,7 +25,7 @@ open class ThemeActivity : AppCompatActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
val theme = pref.getString("theme_modes", "") val theme = pref.getString("theme_mode", "")
if (currentTheme != theme) if (currentTheme != theme)
recreate() recreate()
} }

85
app/src/main/java/com/vanced/manager/HomeFragment.kt → app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
View file

@ -1,4 +1,4 @@
package com.vanced.manager package com.vanced.manager.ui.fragments
import android.content.ComponentName import android.content.ComponentName
import android.net.Uri import android.net.Uri
@ -10,29 +10,22 @@ import android.view.ViewGroup
import android.widget.Button import android.widget.Button
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.content.Intent import android.content.Intent
import android.content.res.ColorStateList
import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsIntent
import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.vanced.manager.R
import com.vanced.manager.ui.VancedInstallActivity
import com.vanced.manager.ui.MainActivity import com.vanced.manager.ui.MainActivity
/**
* A simple [Fragment] subclass.
*/
class HomeFragment : Fragment() { class HomeFragment : Fragment() {
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View? {
val homefragment = inflater.inflate(R.layout.fragment_home, container, false) return inflater.inflate(R.layout.fragment_home, container, false)
return homefragment
} }
private fun isMicrogInstalled(packageName: String, packageManager: PackageManager): Boolean { private fun isPackageInstalled(packageName: String, packageManager: PackageManager): Boolean {
return try { return try {
packageManager.getPackageInfo(packageName, 0) packageManager.getPackageInfo(packageName, 0)
true true
@ -49,20 +42,32 @@ class HomeFragment : Fragment() {
val builder = CustomTabsIntent.Builder() val builder = CustomTabsIntent.Builder()
val pm = activity?.packageManager val pm = activity?.packageManager
val microguninstallbtn = getView()?.findViewById(R.id.microg_uninstallbtn) as Button
val microgsettingsbtn = getView()?.findViewById(R.id.microg_settingsbtn) as Button
val vancedinstallbtn = getView()?.findViewById(R.id.vanced_installbtn) as Button
val bravebtn = getView()?.findViewById(R.id.brave_button) as Button val bravebtn = getView()?.findViewById(R.id.brave_button) as Button
val websitebtn = getView()?.findViewById(R.id.website_button) as Button val websitebtn = getView()?.findViewById(R.id.website_button) as Button
val microgsettingsbtn = getView()?.findViewById(R.id.microg_settingsbtn) as Button
val discordbtn = getView()?.findViewById(R.id.discordbtn) as Button val discordbtn = getView()?.findViewById(R.id.discordbtn) as Button
val telegrambtn = getView()?.findViewById(R.id.tgbtn) as Button val telegrambtn = getView()?.findViewById(R.id.tgbtn) as Button
val twitterbtn = getView()?.findViewById(R.id.twitterbtn) as Button val twitterbtn = getView()?.findViewById(R.id.twitterbtn) as Button
val redditbtn = getView()?.findViewById(R.id.redditbtn) as Button val redditbtn = getView()?.findViewById(R.id.redditbtn) as Button
val git1btn = getView()?.findViewById(R.id.github_managerbtn) as Button
val git2btn = getView()?.findViewById(R.id.github_botbtn) as Button
val git3btn = getView()?.findViewById(R.id.github_websitebtn) as Button
val microgStatus = pm?.let { isMicrogInstalled("com.mgoogle.android.gms", it) } val microgStatus = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
val vancedStatus = pm?.let { isPackageInstalled("com.vanced.android.youtube", it)}
vancedinstallbtn.setOnClickListener{
val intent = Intent(activity, VancedInstallActivity::class.java)
startActivity(intent)
}
if (microgStatus!!) {
microguninstallbtn.setOnClickListener {
val uri = Uri.parse("package:com.mgoogle.android.gms")
val mgUninstall = Intent(Intent.ACTION_DELETE, uri)
startActivity(mgUninstall)
}
if (microgStatus == true) {
microgsettingsbtn.setOnClickListener { microgsettingsbtn.setOnClickListener {
val intent = Intent() val intent = Intent()
intent.component = ComponentName( intent.component = ComponentName(
@ -74,63 +79,57 @@ class HomeFragment : Fragment() {
} }
else { else {
microgsettingsbtn.visibility = View.INVISIBLE microgsettingsbtn.visibility = View.INVISIBLE
microguninstallbtn.visibility = View.INVISIBLE
} }
bravebtn.setOnClickListener { bravebtn.setOnClickListener {
val braveurl = "https://brave.com/van874" val braveurl = "https://brave.com/van874"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Brave)) builder.setToolbarColor(ContextCompat.getColor(requireContext(),
R.color.Brave
))
val customTabsIntent = builder.build() val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(braveurl)) customTabsIntent.launchUrl(requireContext(), Uri.parse(braveurl))
} }
websitebtn.setOnClickListener { websitebtn.setOnClickListener {
val vancedurl = "https://vanced.app" val vancedurl = "https://vanced.app"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Vanced)) builder.setToolbarColor(ContextCompat.getColor(requireContext(),
R.color.Vanced
))
val customTabsIntent = builder.build() val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(vancedurl)) customTabsIntent.launchUrl(requireContext(), Uri.parse(vancedurl))
} }
discordbtn.setOnClickListener { discordbtn.setOnClickListener {
val discordurl = "https://discord.gg/TUVd7rd" val discordurl = "https://discord.gg/TUVd7rd"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Discord)) builder.setToolbarColor(ContextCompat.getColor(requireContext(),
R.color.Discord
))
val customTabsIntent = builder.build() val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(discordurl)) customTabsIntent.launchUrl(requireContext(), Uri.parse(discordurl))
} }
telegrambtn.setOnClickListener { telegrambtn.setOnClickListener {
val telegramurl = "https://t.me/joinchat/AAAAAEHf-pi4jH1SDIAL4w" val telegramurl = "https://t.me/joinchat/AAAAAEHf-pi4jH1SDIAL4w"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Telegram)) builder.setToolbarColor(ContextCompat.getColor(requireContext(),
R.color.Telegram
))
val customTabsIntent = builder.build() val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(telegramurl)) customTabsIntent.launchUrl(requireContext(), Uri.parse(telegramurl))
} }
twitterbtn.setOnClickListener { twitterbtn.setOnClickListener {
val twitterurl = "https://twitter.com/YTVanced" val twitterurl = "https://twitter.com/YTVanced"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Twitter)) builder.setToolbarColor(ContextCompat.getColor(requireContext(),
R.color.Twitter
))
val customTabsIntent = builder.build() val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(twitterurl)) customTabsIntent.launchUrl(requireContext(), Uri.parse(twitterurl))
} }
redditbtn.setOnClickListener { redditbtn.setOnClickListener {
val redditurl = "https://reddit.com/r/vanced" val redditurl = "https://reddit.com/r/vanced"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Reddit)) builder.setToolbarColor(ContextCompat.getColor(requireContext(),
R.color.Reddit
))
val customTabsIntent = builder.build() val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(redditurl)) customTabsIntent.launchUrl(requireContext(), Uri.parse(redditurl))
} }
git1btn.setOnClickListener {
val gitmanagerurl = "https://github.com/YTVanced/VancedInstaller"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.GitHub))
val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(gitmanagerurl))
}
git2btn.setOnClickListener {
val gitboturl = "https://github.com/YTVanced/VancedHelper"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.GitHub))
val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(gitboturl))
}
git3btn.setOnClickListener {
val gitwebsiteurl = "https://github.com/YTVanced/VancedWebsite"
builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.GitHub))
val customTabsIntent = builder.build()
customTabsIntent.launchUrl(requireContext(), Uri.parse(gitwebsiteurl))
}
} }

24
app/src/main/java/com/vanced/manager/ui/fragments/LanguageScrollviewFragment.kt Normal file
View file

@ -0,0 +1,24 @@
package com.vanced.manager.ui.fragments
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.TextView
import com.vanced.manager.R
/**
* A simple [Fragment] subclass.
*/
class LanguageScrollviewFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_language_scrollview, container, false)
}
}

3
app/src/main/java/com/vanced/manager/MicrogChangelogFragment.kt → app/src/main/java/com/vanced/manager/ui/fragments/MicrogChangelogFragment.kt
View file

@ -1,10 +1,11 @@
package com.vanced.manager package com.vanced.manager.ui.fragments
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.vanced.manager.R
/** /**
* A simple [Fragment] subclass. * A simple [Fragment] subclass.

5
app/src/main/java/com/vanced/manager/SettingsFragment.kt → app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
View file

@ -1,8 +1,9 @@
package com.vanced.manager package com.vanced.manager.ui.fragments
import android.os.Bundle import android.os.Bundle
import androidx.preference.ListPreference import androidx.preference.ListPreference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import com.vanced.manager.R
import com.vanced.manager.ui.MainActivity import com.vanced.manager.ui.MainActivity
class SettingsFragment : PreferenceFragmentCompat() { class SettingsFragment : PreferenceFragmentCompat() {
@ -12,7 +13,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
(activity as MainActivity).supportActionBar?.title = getString(R.string.settings) (activity as MainActivity).supportActionBar?.title = getString(R.string.settings)
val themeSwitch: ListPreference? = findPreference("theme_modes") val themeSwitch: ListPreference? = findPreference("theme_mode")
themeSwitch?.setOnPreferenceChangeListener { _, _ -> themeSwitch?.setOnPreferenceChangeListener { _, _ ->
when (themeSwitch.value){ when (themeSwitch.value){

3
app/src/main/java/com/vanced/manager/VancedChangelogFragment.kt → app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt
View file

@ -1,10 +1,11 @@
package com.vanced.manager package com.vanced.manager.ui.fragments
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.vanced.manager.R
/** /**
* A simple [Fragment] subclass. * A simple [Fragment] subclass.

38
app/src/main/java/com/vanced/manager/ui/fragments/VancedLanguageSelectionFragment.kt Normal file
View file

@ -0,0 +1,38 @@
package com.vanced.manager.ui.fragments
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import com.vanced.manager.R
class VancedLanguageSelectionFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_vanced_language_selection, container, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val fragmentManager = childFragmentManager
val finishButton = getView()?.findViewById(R.id.vanced_install_finish) as Button
finishButton.setOnClickListener {
activity?.finish()
}
fragmentManager
.beginTransaction()
.replace(R.id.language_choose_frame, LanguageScrollviewFragment())
.commit()
}
}

37
app/src/main/java/com/vanced/manager/ui/fragments/VancedThemeSelectionFragment.kt Normal file
View file

@ -0,0 +1,37 @@
package com.vanced.manager.ui.fragments
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.TextView
import androidx.fragment.app.FragmentManager
import com.vanced.manager.R
class VancedThemeSelectionFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_vanced_theme_selection, container, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val fragmentManager = activity?.supportFragmentManager
val nextButton = getView()?.findViewById(R.id.vanced_next_to_variant) as Button
nextButton.setOnClickListener{
fragmentManager
?.beginTransaction()
?.setCustomAnimations(R.animator.fragment_enter, R.animator.fragment_exit)
?.replace(R.id.vanced_install_frame, VancedVariantSelectionFragment())
?.commit()
}
}
}

36
app/src/main/java/com/vanced/manager/ui/fragments/VancedVariantSelectionFragment.kt Normal file
View file

@ -0,0 +1,36 @@
package com.vanced.manager.ui.fragments
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import com.vanced.manager.R
class VancedVariantSelectionFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_vanced_variant_selection, container, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val fragmentManager = activity?.supportFragmentManager
val nextButton = getView()?.findViewById(R.id.vanced_next_to_language) as Button
nextButton.setOnClickListener{
fragmentManager
?.beginTransaction()
?.setCustomAnimations(R.animator.fragment_enter, R.animator.fragment_exit)
?.replace(R.id.vanced_install_frame, VancedLanguageSelectionFragment())
?.commit()
}
}
}

10
app/src/main/res/anim/fragment_enter.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
<translate
android:fromXDelta="100%" android:toXDelta="0%"
android:fromYDelta="0%" android:toYDelta="0%"/>
</set>

10
app/src/main/res/anim/fragment_exit.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
<translate
android:fromXDelta="0%" android:toXDelta="-100%"
android:fromYDelta="0%" android:toYDelta="0%" />
</set>

11
app/src/main/res/animator/fragment_enter.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:duration="600"
android:propertyName="x"
android:valueFrom="1000"
android:valueTo="0"
android:valueType="floatType" />
</set>

11
app/src/main/res/animator/fragment_exit.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:duration="600"
android:propertyName="x"
android:valueFrom="0"
android:valueTo="-1000"
android:valueType="floatType" />
</set>

9
app/src/main/res/drawable/ic_delete_black_24dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector>

9
app/src/main/res/drawable/ic_done_black_24dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>

19
app/src/main/res/drawable/ic_keyboard_next.xml Normal file
View file

@ -0,0 +1,19 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group
android:translateX="25"
android:translateY="25"
android:rotation="180">
<path
android:fillColor="#ffffff"
android:pathData="M21,11H6.83l3.58,-3.59L9,6l-6,6 6,6 1.41,-1.41L6.83,13H21z"/>
</group>
</vector>

9
app/src/main/res/drawable/ic_navigate_next_black_24dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>

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

@ -5,7 +5,8 @@
xmlns:tools="http://schemas.android.com/tools" 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.AboutActivity"> tools:context=".ui.AboutActivity"
android:background="?colorSurface">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -3,6 +3,7 @@
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/container" android:id="@+id/container"
android:background="?colorSurface"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -31,7 +32,7 @@
android:id="@+id/frame_layout" android:id="@+id/frame_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="53dp" android:layout_marginTop="60dp"
android:layout_marginBottom="63dp" android:layout_marginBottom="63dp"
app:layout_constraintBottom_toTopOf="@id/bottom_nav" app:layout_constraintBottom_toTopOf="@id/bottom_nav"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?colorSurface" android:background="?colorSurface"
tools:context=".SplashScreenActivity"> tools:context=".ui.core.SplashScreenActivity">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"

41
app/src/main/res/layout/activity_vanced_install.xml Normal file
View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?colorSurface"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="1dp"
android:background="?colorSurface"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/vanced_install_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="?attr/toolbarBackIcon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@android:color/transparent" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/vanced_install_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="65dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

28
app/src/main/res/layout/fragment_home.xml
View file

@ -9,18 +9,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true" android:fillViewport="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintTop_toTopOf="parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false"
android:orientation="vertical"
android:layout_marginTop="@dimen/twelvedp" android:layout_marginTop="@dimen/twelvedp"
android:background="?colorSurface"> android:background="?colorSurface"
android:clipToPadding="false"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -33,9 +33,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/stdp" android:layout_marginStart="@dimen/stdp"
android:layout_marginEnd="@dimen/stdp" android:layout_marginEnd="@dimen/stdp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<include <include
android:id="@+id/home_microg_wrapper" android:id="@+id/home_microg_wrapper"
@ -45,21 +45,21 @@
android:layout_marginStart="@dimen/stdp" android:layout_marginStart="@dimen/stdp"
android:layout_marginTop="@dimen/stdp" android:layout_marginTop="@dimen/stdp"
android:layout_marginEnd="@dimen/stdp" android:layout_marginEnd="@dimen/stdp"
app:layout_constraintTop_toBottomOf="@+id/home_vanced_wrapper" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/home_vanced_wrapper" />
<include <include
android:id="@+id/home_changelog_wrapper" android:id="@+id/home_changelog_wrapper"
layout="@layout/include_changelogs" layout="@layout/include_changelogs"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/stdp" android:layout_marginStart="@dimen/stdp"
android:layout_marginTop="@dimen/stdp" android:layout_marginTop="@dimen/stdp"
android:layout_marginEnd="@dimen/stdp" android:layout_marginEnd="@dimen/stdp"
app:layout_constraintTop_toBottomOf="@id/home_microg_wrapper" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintTop_toBottomOf="@id/home_microg_wrapper" />
<include <include
@ -70,9 +70,9 @@
android:layout_marginStart="@dimen/stdp" android:layout_marginStart="@dimen/stdp"
android:layout_marginTop="@dimen/stdp" android:layout_marginTop="@dimen/stdp"
android:layout_marginEnd="@dimen/stdp" android:layout_marginEnd="@dimen/stdp"
app:layout_constraintTop_toBottomOf="@+id/home_changelog_wrapper" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/home_changelog_wrapper" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

218
app/src/main/res/layout/fragment_language_scrollview.xml Normal file
View file

@ -0,0 +1,218 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
android:layout_width="match_parent">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="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">
<RadioGroup
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:checkedButton="@id/Bahasa_Indonesian">
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Bahasa_Indonesian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Dark"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Spanish"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/French"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Hrvatski"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Italian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Magyar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Nederlands"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Polish"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Portugees"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Romanian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Suomi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Svenska"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Tieng"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Turkish"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Armenian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Bulgarian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Russian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Ukrainian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Arabic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Georgian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Japanese"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Chinese"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Korean"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/Catalian"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"
android:textSize="18sp" />
</RadioGroup>
</androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -3,9 +3,8 @@
xmlns:tools="http://schemas.android.com/tools" 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=".MicrogChangelogFragment"> tools:context=".ui.fragments.MicrogChangelogFragment">
<!-- TODO: Update blank fragment layout -->
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

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

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" 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=".VancedChangelogFragment"> tools:context=".ui.fragments.VancedChangelogFragment">
<!-- TODO: Update blank fragment layout --> <!-- TODO: Update blank fragment layout -->
<TextView <TextView

56
app/src/main/res/layout/fragment_vanced_language_selection.xml Normal file
View file

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="@dimen/eightdp"
app:cardBackgroundColor="?colorSurfaceVariant"
app:cardElevation="0dp"
app:cardPreventCornerOverlap="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/install_language_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textSize="20sp"
android:fontFamily="@font/exo_bold"
android:text="Choose your preferred language for Vanced"
app:layout_constraintEnd_toEndOf="parent"/>
<FrameLayout
android:id="@+id/language_choose_frame"
android:layout_width="match_parent"
android:layout_height="300dp"
app:layout_constraintTop_toBottomOf="@id/install_language_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/vanced_install_finish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/language_choose_frame"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="10dp"
android:text="Finish"
android:textAllCaps="false"
app:icon="@drawable/ic_done_black_24dp"
app:iconGravity="end"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>

72
app/src/main/res/layout/fragment_vanced_theme_selection.xml Normal file
View file

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="@dimen/eightdp"
app:cardBackgroundColor="?colorSurfaceVariant"
app:cardElevation="0dp"
app:cardPreventCornerOverlap="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/install_theme_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textSize="20sp"
android:fontFamily="@font/exo_bold"
android:text="Choose your preferred theme for Vanced"
app:layout_constraintEnd_toEndOf="parent"/>
<RadioGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/install_theme_title"
app:layout_constraintStart_toStartOf="parent"
android:checkedButton="@id/button_light_dark">
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/button_light_dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="Light + Dark"
android:fontFamily="@font/exo_semibold"/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/button_light_black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:fontFamily="@font/exo_semibold"
android:text="Light + Black"/>
</RadioGroup>
<com.google.android.material.button.MaterialButton
android:id="@+id/vanced_next_to_variant"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="10dp"
android:text="Next"
android:textAllCaps="false"
app:icon="@drawable/ic_keyboard_next"
app:iconGravity="end"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>

70
app/src/main/res/layout/fragment_vanced_variant_selection.xml Normal file
View file

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="@dimen/eightdp"
app:cardBackgroundColor="?colorSurfaceVariant"
app:cardElevation="0dp"
app:cardPreventCornerOverlap="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/install_theme_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textSize="20sp"
android:fontFamily="@font/exo_bold"
android:text="Choose your preferred variant for Vanced"
app:layout_constraintEnd_toEndOf="parent"/>
<RadioGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/install_theme_title"
app:layout_constraintStart_toStartOf="parent">
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/button_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="root"/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/button_nonroot"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="non-root"/>
</RadioGroup>
<com.google.android.material.button.MaterialButton
android:id="@+id/vanced_next_to_language"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="10dp"
android:text="Next"
android:textAllCaps="false"
app:icon="@drawable/ic_keyboard_next"
app:iconGravity="end"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/include_changelogs.xml
View file

@ -24,6 +24,7 @@
android:textColor="?attr/colorOnSurfaceVariant" android:textColor="?attr/colorOnSurfaceVariant"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="4dp"
android:layout_marginStart="@dimen/eightdp"/> android:layout_marginStart="@dimen/eightdp"/>
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
@ -47,7 +48,8 @@
android:id="@+id/viewpager" android:id="@+id/viewpager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/changelog_text"/> app:layout_constraintTop_toBottomOf="@id/changelog_text"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

168
app/src/main/res/layout/include_github_links.xml
View file

@ -1,168 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.card.MaterialCardView
android:id="@+id/github_projects_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp"
android:layout_marginEnd="@dimen/eightdp"
app:cardBackgroundColor="#111111"
app:cardCornerRadius="@dimen/eightdp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center">
<TextView
android:id="@+id/github_projects_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp"
android:layout_marginTop="@dimen/fourdp"
android:fontFamily="@font/exo_semibold"
android:text="@string/github_projects"
android:textColor="#ffffff"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/github_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/github_projects_title"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center">
<LinearLayout
android:id="@+id/github_manager_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/github_bot_layout">
<com.google.android.material.button.MaterialButton
android:id="@+id/github_managerbtn"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/github"
app:iconGravity="textStart"
app:iconPadding="0dp"
android:gravity="center"/>
<TextView
android:id="@+id/github_managertxt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@font/exo_semibold"
android:text="@string/github_manager"
android:textColor="#ffffff" />
</LinearLayout>
<LinearLayout
android:id="@+id/github_bot_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/github_manager_layout"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/github_website_layout">
<com.google.android.material.button.MaterialButton
android:id="@+id/github_botbtn"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:layout_constraintStart_toEndOf="@id/github_managerbtn"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/github_websitebtn"
app:icon="@drawable/github"
app:iconGravity="textStart"
app:iconPadding="0dp"
android:gravity="center"/>
<TextView
android:id="@+id/github_bottxt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:layout_constraintStart_toEndOf="@id/github_managertxt"
app:layout_constraintEnd_toStartOf="@id/github_websitetxt"
app:layout_constraintTop_toTopOf="parent"
android:fontFamily="@font/exo_semibold"
android:text="@string/github_bot"
android:textColor="#ffffff" />
</LinearLayout>
<LinearLayout
android:id="@+id/github_website_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/github_bot_layout"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<com.google.android.material.button.MaterialButton
android:id="@+id/github_websitebtn"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_gravity="end"
app:layout_constraintStart_toEndOf="@id/github_botbtn"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/github"
app:iconGravity="textStart"
app:iconPadding="0dp"
android:gravity="center"/>
<TextView
android:id="@+id/github_websitetxt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:layout_constraintStart_toEndOf="@id/github_bottxt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:fontFamily="@font/exo_semibold"
android:text="@string/github_website"
android:textColor="#ffffff" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout>

38
app/src/main/res/layout/include_microg.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout <layout
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"> xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
@ -14,7 +13,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="81dp"> android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/microg_title" android:id="@+id/microg_title"
@ -25,9 +24,9 @@
android:text="@string/microg" android:text="@string/microg"
android:textColor="?colorPrimary" android:textColor="?colorPrimary"
android:textSize="24sp" android:textSize="24sp"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:layout_editor_absoluteX="47dp" />
<LinearLayout <LinearLayout
android:id="@+id/microg_remote_latest_version" android:id="@+id/microg_remote_latest_version"
@ -35,7 +34,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp" android:layout_marginStart="@dimen/eightdp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/microg_title"> app:layout_constraintTop_toBottomOf="@+id/microg_title"
app:layout_constraintBottom_toTopOf="@id/linearLayout2">
<TextView <TextView
android:id="@+id/microg_latest" android:id="@+id/microg_latest"
@ -63,7 +63,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp" android:layout_marginStart="@dimen/eightdp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/microg_remote_latest_version"> app:layout_constraintTop_toBottomOf="@id/microg_remote_latest_version"
app:layout_constraintBottom_toBottomOf="parent">
<TextView <TextView
android:id="@+id/microg_installed" android:id="@+id/microg_installed"
@ -88,7 +89,7 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/microg_installbtn" android:id="@+id/microg_installbtn"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="116dp" android:layout_width="117dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginEnd="@dimen/eightdp" android:layout_marginEnd="@dimen/eightdp"
android:fontFamily="@font/exo_semibold" android:fontFamily="@font/exo_semibold"
@ -104,15 +105,32 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/microg_settingsbtn" android:id="@+id/microg_settingsbtn"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content" android:layout_width="30dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginEnd="@dimen/eightdp" android:layout_marginEnd="@dimen/eightdp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/exo_semibold" android:fontFamily="@font/exo_semibold"
android:text="@string/settings"
android:textAllCaps="false"
app:backgroundTint="?colorPrimary" app:backgroundTint="?colorPrimary"
app:icon="@drawable/ic_settings_black_24dp" app:icon="@drawable/ic_settings_black_24dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/microg_installbtn"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/microg_uninstallbtn"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="117dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/eightdp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/exo_semibold"
android:text="@string/uninstall"
app:iconPadding="0dp"
android:textAllCaps="false"
app:backgroundTint="?attr/colorError"
app:icon="@drawable/ic_delete_black_24dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/microg_installbtn" /> app:layout_constraintTop_toBottomOf="@id/microg_installbtn" />

21
app/src/main/res/layout/include_useful_links.xml
View file

@ -15,11 +15,11 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/fourdp"> android:paddingBottom="3dp">
<TextView <TextView
android:id="@+id/useful_links_title" android:id="@+id/useful_links_title"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
@ -28,7 +28,8 @@
android:textSize="18sp" android:textSize="18sp"
android:textColor="?attr/colorOnSurfaceVariant" android:textColor="?attr/colorOnSurfaceVariant"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -44,7 +45,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/fourdp"> android:paddingBottom="3dp">
<include <include
android:id="@+id/home_vanced_medias_wrapper" android:id="@+id/home_vanced_medias_wrapper"
@ -91,18 +92,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
<include
android:id="@+id/home_github_projects_wrapper"
layout="@layout/include_github_links"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/twelvedp"
android:layout_marginEnd="@dimen/twelvedp"
android:layout_marginTop="4dp"
app:layout_constraintTop_toBottomOf="@id/website_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>

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

@ -24,10 +24,10 @@
android:text="@string/vanced" android:text="@string/vanced"
android:textColor="?colorPrimary" android:textColor="?colorPrimary"
android:textSize="24sp" android:textSize="24sp"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/thtdp" android:layout_marginStart="@dimen/thtdp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:layout_editor_absoluteX="47dp" />
<LinearLayout <LinearLayout
android:id="@+id/vanced_remote_latest_version" android:id="@+id/vanced_remote_latest_version"
@ -35,7 +35,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp" android:layout_marginStart="@dimen/eightdp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vanced_title"> app:layout_constraintTop_toBottomOf="@+id/vanced_title"
app:layout_constraintBottom_toTopOf="@id/linearLayout2">
<TextView <TextView
android:id="@+id/vanced_latest" android:id="@+id/vanced_latest"
@ -63,7 +64,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp" android:layout_marginStart="@dimen/eightdp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vanced_remote_latest_version"> app:layout_constraintTop_toBottomOf="@id/vanced_remote_latest_version"
app:layout_constraintBottom_toBottomOf="parent">
<TextView <TextView
android:id="@+id/vanced_installed" android:id="@+id/vanced_installed"
@ -89,7 +91,7 @@
android:id="@+id/vanced_installbtn" android:id="@+id/vanced_installbtn"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
app:backgroundTint="?colorPrimary" app:backgroundTint="?colorPrimary"
android:layout_width="116dp" android:layout_width="117dp"
android:layout_height="40dp" android:layout_height="40dp"
android:text="@string/install" android:text="@string/install"
android:textAllCaps="false" android:textAllCaps="false"
@ -101,6 +103,23 @@
android:fontFamily="@font/exo_semibold" android:fontFamily="@font/exo_semibold"
app:icon="@drawable/outline_cloud_download_24"/> app:icon="@drawable/outline_cloud_download_24"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/vanced_uninstallbtn"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="117dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/eightdp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/exo_semibold"
android:text="@string/uninstall"
app:iconPadding="0dp"
android:textAllCaps="false"
app:backgroundTint="?attr/colorError"
app:icon="@drawable/ic_delete_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/vanced_installbtn" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>

168
app/src/main/res/layout/include_vanced_medias.xml
View file

@ -9,7 +9,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp" android:layout_marginStart="@dimen/eightdp"
android:layout_marginEnd="@dimen/eightdp" android:layout_marginEnd="@dimen/eightdp"
android:paddingBottom="2dp" android:paddingTop="@dimen/eightdp"
app:cardBackgroundColor="#6958D0" app:cardBackgroundColor="#6958D0"
app:cardCornerRadius="@dimen/eightdp" app:cardCornerRadius="@dimen/eightdp"
app:cardElevation="0dp"> app:cardElevation="0dp">
@ -24,11 +24,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/eightdp" android:layout_marginStart="@dimen/eightdp"
android:layout_marginTop="4dp" android:layout_marginTop="2dp"
android:fontFamily="@font/exo_semibold" android:fontFamily="@font/exo_semibold"
android:text="@string/vanced_medias" android:text="@string/vanced_medias"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="16sp" android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -36,8 +36,7 @@
android:id="@+id/social_media_buttons" android:id="@+id/social_media_buttons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center"
android:paddingTop="2dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/social_media_title" app:layout_constraintTop_toBottomOf="@id/social_media_title"
@ -45,137 +44,68 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center">
<LinearLayout <com.google.android.material.button.MaterialButton
android:id="@+id/discord_layout" android:id="@+id/discordbtn"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/discord"
app:iconPadding="0dp"
app:iconGravity="textStart"
app:iconTint="#ffffff"
app:layout_constraintEnd_toStartOf="@id/tgbtn"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintEnd_toStartOf="@id/telegram_layout">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/discordbtn" android:id="@+id/tgbtn"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/discord"
app:iconPadding="0dp"
app:iconGravity="textStart"
app:iconTint="#ffffff"/>
<TextView
android:id="@+id/discord_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:fontFamily="@font/exo_semibold"
android:text="@string/discord"
android:textColor="#ffffff"
android:layout_gravity="center"/>
</LinearLayout>
<LinearLayout
android:id="@+id/telegram_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:background="@android:color/transparent"
app:layout_constraintStart_toEndOf="@id/discord_layout" android:backgroundTint="@android:color/transparent"
app:icon="@drawable/telegram"
app:iconPadding="0dp"
app:iconGravity="textStart"
app:iconTint="#ffffff"
app:layout_constraintEnd_toStartOf="@id/twitterbtn"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/twitter_layout"> app:layout_constraintStart_toEndOf="@id/discordbtn"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/tgbtn"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/telegram"
app:iconPadding="0dp"
app:iconGravity="textStart"
app:iconTint="#ffffff" />
<TextView <com.google.android.material.button.MaterialButton
android:id="@+id/telegram_text" android:id="@+id/twitterbtn"
android:layout_width="wrap_content" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="@string/telegram"
android:textColor="#ffffff"
android:layout_gravity="center"/>
</LinearLayout>
<LinearLayout
android:id="@+id/twitter_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:background="@android:color/transparent"
app:layout_constraintStart_toEndOf="@id/telegram_layout" android:backgroundTint="@android:color/transparent"
app:icon="@drawable/twitter"
app:iconPadding="0dp"
app:iconGravity="textStart"
app:iconTint="#ffffff"
app:layout_constraintEnd_toStartOf="@id/redditbtn"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/reddit_layout"> app:layout_constraintStart_toEndOf="@id/tgbtn"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/twitterbtn" android:id="@+id/redditbtn"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/twitter"
app:iconPadding="0dp"
app:iconGravity="textStart"
app:iconTint="#ffffff"/>
<TextView
android:id="@+id/twitter_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="@string/twitter"
android:textColor="#ffffff"
android:layout_gravity="center"/>
</LinearLayout>
<LinearLayout
android:id="@+id/reddit_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:background="@android:color/transparent"
app:layout_constraintStart_toEndOf="@id/twitter_layout" android:backgroundTint="@android:color/transparent"
app:icon="@drawable/ic_reddit"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconTint="#ffffff"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintStart_toEndOf="@id/twitterbtn"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/redditbtn"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@android:color/transparent"
android:backgroundTint="@android:color/transparent"
app:icon="@drawable/ic_reddit"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconTint="#ffffff" />
<TextView
android:id="@+id/reddit_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/exo_semibold"
android:text="@string/reddit"
android:textColor="#ffffff"
android:layout_gravity="center"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/colors.xml
View file

@ -3,7 +3,7 @@
<color name="white">#ffffff</color> <color name="white">#ffffff</color>
<color name="Vanced">#673AB7</color> <color name="Vanced">#673AB7</color>
<color name="YT">#8B0B0B</color> <color name="YT">#8B0B0B</color>
<color name="Brave">#FF0000</color> <color name="Brave">#FF2600</color>
<color name="Discord">#7289DA</color> <color name="Discord">#7289DA</color>
<color name="Twitter">#1DA1F2</color> <color name="Twitter">#1DA1F2</color>
<color name="Telegram">#0088cc</color> <color name="Telegram">#0088cc</color>

4
app/src/main/res/values/strings.xml
View file

@ -24,10 +24,12 @@
<string name="vanced_medias">Vanced on Social Medias</string> <string name="vanced_medias">Vanced on Social Medias</string>
<string name="website">Website</string> <string name="website">Website</string>
<string name="website_text">The official website of Vanced</string> <string name="website_text">The official website of Vanced</string>
<string name="support_us">Support us by downloading Brave</string> <string name="support_us">Support us by downloading Brave</string>
<!-- Settings --> <!-- Settings -->
<string name="theme">Theme</string> <string name="theme">Theme</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources> </resources>

2
app/src/main/res/values/styles.xml
View file

@ -8,7 +8,7 @@
<style name="LightTheme" parent="Theme.MaterialComponents.Light.NoActionBar"> <style name="LightTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:windowBackground">?colorSurface</item> <item name="android:windowBackground">?colorSurface</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">#e0e0e0</item>
</style> </style>
<style name="DarkTheme" parent="Theme.MaterialComponents.NoActionBar"> <style name="DarkTheme" parent="Theme.MaterialComponents.NoActionBar">

2
app/src/main/res/xml/preferences.xml
View file

@ -11,7 +11,7 @@
<ListPreference <ListPreference
android:icon="@drawable/ic_brush_black_24dp" android:icon="@drawable/ic_brush_black_24dp"
android:key="theme_modes" android:key="theme_mode"
android:title="Theme" android:title="Theme"
android:summary="Choose your preferred theme" android:summary="Choose your preferred theme"
android:entries="@array/theme_modes" android:entries="@array/theme_modes"