Merge pull request #262 from YTVanced/dev

v2.0.1 release
TeamVanced · Nov 16, 2020 · 604a68a · 604a68a
2 parents 1fffa48 + e2c6163
commit 604a68a
Show file tree

Hide file tree

Showing 117 changed files with 3,431 additions and 2,467 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "com.vanced.manager"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 200
-        versionName "2.0.0 (.nomagiskui)"
+        versionCode 201
+        versionName "2.0.1 (Android5and6suck)"
 
         vectorDrawables.useSupportLibrary true
 
@@ -35,10 +35,6 @@ android {
         disable 'MissingTranslation', 'ExtraTranslation'
     }
 
-    aaptOptions {
-        noCompress 'apk', '.apk'
-    }
-
     applicationVariants.all { variant ->
         resValue "string", "versionName", versionName
     }
@@ -52,6 +48,7 @@ android {
 
     buildFeatures {
         dataBinding true
+        viewBinding true
     }
 
 // To inline the bytecode built with JVM target 1.8 into
@@ -70,19 +67,24 @@ android {
 def getLanguages() {
     List<String> langs = new ArrayList<String>()
     langs.add("en")
+    //Add languages with dialects
+    langs.add("bn_BD")
+    langs.add("bn_IN")
+    langs.add("pt_BR")
+    langs.add("pt_PT")
+    langs.add("zh_CN")
+    langs.add("zh_TW")
+    List<String> exceptions = [ "bn", "pt", "zh"]
     Pattern pattern = Pattern.compile("-(\\w+)-")
     new File("${projectDir}/src/main/res").eachDir { dir ->
         if (dir.name.startsWith("values-") && !dir.name.contains("v23")) {
             Matcher matcher = pattern.matcher(dir.name)
-            if (matcher.find()) {
-                if (langs.contains(matcher.group(1)))
-                    langs.add(matcher.group(1) + "_${dir.name.substring(dir.name.length() - 2)}")
-                else
-                    langs.add(matcher.group(1))
+            if (matcher.find() && !exceptions.any { matcher.group(1) == it } ) {
+                langs.add(matcher.group(1))
             }
         }
     }
-    return langs.toArray()
+    return langs.toArray().toSorted()
 }
 
 static def surroundWithQuotes(Object[] arr) {
@@ -114,7 +116,6 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.google.android.material:material:1.3.0-alpha03'
 
-// Other
     // JSON parser
     implementation 'com.beust:klaxon:5.4'
 

diff --git a/app/src/main/java/com/vanced/manager/adapter/AppListAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/AppListAdapter.kt
@@ -46,10 +46,10 @@ class AppListAdapter(
 
         holder.appCard.setOnClickListener {
             tooltip.close()
-            AppInfoDialog(
-                apps[position],
-                dataModels[position]?.appIcon,
-                dataModels[position]?.changelog?.get()
+            AppInfoDialog.newInstance(
+                appName = apps[position],
+                appIcon = dataModels[position]?.appIcon,
+                changelog = dataModels[position]?.changelog?.get()
             ).show(context.supportFragmentManager, "info")
         }
     }

diff --git a/app/src/main/java/com/vanced/manager/adapter/LinkAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/LinkAdapter.kt
@@ -3,7 +3,7 @@ package com.vanced.manager.adapter
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import com.vanced.manager.R
 import com.vanced.manager.databinding.ViewSocialLinkBinding
@@ -13,49 +13,49 @@ import com.vanced.manager.ui.viewmodels.HomeViewModel
 class LinkAdapter(context: Context, private val viewModel: HomeViewModel) : RecyclerView.Adapter<LinkAdapter.LinkViewHolder>() {
 
     private val instagram = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_instagram),
+        AppCompatResources.getDrawable(context, R.drawable.ic_instagram),
         "https://instagram.com/vanced.youtube"
     )
 
     private val youtube = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_youtube),
+        AppCompatResources.getDrawable(context, R.drawable.ic_youtube),
         "https://youtube.com/c/YouTubeVanced"
     )
 
     private val github = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_github),
+        AppCompatResources.getDrawable(context, R.drawable.ic_github),
         "https://github.com/YTVanced/VancedManager"
     )
 
     private val website = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_website),
+        AppCompatResources.getDrawable(context, R.drawable.ic_website),
         "https://vancedapp.com"
     )
 
     private val telegram = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_telegram),
+        AppCompatResources.getDrawable(context, R.drawable.ic_telegram),
         "https://t.me/joinchat/AAAAAEHf-pi4jH1SDlAL4w"
     )
 
     private val twitter = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_twitter),
+        AppCompatResources.getDrawable(context, R.drawable.ic_twitter),
         "https://twitter.com/YTVanced"
     )
 
     private val discord = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_discord),
+        AppCompatResources.getDrawable(context, R.drawable.ic_discord),
         "https://discord.gg/WCGNdRruzb"
     )
 
     private val reddit = LinkModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_reddit),
