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

new additions

This commit is contained in:
X1nto 2020-06-25 18:22:33 +04:00
parent f71d2d5e4c
commit 48c0d5ca17
11 changed files with 111 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/app.iml
View File

@ -72,15 +72,15 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />

11
app/src/main/AndroidManifest.xml
View File

@ -62,15 +62,8 @@
<service android:name=".core.installer.RootAppUninstaller" />
<service android:name=".core.installer.AppUninstallerService" />
<service android:name=".core.installer.AppInstallerService" />
<service
android:name=".core.downloader.VancedDownloadService"
android:exported="true"
android:process=":VancedDownloadProcess" />
<service
android:name=".core.downloader.MicrogDownloadService"
android:exported="true"
android:process=":MicrogDownloadProcess"/>
<service android:name=".core.downloader.VancedDownloadService" />
<service android:name=".core.downloader.MicrogDownloadService" />
</application>

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

@ -1,5 +1,6 @@
package com.vanced.manager.ui.fragments
import android.annotation.SuppressLint
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
@ -9,15 +10,16 @@ import android.graphics.Color
import android.os.Bundle
import android.util.Log
import android.view.*
import android.widget.ProgressBar
import android.widget.TextView
import android.widget.Toast
import android.view.animation.Animation
import android.view.animation.RotateAnimation
import android.widget.*
import androidx.databinding.DataBindingUtil
import androidx.fragment.app.viewModels
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.preference.PreferenceManager.getDefaultSharedPreferences
import androidx.viewpager2.widget.ViewPager2
import com.google.android.material.button.MaterialButton
import com.google.android.material.card.MaterialCardView
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
import com.vanced.manager.R
@ -35,6 +37,7 @@ class HomeFragment : Home() {
private lateinit var sectionPageRootAdapter: SectionPageRootAdapter
private lateinit var viewPager: ViewPager2
private lateinit var binding: FragmentHomeBinding
private var isExpanded: Boolean = false
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
@ -46,6 +49,7 @@ class HomeFragment : Home() {
return binding.root
}
@SuppressLint("ClickableViewAccessibility")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
@ -71,6 +75,28 @@ class HomeFragment : Home() {
}
}
view.findViewById<MaterialCardView>(R.id.changelog_card).setOnTouchListener { _, _ ->
cardExpandCollapse()
return@setOnTouchListener true
}
view.findViewById<ImageButton>(R.id.changelog_button).setOnClickListener {
cardExpandCollapse()
}
}
private fun cardExpandCollapse() {
val viewPagerContainer = view?.findViewById<LinearLayout>(R.id.viewpager_container)
val arrowAnimation: RotateAnimation
if (isExpanded) {
viewPagerContainer?.visibility = View.GONE
isExpanded = false
arrowAnimation = RotateAnimation(180f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
} else {
viewPagerContainer?.visibility = View.VISIBLE
isExpanded = true
arrowAnimation = RotateAnimation(0f, 180f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
}
arrowAnimation.start()
}
override fun onPause() {

2
app/src/main/res/drawable/ic_shortcut_info.xml
View File

@ -7,6 +7,6 @@
android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M9,2.728c-3.462,0 -6.272,2.81 -6.272,6.272c0,3.463 2.81,6.272 6.272,6.272c3.463,0 6.272,-2.81 6.272,-6.272C15.272,5.538 12.464,2.728 9,2.728zM9.628,12.137H8.374V8.373h1.254V12.137zM9.628,7.119H8.374V5.864h1.254V7.119z"
android:pathData="M9,3.801C6.13,3.801 3.801,6.13 3.801,9c0,2.87 2.33,5.199 5.199,5.199c2.87,0 5.199,-2.329 5.199,-5.199C14.199,6.13 11.871,3.801 9,3.801zM9.521,11.601h-1.04V8.48h1.04V11.601zM9.521,7.441h-1.04V6.4h1.04V7.441z"
android:fillColor="#1490D7"/>
</vector>

2
app/src/main/res/drawable/ic_shortcut_settings.xml
View File

@ -7,6 +7,6 @@
android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M13.358,9.574C13.383,9.391 13.396,9.202 13.396,9c0,-0.195 -0.014,-0.391 -0.043,-0.573l1.238,-0.965c0.11,-0.085 0.142,-0.25 0.073,-0.373l-1.172,-2.026c-0.073,-0.134 -0.225,-0.177 -0.358,-0.134l-1.459,0.586c-0.306,-0.232 -0.63,-0.427 -0.99,-0.573l-0.22,-1.551c-0.025,-0.147 -0.146,-0.251 -0.293,-0.251H7.828c-0.146,0 -0.263,0.104 -0.287,0.251l-0.22,1.551c-0.36,0.146 -0.689,0.348 -0.988,0.574L4.874,4.929c-0.134,-0.049 -0.287,0 -0.361,0.134L3.348,7.09C3.274,7.219 3.299,7.377 3.42,7.463l1.239,0.964C4.629,8.609 4.605,8.812 4.605,9s0.012,0.391 0.042,0.574l-1.239,0.965c-0.109,0.085 -0.14,0.25 -0.073,0.372l1.172,2.026c0.073,0.134 0.225,0.177 0.359,0.134l1.458,-0.586c0.305,0.231 0.628,0.427 0.989,0.573l0.22,1.552c0.03,0.146 0.146,0.25 0.293,0.25h2.343c0.147,0 0.269,-0.104 0.288,-0.25l0.22,-1.552c0.359,-0.146 0.69,-0.342 0.989,-0.573l1.459,0.586c0.134,0.049 0.286,0 0.359,-0.134l1.173,-2.026c0.073,-0.134 0.042,-0.287 -0.074,-0.372L13.358,9.574zM9,11.198c-1.208,0 -2.198,-0.99 -2.198,-2.198c0,-1.208 0.989,-2.197 2.198,-2.197c1.208,0 2.197,0.989 2.197,2.197C11.197,10.208 10.208,11.198 9,11.198z"
android:pathData="M11.925,9.385c0.017,-0.123 0.026,-0.25 0.026,-0.385c0,-0.131 -0.01,-0.263 -0.029,-0.385l0.83,-0.647c0.074,-0.057 0.096,-0.168 0.05,-0.25l-0.787,-1.36c-0.049,-0.09 -0.15,-0.119 -0.24,-0.09l-0.979,0.394c-0.205,-0.156 -0.423,-0.287 -0.664,-0.385L9.983,5.235C9.966,5.137 9.885,5.067 9.786,5.067H8.213c-0.098,0 -0.177,0.07 -0.192,0.168L7.873,6.276C7.631,6.374 7.411,6.51 7.21,6.662L6.231,6.268c-0.09,-0.033 -0.193,0 -0.242,0.09l-0.782,1.36c-0.05,0.087 -0.033,0.193 0.048,0.25l0.832,0.647C6.066,8.737 6.05,8.874 6.05,9s0.008,0.263 0.028,0.385l-0.831,0.648c-0.074,0.057 -0.094,0.168 -0.049,0.25l0.787,1.359c0.049,0.089 0.151,0.119 0.241,0.089l0.979,-0.393c0.205,0.155 0.421,0.287 0.664,0.385l0.148,1.041c0.02,0.099 0.098,0.168 0.196,0.168h1.572c0.1,0 0.181,-0.069 0.193,-0.168l0.147,-1.041c0.241,-0.098 0.464,-0.229 0.664,-0.385l0.979,0.393c0.09,0.034 0.192,0 0.241,-0.089l0.787,-1.359c0.049,-0.09 0.028,-0.193 -0.05,-0.25L11.925,9.385zM9,10.476c-0.811,0 -1.476,-0.665 -1.476,-1.476S8.188,7.525 9,7.525c0.811,0 1.475,0.664 1.475,1.475S9.811,10.476 9,10.476z"
android:fillColor="#1490D7"/>
</vector>

10
app/src/main/res/drawable/ic_vanced_nobg.xml
View File

@ -1,6 +1,6 @@
<vector android:height="35dp" android:viewportHeight="560"
android:viewportWidth="960" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M723.062,157.08c-7.661,-28.84 -30.24,-51.548 -58.94,-59.265c-6.213,-1.68 -25.124,-6.773 -108.001,-9.24c-39.811,-1.19 -75.763,-1.204 -76.121,-1.204s-36.311,0.014 -76.124,1.204c-82.879,2.478 -101.785,7.577 -107.981,9.24c-28.694,7.719 -51.299,30.425 -58.954,59.265c-10.08,37.867 -10.374,114.072 -10.374,122.64c0,8.624 0.28,85.364 10.36,123.216c7.658,28.84 30.24,51.546 58.94,59.263c6.213,1.68 25.125,6.775 107.999,9.239c39.824,1.201 75.776,1.201 76.135,1.201s36.311,0 76.121,-1.204c82.88,-2.478 101.788,-7.576 107.987,-9.239c28.703,-7.723 51.296,-30.431 58.951,-59.251c10.08,-37.87 10.36,-114.609 10.36,-123.234C733.434,271.138 733.143,194.933 723.062,157.08zM697.28,396.068c-5.217,19.637 -20.583,35.098 -40.094,40.348c-35.363,9.537 -177.173,9.537 -177.173,9.537s-141.809,0 -177.172,-9.537c-19.51,-5.25 -34.877,-20.72 -40.093,-40.348c-9.475,-35.588 -9.475,-116.365 -9.475,-116.365s0,-80.184 9.475,-115.771c5.216,-19.636 20.583,-35.101 40.093,-40.348c35.35,-9.537 177.159,-9.537 177.159,-9.537s141.809,0 177.173,9.537c19.511,5.248 34.877,20.72 40.093,40.348c9.476,35.588 9.476,115.771 9.476,115.771S706.741,360.48 697.28,396.068z"/>
<path android:fillColor="#FF000000" android:pathData="M554.665,262.298l-107.602,-69.423c-4.667,-2.723 -10.657,-1.147 -13.38,3.52c-0.002,0.002 -0.003,0.004 -0.004,0.006l-0.21,0.355c-2.715,4.67 -1.138,10.657 3.525,13.384l102.896,61.911c6.695,4.026 6.656,13.745 -0.069,17.721L436.449,350.84c-4.687,2.688 -6.314,8.66 -3.641,13.354l0.207,0.358c2.688,4.687 8.66,6.314 13.354,3.64l108.147,-68.553C568.181,290.979 568.259,271.071 554.665,262.298z"/>
<path android:fillColor="#FF000000" android:pathData="M499.726,271.04l-52.981,-29.845c-6.859,-3.864 -15.338,1.089 -15.338,8.96v59.69c0,7.871 8.479,12.824 15.338,8.961l52.981,-29.846C506.709,285.04 506.709,274.96 499.726,271.04z"/>
<vector android:height="30dp" android:viewportHeight="385.265"
android:viewportWidth="506.854" android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M496.496,69.709c-7.661,-28.84 -30.24,-51.548 -58.94,-59.265c-6.213,-1.68 -25.124,-6.773 -108,-9.24C289.744,0.014 253.792,0 253.434,0s-36.311,0.014 -76.124,1.204C94.431,3.682 75.525,8.781 69.33,10.444c-28.695,7.72 -51.3,30.426 -58.955,59.265C0.294,107.577 0,183.781 0,192.349c0,8.625 0.28,85.365 10.36,123.213c7.658,28.843 30.24,51.55 58.94,59.267c6.213,1.68 25.125,6.771 107.999,9.238c39.824,1.197 75.774,1.197 76.135,1.197s36.312,0 76.122,-1.202c82.879,-2.479 101.787,-7.573 107.986,-9.237c28.703,-7.727 51.296,-30.434 58.951,-59.25c10.078,-37.871 10.356,-114.609 10.356,-123.235C506.867,183.767 506.576,107.562 496.496,69.709zM470.714,308.698c-5.217,19.637 -20.583,35.098 -40.095,40.348c-35.362,9.537 -177.174,9.537 -177.174,9.537s-141.809,0 -177.172,-9.537c-19.51,-5.25 -34.877,-20.721 -40.093,-40.348c-9.475,-35.588 -9.475,-116.366 -9.475,-116.366s0,-80.185 9.475,-115.771c5.216,-19.636 20.583,-35.101 40.093,-40.348c35.351,-9.537 177.159,-9.537 177.159,-9.537s141.809,0 177.173,9.537c19.511,5.248 34.877,20.72 40.093,40.348c9.478,35.588 9.478,115.771 9.478,115.771S480.175,273.11 470.714,308.698z"/>
<path android:fillColor="#FFFFFF" android:pathData="M328.099,174.927l-107.603,-69.423c-4.666,-2.723 -10.656,-1.147 -13.381,3.521c-0.002,0.002 -0.003,0.004 -0.004,0.006l-0.21,0.354c-2.715,4.67 -1.138,10.657 3.525,13.384l102.896,61.911c6.695,4.026 6.656,13.745 -0.065,17.721L209.883,263.47c-4.688,2.688 -6.314,8.66 -3.643,13.354l0.207,0.356c2.688,4.688 8.66,6.313 13.354,3.641l108.146,-68.555C341.614,203.608 341.692,183.701 328.099,174.927z"/>
<path android:fillColor="#FFFFFF" android:pathData="M273.159,183.669l-52.979,-29.846c-6.859,-3.863 -15.338,1.09 -15.338,8.961v59.689c0,7.869 8.479,12.822 15.338,8.961l52.979,-29.848C280.144,197.669 280.144,187.589 273.159,183.669z"/>
</vector>

1
app/src/main/res/layout/fragment_home.xml
View File

@ -18,6 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:animateLayoutChanges="true"
android:scrollbars="none">
<LinearLayout

27
app/src/main/res/layout/include_changelog_pages.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
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="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tablayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSurfaceVariant"
app:tabIndicatorColor="?colorPrimary"
app:tabSelectedTextColor="?colorPrimary"
app:tabTextColor="?colorPrimary"
app:layout_constraintTop_toBottomOf="parent" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</LinearLayout>

67
app/src/main/res/layout/include_changelogs.xml
View File

@ -1,12 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<com.alespero.expandablecardview.ExpandableCardView
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content"
android:layout_width="match_parent"
app:title="@string/changelogs"
app:contentPaddingTop="2dp"
app:expandOnClick="true"
app:inner_view="@layout/include_changelog_pages"
android:background="?colorSurfaceVariant"/>
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/changelog_card"
style="@style/MaterialCard">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
style="@style/CardTitle"
android:text="@string/changelogs"
android:layout_alignParentStart="true"/>
<ImageButton
android:id="@+id/changelog_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_down"
android:backgroundTint="@android:color/transparent"
android:layout_alignParentEnd="true" />
</RelativeLayout>
<LinearLayout
android:id="@+id/viewpager_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tablayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSurfaceVariant"
app:tabIndicatorColor="?colorPrimary"
app:tabSelectedTextColor="?colorPrimary"
app:tabTextColor="?colorPrimary"
app:layout_constraintTop_toBottomOf="parent" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

31
app/src/main/res/layout/include_useful_links.xml
View File

@ -25,34 +25,11 @@
style="@style/CardTitle"
android:text="@string/useful_links" />
<LinearLayout
<include
layout="@layout/include_vanced_medias"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="2dp">
<com.google.android.material.button.MaterialButton
style="@style/LinkButtonStyle"
android:id="@+id/brave_button"
android:text="@string/support_us"
android:layout_marginTop="5dp"
app:cornerRadius="@dimen/eightdp"
android:onClick='@{()-> viewModel.openUrl("https://brave.com/van874")}'/>
<com.google.android.material.button.MaterialButton
style="@style/LinkButtonStyle"
android:id="@+id/website_button"
android:text="@string/website_text"
app:cornerRadius="@dimen/eightdp"
android:onClick='@{()-> viewModel.openUrl("https://vanced.app")}'/>
<include
layout="@layout/include_vanced_medias"
android:layout_width="match_parent"
android:layout_height="wrap_content"
bind:viewModel="@{viewModel}"/>
</LinearLayout>
android:layout_height="wrap_content"
bind:viewModel="@{viewModel}"/>
</LinearLayout>

7
app/src/main/res/layout/include_vanced_medias.xml
View File

@ -33,11 +33,12 @@
android:textAllCaps="false"
android:fontFamily="@font/exo_semibold"
android:textSize="17sp"
app:iconPadding="7sp"
app:layout_constraintEnd_toStartOf="@id/bravebtn"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:onClick='@{()-> viewModel.openUrl("https://reddit.com/r/vanced")}'/>
android:onClick='@{()-> viewModel.openUrl("https://vanced.app")}'/>
<com.google.android.material.button.MaterialButton
android:id="@+id/bravebtn"
@ -46,13 +47,13 @@
android:text="@string/support_us"
android:textAllCaps="false"
android:fontFamily="@font/exo_semibold"
app:iconPadding="15dp"
app:iconPadding="7dp"
android:textSize="17sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/websitebtn"
app:layout_constraintBottom_toBottomOf="parent"
android:onClick='@{()-> viewModel.openUrl("https://reddit.com/r/vanced")}'/>
android:onClick='@{()-> viewModel.openUrl("https://brave.com/van874")}'/>
</androidx.constraintlayout.widget.ConstraintLayout>