From 099352390d9f1543cec079de6b446d65503c60f4 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 16 May 2020 01:03:31 +0400
Subject: [PATCH] little rtl fixes

---
 api/api.iml                                   |  6 +++---
 app/app.iml                                   | 14 ++++++-------
 .../main/java/com/vanced/manager/core/Main.kt |  6 +++---
 .../vanced/manager/core/base/BaseActivity.kt  |  8 ++++++++
 .../vanced/manager/core/base/RootHelper.kt    | 18 +++++++++++++++++
 .../{BaseActivity.kt => ThemedActivity.kt}    |  2 +-
 .../main/res/layout/include_vanced_medias.xml | 10 +++++-----
 app/src/main/res/values/styles.xml            | 20 +++++++++----------
 8 files changed, 55 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/com/vanced/manager/core/base/BaseActivity.kt
 create mode 100644 app/src/main/java/com/vanced/manager/core/base/RootHelper.kt
 rename app/src/main/java/com/vanced/manager/ui/core/{BaseActivity.kt => ThemedActivity.kt} (98%)

diff --git a/api/api.iml b/api/api.iml
index ca9c4bea..ce0230c2 100644
--- a/api/api.iml
+++ b/api/api.iml
@@ -70,15 +70,15 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" 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/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/renderscript_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/renderscript_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/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/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/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
diff --git a/app/app.iml b/app/app.iml
index 4b795135..f2e98289 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -70,17 +70,17 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <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/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/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/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/res/rs/debug" type="java-resource" 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/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/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" />
@@ -135,10 +135,10 @@
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
           <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
-          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
           <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
-          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
           <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" />
+          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
+          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/app/src/main/java/com/vanced/manager/core/Main.kt b/app/src/main/java/com/vanced/manager/core/Main.kt
index 69658d1f..f7e0df0e 100644
--- a/app/src/main/java/com/vanced/manager/core/Main.kt
+++ b/app/src/main/java/com/vanced/manager/core/Main.kt
@@ -1,16 +1,16 @@
 package com.vanced.manager.core
 
 import android.annotation.SuppressLint
-import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import com.vanced.manager.R
-import com.vanced.manager.ui.core.ThemeActivity
+import com.vanced.manager.core.base.BaseActivity
+import com.vanced.manager.ui.core.ThemedActivity
 
 // This activity will NOT be used in manifest
 // since MainActivity will extend it
 @SuppressLint("Registered")
-open class Main: ThemeActivity() {
+open class Main: BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/vanced/manager/core/base/BaseActivity.kt b/app/src/main/java/com/vanced/manager/core/base/BaseActivity.kt
new file mode 100644
index 00000000..dd21286e
--- /dev/null
+++ b/app/src/main/java/com/vanced/manager/core/base/BaseActivity.kt
@@ -0,0 +1,8 @@
+package com.vanced.manager.core.base
+
+import android.annotation.SuppressLint
+import com.vanced.manager.ui.core.ThemedActivity
+
+@SuppressLint("Registered")
+open class BaseActivity: ThemedActivity() {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/core/base/RootHelper.kt b/app/src/main/java/com/vanced/manager/core/base/RootHelper.kt
new file mode 100644
index 00000000..4a3fd05f
--- /dev/null
+++ b/app/src/main/java/com/vanced/manager/core/base/RootHelper.kt
@@ -0,0 +1,18 @@
+package com.vanced.manager.core.base
+
+import android.util.Log
+
+class RootHelper {
+
+    private val TAG: String = "VMRoot"
+
+    fun rootRequest(): Boolean {
+        return try {
+            true
+        } catch (e: Exception) {
+            Log.d(TAG, "Unable to acquire root access")
+            false
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt
similarity index 98%
rename from app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt
rename to app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt
index c82d01e1..f01d4999 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt
@@ -14,7 +14,7 @@ import com.vanced.manager.R
 // This activity will NOT be used in manifest
 // since MainActivity will extend it
 @SuppressLint("Registered")
-open class ThemeActivity : AppCompatActivity() {
+open class ThemedActivity : AppCompatActivity() {
 
     private lateinit var currentTheme: String
     private lateinit var pref: SharedPreferences
diff --git a/app/src/main/res/layout/include_vanced_medias.xml b/app/src/main/res/layout/include_vanced_medias.xml
index 904bfb43..69872440 100644
--- a/app/src/main/res/layout/include_vanced_medias.xml
+++ b/app/src/main/res/layout/include_vanced_medias.xml
@@ -8,20 +8,21 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/social_media_title"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/eightdp"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="2dp"
             android:layout_marginEnd="8dp"
             android:fontFamily="@font/exo_semibold"
             android:text="@string/vanced_medias"
             android:textColor="#ffffff"
             android:textSize="18sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
@@ -54,7 +55,6 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toEndOf="@id/discordbtn"/>
 
-
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/twitterbtn"
                     style="@style/SocialButtonStyle"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 91365331..0f91d8eb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,8 +24,8 @@
     <style name="SocialButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:backgroundTint">@android:color/transparent</item>
-        <item name="android:background">@android:color/transparent</item>
+        <item name="backgroundTint">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
         <item name="android:textColor">#ffffff</item>
         <item name="iconPadding">0dp</item>
         <item name="iconGravity">textStart</item>
@@ -71,7 +71,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">?colorPrimary</item>
-        <item name="android:fontFamily">@font/exo_bold</item>
+        <item name="fontFamily">@font/exo_bold</item>
         <item name="android:textSize">24sp</item>
         <item name="android:layout_marginStart">8dp</item>
     </style>
@@ -80,7 +80,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">?colorOnSurfaceVariant</item>
-        <item name="android:fontFamily">@font/exo_bold</item>
+        <item name="fontFamily">@font/exo_bold</item>
         <item name="android:textSize">18sp</item>
     </style>
 
@@ -88,7 +88,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">?colorOnSurfaceVariant</item>
-        <item name="android:fontFamily">@font/exo_bold</item>
+        <item name="fontFamily">@font/exo_bold</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">18sp</item>
     </style>
@@ -97,7 +97,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">?colorOnSurfaceVariant</item>
-        <item name="android:fontFamily">@font/exo_semibold</item>
+        <item name="fontFamily">@font/exo_semibold</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">24sp</item>
     </style>
@@ -107,11 +107,11 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">?colorOnSurfaceVariant</item>
         <item name="android:textSize">13sp</item>
-        <item name="android:fontFamily">@font/exo</item>
+        <item name="fontFamily">@font/exo</item>
     </style>
 
     <style name="AppVer.Bold" parent="AppVer">
-        <item name="android:fontFamily">@font/exo_semibold</item>
+        <item name="fontFamily">@font/exo_semibold</item>
         <item name="android:layout_marginStart">8dp</item>
     </style>
 
@@ -119,12 +119,12 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:clickable">true</item>
-        <item name="android:tint">?colorPrimary</item>
+        <item name="tint">?colorPrimary</item>
         <item name="iconPadding">0dp</item>
     </style>
 
     <style name="ClickableImageWidget.Red" parent="ClickableImageWidget">
-        <item name="android:tint">@color/Red</item>
+        <item name="tint">@color/Red</item>
     </style>
 
 </resources>
\ No newline at end of file