+        AppCompatResources.getDrawable(context, R.drawable.ic_reddit),
         "https://www.reddit.com/r/Vanced/"
     )
 
     val links = arrayOf(instagram, youtube, github, website, telegram, twitter, discord, reddit)
 
     inner class LinkViewHolder(private val binding: ViewSocialLinkBinding) : RecyclerView.ViewHolder(binding.root) {
-
+        val logo = binding.linkImage
         fun bind(position: Int) {
             binding.viewModel = viewModel
             binding.linkModel = links[position]
@@ -70,6 +70,7 @@ class LinkAdapter(context: Context, private val viewModel: HomeViewModel) : Recy
 
     override fun onBindViewHolder(holder: LinkViewHolder, position: Int) {
         holder.bind(position)
+        holder.logo.setImageDrawable(links[position].linkIcon)
     }
 
     override fun getItemCount(): Int = links.size

diff --git a/app/src/main/java/com/vanced/manager/adapter/SelectAppsAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/SelectAppsAdapter.kt
@@ -24,7 +24,7 @@ class SelectAppsAdapter(context: Context) : RecyclerView.Adapter<SelectAppsAdapt
         context.getString(R.string.music),
         context.getString(R.string.select_apps_music),
         "music",
-        prefs.getBoolean("enable_music", false)
+        prefs.getBoolean("enable_music", true)
     )
 
     val apps = arrayOf(vanced, music)

diff --git a/app/src/main/java/com/vanced/manager/adapter/SponsorAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/SponsorAdapter.kt
@@ -3,7 +3,7 @@ package com.vanced.manager.adapter
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import com.vanced.manager.R
 import com.vanced.manager.databinding.ViewSponsorBinding
@@ -17,13 +17,13 @@ class SponsorAdapter(
 ) : RecyclerView.Adapter<SponsorAdapter.LinkViewHolder>() {
 
     private val brave = SponsorModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_brave),
+        AppCompatResources.getDrawable(context, R.drawable.ic_brave),
         "Brave",
         "https://vancedapp.com/brave"
     )
 
     private val adguard = SponsorModel(
-        ContextCompat.getDrawable(context, R.drawable.ic_adguard),
+        AppCompatResources.getDrawable(context, R.drawable.ic_adguard),
         "AdGuard",
         "https://adguard.com/?aid=31141&source=manager"
     )
@@ -33,6 +33,7 @@ class SponsorAdapter(
     inner class LinkViewHolder(private val binding: ViewSponsorBinding) : RecyclerView.ViewHolder(
         binding.root
     ) {
+        val logo = binding.sponsorLogo
         fun bind(position: Int) {
             binding.viewModel = viewModel
             binding.sponsor = sponsors[position]
@@ -47,6 +48,7 @@ class SponsorAdapter(
 
     override fun onBindViewHolder(holder: LinkViewHolder, position: Int) {
         holder.bind(position)
+        holder.logo.setImageDrawable(sponsors[position].logo)
     }
 
     override fun getItemCount(): Int = 2

diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt
@@ -11,13 +11,18 @@ import com.crowdin.platform.data.remote.NetworkType
 import com.downloader.PRDownloader
 import com.vanced.manager.BuildConfig.*
 import com.vanced.manager.utils.InternetTools.loadJson
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 
 open class App: Application() {
 
     private val prefs by lazy { getDefaultSharedPreferences(this) }
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     override fun onCreate() {
-        loadJson(this)
+        scope.launch { loadJson(this@App) }
         super.onCreate()
         PRDownloader.initialize(this)
 
@@ -46,6 +51,4 @@ open class App: Application() {
         super.onConfigurationChanged(newConfig)
         Crowdin.onConfigurationChanged()
     }
-
-
 }
diff --git a/app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt b/app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloader.kt b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloader.kt
@@ -13,39 +13,36 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-object MicrogDownloader {
+object MicrogDownloader : CoroutineScope by CoroutineScope(Dispatchers.IO) {
 
     fun downloadMicrog(
         context: Context,
-    ) {
-        CoroutineScope(Dispatchers.IO).launch {
-            val url = microg.get()?.string("url")
-
-             downloadProgress.get()?.currentDownload = PRDownloader.download(url, context.getExternalFilesDir("microg")?.path, "microg.apk")
-                .build()
-                .setOnStartOrResumeListener {
-                    downloadProgress.get()?.downloadingFile?.set(context.getString(R.string.downloading_file, url?.let { getFileNameFromUrl(it) }))
-                }
-                .setOnProgressListener { progress ->
-                    downloadProgress.get()?.downloadProgress?.set((progress.currentBytes * 100 / progress.totalBytes).toInt())
+    ) = launch {
+        val url = microg.get()?.string("url")
+
+        downloadProgress.value?.currentDownload = PRDownloader.download(url, context.getExternalFilesDir("microg")?.path, "microg.apk")
+            .build()
+            .setOnStartOrResumeListener {
+                downloadProgress.value?.downloadingFile?.value = context.getString(R.string.downloading_file, url?.let { getFileNameFromUrl(it) })
+            }
+            .setOnProgressListener { progress ->
+                downloadProgress.value?.downloadProgress?.value = (progress.currentBytes * 100 / progress.totalBytes).toInt()
+            }
+            .start(object : OnDownloadListener {
+                override fun onDownloadComplete() {
+                    startMicrogInstall(context)
                 }
-                .start(object : OnDownloadListener {
-                    override fun onDownloadComplete() {
-                        startMicrogInstall(context)
-                    }
 
-                    override fun onError(error: Error?) {
-                        downloadProgress.get()?.downloadingFile?.set(context.getString(R.string.error_downloading, "microG"))
-                    }
-                })
+                override fun onError(error: Error?) {
+                    downloadProgress.value?.downloadingFile?.value = context.getString(R.string.error_downloading, "microG")
+                }
+            })
 
         }
-    }
 
     fun startMicrogInstall(context: Context) {
-        downloadProgress.get()?.installing?.set(true)
-        downloadProgress.get()?.reset()
+        downloadProgress.value?.installing?.value = true
+        downloadProgress.value?.reset()
         install("${context.getExternalFilesDir("microg")}/microg.apk", context)
     }
-
 }