Release 1.15

New Crowdin updates

See merge request tom79/fedilab-tube!67

.gitignore

@@ -9,5 +9,4 @@
 .cxx
 /app/release/
 /app/fdroid_full/release/
-/app/google_full/
-/app/google_acad/
+/frostwire-jlibtorrent/

.gitlab-ci.yml

@@ -68,7 +68,7 @@ assembleDebug:
   cache:
     key: "${CI_COMMIT_TAG}"
     paths:
-      - app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-debug.apk
+      - app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk
       - app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk
     policy: push
   script:
@@ -76,11 +76,11 @@ assembleDebug:
 
 # Basic android and gradle stuff
 # Check linting
-lintfdroid_peertube_apps_educDebug:
+lintfdroid_acadDebug:
   interruptible: true
   stage: build
   script:
-    - ./gradlew -Pci --console=plain :app:lintfdroid_peertube_apps_educDebug -PbuildDir=lint
+    - ./gradlew -Pci --console=plain :app:lintfdroid_acadDebug -PbuildDir=lint
   except:
     - tags
 
@@ -110,7 +110,7 @@ putApkOnTags:
   cache:
     key: "${CI_COMMIT_TAG}"
     paths:
-      - app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-debug.apk
+      - app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk
       - app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk
     policy: pull
   script:
@@ -120,11 +120,11 @@ putApkOnTags:
     - export NC_UPLOAD_URL="${NC_REMOTE_DIR}/${CI_COMMIT_TAG}"
     - export NC_DOWNLOAD_URL="${NC_SHARE_URL}/download?path=%2F${CI_COMMIT_TAG}%2F&files="
     - 'export HEADER="Private-Token: ${GITLAB_API_TOKEN}"'
-    - export acadUrl="${NC_DOWNLOAD_URL}app-fdroid_peertube_apps_educ-debug.apk"
+    - export acadUrl="${NC_DOWNLOAD_URL}app-fdroid_acad-debug.apk"
     - export fullUrl="${NC_DOWNLOAD_URL}app-fdroid_full-debug.apk"
     - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -X MKCOL "${NC_UPLOAD_URL}"'
     - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk       "${NC_UPLOAD_URL}/app-fdroid_full-debug.apk"'
-    - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-debug.apk "${NC_UPLOAD_URL}/app-fdroid_peertube_apps_educ-debug.apk"'
+    - 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk "${NC_UPLOAD_URL}/app-fdroid_acad-debug.apk"'
     - export description=$(curl -s --header "${HEADER}" "${DESCRIPTION_URL}" | jq .release.description | sed -e 's@"@@g')
     - if [[ $description == 'null' ]]; then export METHOD="POST"; echo -e "[Get the acad version](${acadUrl})\n\n[Get the full version](${fullUrl})" > /tmp/text; fi
     - if [[ $description != 'null' ]]; then export METHOD="PUT";  echo -e "${description}\n\n[Get the acad version](${acadUrl})\n\n[Get the full version](${fullUrl})" > /tmp/text; fi

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Crowdin will not pick up changes in develop branch, that's why all translations
 
 ### Issues:
 
-Issues are handled on Github at: https://github.com/stom79/TubeLab/issues, before opening an issue, please check it has not yet been submitted by someone else
+Issues are handled on Framagit at: https://framagit.org/imattau/fedilab-tube/-/issues, before opening an issue, please check it has not yet been submitted by someone else
 
 ### Contribution to code:
 

app/build.gradle

@@ -4,15 +4,14 @@ apply plugin: "androidx.navigation.safeargs"
 
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     defaultConfig {
 
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 37
-        versionName "1.12.1"
+        targetSdkVersion 31
+        versionCode 45
+        versionName "1.15.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,7 +31,7 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 
     lintOptions {
@@ -42,7 +41,7 @@ android {
     }
     //boolean full_instances if set to false means TubeAcad
     productFlavors {
-        fdroid_peertube_apps_educ {
+        fdroid_acad {
             applicationId "app.fedilab.fedilabtube"
             resValue "string", "app_name", "TubeAcad"
             resValue "string", "app_id", "app.fedilab.fedilabtube"
@@ -53,8 +52,11 @@ android {
             buildConfigField "boolean", "sepia_search", "false"
             buildConfigField "boolean", "instance_switcher", "true"
             buildConfigField "boolean", "allow_remote_connections", "false"
+            buildConfigField "boolean", "google_cast_lib", "false"
+            buildConfigField "int", "cast_enabled", "0"
+            buildConfigField "int", "default_theme", "2"
         }
-        google_peertube_apps_educ {
+        google_acad {
             applicationId "app.fedilab.fedilabtube"
             resValue "string", "app_name", "TubeAcad"
             resValue "string", "app_id", "app.fedilab.fedilabtube"
@@ -65,6 +67,9 @@ android {
             buildConfigField "boolean", "sepia_search", "false"
             buildConfigField "boolean", "instance_switcher", "true"
             buildConfigField "boolean", "allow_remote_connections", "false"
+            buildConfigField "boolean", "google_cast_lib", "true"
+            buildConfigField "int", "cast_enabled", "1"
+            buildConfigField "int", "default_theme", "2"
         }
         fdroid_full {
             applicationId "app.fedilab.tubelab"
@@ -77,6 +82,9 @@ android {
             buildConfigField "boolean", "sepia_search", "true"
             buildConfigField "boolean", "instance_switcher", "true"
             buildConfigField "boolean", "allow_remote_connections", "true"
+            buildConfigField "boolean", "google_cast_lib", "false"
+            buildConfigField "int", "cast_enabled", "0"
+            buildConfigField "int", "default_theme", "2"
         }
         google_full {
             applicationId "app.fedilab.tubelab"
@@ -89,57 +97,30 @@ android {
             buildConfigField "boolean", "sepia_search", "true"
             buildConfigField "boolean", "instance_switcher", "true"
             buildConfigField "boolean", "allow_remote_connections", "true"
+            buildConfigField "boolean", "google_cast_lib", "true"
+            buildConfigField "int", "cast_enabled", "1"
+            buildConfigField "int", "default_theme", "2"
         }
-        queermotion {
-            applicationId "org.queermotion.peertube"
-            resValue "string", "app_name", "QueerMotion"
-            resValue "string", "app_id", "org.queermotion.peertube"
-            buildConfigField "String", "version", "\"queermotion\""
-            buildConfigField "boolean", "full_instances", "true"
-            buildConfigField "boolean", "google_restriction", "false"
-            buildConfigField "boolean", "surfing_mode", "false"
-            buildConfigField "boolean", "sepia_search", "false"
-            buildConfigField "boolean", "instance_switcher", "false"
-            buildConfigField "boolean", "allow_remote_connections", "false"
-        }
-        bittube {
-            applicationId "app.fedilab.bittube"
-            resValue "string", "app_name", "Bittube"
-            resValue "string", "app_id", "app.fedilab.bittube"
-            buildConfigField "String", "version", "\"bittube\""
-            buildConfigField "boolean", "full_instances", "true"
-            buildConfigField "boolean", "google_restriction", "true"
-            buildConfigField "boolean", "surfing_mode", "false"
-            buildConfigField "boolean", "sepia_search", "false"
-            buildConfigField "boolean", "instance_switcher", "true"
-            buildConfigField "boolean", "allow_remote_connections", "false"
-        }
+
     }
 
     sourceSets {
-        fdroid_peertube_apps_educ {
-            res.srcDirs = ['src/main/res', 'src/acad/res']
-            java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java']
+
+        fdroid_acad {
+            res.srcDirs = ['src/main/res', 'src/no_google_cast_lib/res', 'src/acad/res']
+            java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java']
         }
-        google_peertube_apps_educ {
-            res.srcDirs = ['src/main/res', 'src/acad/res']
-            java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java']
+        google_acad {
+            res.srcDirs = ['src/main/res', 'src/google_cast_lib/res', 'src/acad/res']
+            java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java', 'src/google_cast_lib/java']
         }
         fdroid_full {
-            res.srcDirs = ['src/main/res', 'src/full/res']
-            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java']
+            res.srcDirs = ['src/main/res', 'src/no_google_cast_lib/res', 'src/full/res']
+            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java']
         }
         google_full {
-            res.srcDirs = ['src/main/res', 'src/full/res', 'src/google_donation/res']
-            java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java']
-        }
-        queermotion {
-            res.srcDirs = ['src/main/res', 'src/queermotion/res']
-            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java']
-        }
-        bittube {
-            res.srcDirs = ['src/main/res', 'src/bittube/res']
-            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java']
+            res.srcDirs = ['src/main/res', 'src/google_donation/res', 'src/google_cast_lib/res', 'src/full/res']
+            java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java', 'src/google_cast_lib/java']
         }
     }
 }
@@ -155,35 +136,35 @@ allprojects {
 dependencies {
     implementation "androidx.multidex:multidex:2.0.1"
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment:2.3.2'
-    implementation "androidx.fragment:fragment:1.2.5"
-    implementation 'androidx.navigation:navigation-ui:2.3.2'
-    implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.2")
+    implementation 'androidx.navigation:navigation-fragment:2.4.2'
+    implementation "androidx.fragment:fragment:1.4.1"
+    implementation 'androidx.navigation:navigation-ui:2.4.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.browser:browser:1.4.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation project(path: ':torrentStream')
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'com.github.GrenderG:Toasty:1.4.2'
+    implementation 'com.github.amoskorir:avatarimagegenerator:1.5.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+    implementation 'com.github.GrenderG:Toasty:1.5.2'
     implementation 'com.google.android.exoplayer:exoplayer:2.12.2'
     implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2'
     implementation "com.github.mabbas007:TagsEditText:1.0.5"
     implementation "com.github.bumptech.glide:glide:4.11.0"
     annotationProcessor "com.github.bumptech.glide:compiler:4.11.0"
+    implementation 'jp.wasabeef:glide-transformations:4.0.0'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "net.gotev:uploadservice:4.5.1"
     implementation "net.gotev:uploadservice-okhttp:4.5.1"
     implementation "com.google.code.gson:gson:2.8.6"
-    implementation 'androidx.media:media:1.2.1'
+    implementation 'androidx.media:media:1.6.0'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
@@ -193,20 +174,38 @@ dependencies {
     implementation "io.github.kobakei:ratethisapp:1.2.0"
     implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0'
 
-    implementation "androidx.work:work-runtime:2.4.0"
-    implementation "androidx.work:work-runtime-ktx:2.4.0"
-
-    //custom cast feature
-    implementation 'jp.wasabeef:glide-transformations:4.0.0'
-    implementation 'su.litvak.chromecast:api-v2:0.11.3'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
-    implementation 'org.slf4j:slf4j-simple:1.7.30'
+    implementation "androidx.work:work-runtime:2.7.1"
 
 
-    google_fullImplementation "com.android.billingclient:billing:3.0.2"
+    //************ DONATION GOOGLE ONLY  **************//
+    google_fullImplementation "com.android.billingclient:billing:4.1.0"
 
-    fdroid_peertube_apps_educImplementation 'org.matomo.sdk:tracker:4.1.2'
-    google_peertube_apps_educImplementation 'org.matomo.sdk:tracker:4.1.2'
+    //************ MATOMO --> acad instances only **************//
 
+    fdroid_acadImplementation 'org.matomo.sdk:tracker:4.1.2'
+    google_acadImplementation 'org.matomo.sdk:tracker:4.1.2'
+
+    //************ CAST **************///
+
+    //---> Google libs (google_full)
+    google_acadImplementation "com.google.android.gms:play-services-cast-tv:19.0.1"
+    google_acadImplementation "com.google.android.gms:play-services-cast:21.0.1"
+    google_acadImplementation "androidx.mediarouter:mediarouter:1.3.0"
+    google_acadImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+
+    google_fullImplementation "com.google.android.gms:play-services-cast-tv:19.0.1"
+    google_fullImplementation "com.google.android.gms:play-services-cast:21.0.1"
+    google_fullImplementation "androidx.mediarouter:mediarouter:1.3.0"
+    google_fullImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+
+    //----> Other flavors
+    fdroid_acadImplementation 'su.litvak.chromecast:api-v2:0.11.3'
+    fdroid_acadImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
+    fdroid_acadImplementation 'org.slf4j:slf4j-simple:1.7.30'
+    fdroid_acadImplementation 'com.github.evozi:Cyanea:1.0.7'
+
+    fdroid_fullImplementation 'su.litvak.chromecast:api-v2:0.11.3'
+    fdroid_fullImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
+    fdroid_fullImplementation 'org.slf4j:slf4j-simple:1.7.30'
 
 }

app/src/acad/java/app/fedilab/fedilabtube/FedilabTube.java

@@ -16,7 +16,6 @@ package app.fedilab.fedilabtube;
 
 
 
-
 import org.matomo.sdk.Matomo;
 import org.matomo.sdk.Tracker;
 import org.matomo.sdk.TrackerBuilder;
@@ -27,6 +26,11 @@ public class FedilabTube extends BaseFedilabTube {
 
     private Tracker mMatomoTracker;
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+
     public synchronized Tracker getTracker() {
         if (mMatomoTracker != null) return mMatomoTracker;
         mMatomoTracker = TrackerBuilder.createDefault("https://wa.phm.education.gouv.fr/snp/matomo.php", 11).build(Matomo.getInstance(this));

app/src/acad/java/app/fedilab/fedilabtube/activities/BaseActivity.java

@@ -0,0 +1,27 @@
+package app.fedilab.fedilabtube.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+
+public class BaseActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}

app/src/acad/java/app/fedilab/fedilabtube/helper/Theme.java

@@ -0,0 +1,59 @@
+package app.fedilab.fedilabtube.helper;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+import androidx.appcompat.app.AppCompatActivity;
+
+import app.fedilab.fedilabtube.R;
+
+public class Theme {
+
+    public static void setTheme(AppCompatActivity activity, String instance, boolean noActionBar) {
+
+        switch (instance) {
+            case "tube-institutionnel.apps.education.fr":
+                activity.setTheme(noActionBar? R.style.InstitutionnelNoActionBar:R.style.Institutionnel);
+                break;
+            case "tube-maternelle.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.MaternelleNoActionBar:R.style.Maternelle);
+                break;
+            case "tube-arts-lettres-sciences-humaines.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.ArtNoActionBar:R.style.Art);
+                break;
+            case "tube-sciences-technologies.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.SciencesNoActionBar:R.style.Sciences);
+                break;
+            case "tube-education-physique-et-sportive.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.EducationNoActionBar:R.style.Education);
+                break;
+            case "tube-enseignement-professionnel.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.EnseignementProNoActionBar:R.style.EnseignementPro);
+                break;
+            case "tube-langues-vivantes.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.LanguesNoActionBar:R.style.Langues);
+                break;
+            case "tube-action-educative.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.ActionEducativeNoActionBar:R.style.ActionEducative);
+                break;
+            case "tube-cycle-2.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.Cycle2NoActionBar:R.style.Cycle2);
+                break;
+            case "tube-cycle-3.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.Cycle3NoActionBar:R.style.Cycle3);
+                break;
+            default:
+                activity.setTheme(noActionBar?R.style.AppThemeNoActionBar:R.style.AppTheme);
+        }
+    }
+}

app/src/acad/res/values-night/styles.xml

@@ -0,0 +1,145 @@
+<resources>
+
+    <attr name="backgroundView" format="color" />
+
+    <style name="BaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="backgroundView">@color/backgroundDark</item>
+    </style>
+    <style name="BaseThemeNoAction" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="backgroundView">@color/backgroundDark</item>
+    </style>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="BaseTheme">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppThemeNoActionBar" parent="BaseThemeNoAction">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <!-- Institutionnel theme. -->
+    <style name="Institutionnel" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
+        <item name="colorAccent">@color/colorAccent_institutionnel</item>
+    </style>
+    <style name="InstitutionnelNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
+        <item name="colorAccent">@color/colorAccent_institutionnel</item>
+    </style>
+    <!-- Maternelle theme. -->
+    <style name="Maternelle" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_maternelle</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
+        <item name="colorAccent">@color/colorAccent_maternelle</item>
+    </style>
+    <style name="MaternelleNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_maternelle</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
+        <item name="colorAccent">@color/colorAccent_maternelle</item>
+    </style>
+    <!-- Art theme. -->
+    <style name="Art" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_art</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
+        <item name="colorAccent">@color/colorAccent_art</item>
+    </style>
+    <style name="ArtNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_art</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
+        <item name="colorAccent">@color/colorAccent_art</item>
+    </style>
+    <!-- Sciences theme. -->
+    <style name="Sciences" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_sciences</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
+        <item name="colorAccent">@color/colorAccent_sciences</item>
+    </style>
+    <style name="SciencesNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_sciences</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
+        <item name="colorAccent">@color/colorAccent_sciences</item>
+    </style>
+    <!-- Education theme. -->
+    <style name="Education" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_education</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
+        <item name="colorAccent">@color/colorAccent_education</item>
+    </style>
+    <style name="EducationNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_education</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
+        <item name="colorAccent">@color/colorAccent_education</item>
+    </style>
+    <!-- Enseignement Pro theme. -->
+    <style name="EnseignementPro" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
+        <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
+    </style>
+    <style name="EnseignementProNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
+        <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
+    </style>
+    <!-- Langues theme. -->
+    <style name="Langues" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_langues</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
+        <item name="colorAccent">@color/colorAccent_langues</item>
+    </style>
+    <style name="LanguesNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_langues</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
+        <item name="colorAccent">@color/colorAccent_langues</item>
+    </style>
+    <!-- ActionEducative theme. -->
+    <style name="ActionEducative" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_action_educative</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
+        <item name="colorAccent">@color/colorAccent_action_educative</item>
+    </style>
+    <style name="ActionEducativeNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_action_educative</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
+        <item name="colorAccent">@color/colorAccent_action_educative</item>
+    </style>
+    <!-- Cycle 2 theme. -->
+    <style name="Cycle2" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_cycle2</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
+        <item name="colorAccent">@color/colorAccent_cycle2</item>
+    </style>
+    <style name="Cycle2NoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_cycle2</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
+        <item name="colorAccent">@color/colorAccent_cycle2</item>
+    </style>
+    <!-- Cycle 3 theme. -->
+    <style name="Cycle3" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_cycle3</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
+        <item name="colorAccent">@color/colorAccent_cycle3</item>
+    </style>
+    <style name="Cycle3NoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_cycle3</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
+        <item name="colorAccent">@color/colorAccent_cycle3</item>
+    </style>
+    <style name="theme" parent="@style/ThemeOverlay.AppCompat.Dark" />
+
+    <style name="popupTheme" parent="@style/ThemeOverlay.AppCompat.DayNight" />
+
+    <style name="progress" parent="SpinKitView.Circle" />
+
+    <style name="progressBottom" parent="SpinKitView.ThreeBounce" />
+
+    <style name="searchBarSepia" parent="MaterialSearchBarDark" />
+</resources>

app/src/acad/res/values/colors.xml

@@ -1,16 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <color name="colorPrimary">#512DA8</color>
     <color name="colorPrimaryDark">#4527A0</color>
     <color name="colorAccent">#9C27B0</color>
 
+    <!-- Institutionnel -->
+    <color name="colorPrimary_institutionnel">#1B2E35</color>
+    <color name="colorPrimaryDark_institutionnel">#1B2E35</color>
+    <color name="colorAccent_institutionnel">#35A8E0</color>
+    <!-- maternelle -->
+    <color name="colorPrimary_maternelle">#341047</color>
+    <color name="colorPrimaryDark_maternelle">#341047</color>
+    <color name="colorAccent_maternelle">#D3135D</color>
+    <!-- art -->
+    <color name="colorPrimary_art">#0d3b5f</color>
+    <color name="colorPrimaryDark_art">#0d3b5f</color>
+    <color name="colorAccent_art">#E61B72</color>
+    <!-- sciences -->
+    <color name="colorPrimary_sciences">#0d3b5f</color>
+    <color name="colorPrimaryDark_sciences">#0d3b5f</color>
+    <color name="colorAccent_sciences">#59b700</color>
+    <!-- education -->
+    <color name="colorPrimary_education">#0d3b5f</color>
+    <color name="colorPrimaryDark_education">#0d3b5f</color>
+    <color name="colorAccent_education">#EA3700</color>
+    <!-- enseignement pro -->
+    <color name="colorPrimary_enseignement_pro">#0d3b5f</color>
+    <color name="colorPrimaryDark_enseignement_pro">#0d3b5f</color>
+    <color name="colorAccent_enseignement_pro">#730FBA</color>
+    <!-- langues -->
+    <color name="colorPrimary_langues">#0d3b5f</color>
+    <color name="colorPrimaryDark_langues">#0d3b5f</color>
+    <color name="colorAccent_langues">#F69622</color>
+    <!-- Action éducative -->
+    <color name="colorPrimary_action_educative">#1B2E35</color>
+    <color name="colorPrimaryDark_action_educative">#1B2E35</color>
+    <color name="colorAccent_action_educative">#E52928</color>
+    <!-- cycle2 -->
+    <color name="colorPrimary_cycle2">#341047</color>
+    <color name="colorPrimaryDark_cycle2">#341047</color>
+    <color name="colorAccent_cycle2">#39A935</color>
+    <!-- cycle3 -->
+    <color name="colorPrimary_cycle3">#341047</color>
+    <color name="colorPrimaryDark_cycle3">#341047</color>
+    <color name="colorAccent_cycle3">#C1661B</color>
+
+
+
     <color name="tag_color">#bbF2690D</color>
     <color name="tag_color_text">#FAFAFA</color>
     <color name="positive_thumbs">#2b90d9</color>
     <color name="favorite">#ca8f04</color>
     <color name="bookmark">#795548</color>
     <color name="negative_thumbs">#F44336</color>
-    <color name="backgroundDark">#DD000000</color>
+    <color name="backgroundLight">#DDFFFFFF</color>
+    <color name="backgroundDark">#DD222222</color>
     <color name="red_1">#F44336</color>
     <color name="gray_light">#80808080</color>
 </resources>

app/src/acad/res/values/styles.xml

@@ -0,0 +1,145 @@
+<resources>
+    
+    <attr name="backgroundView" format="color" />
+
+
+    <style name="BaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="backgroundView">@color/backgroundLight</item>
+    </style>
+    <style name="BaseThemeNoAction" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="backgroundView">@color/backgroundLight</item>
+    </style>
+    
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppThemeNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <!-- Institutionnel theme. -->
+    <style name="Institutionnel" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
+        <item name="colorAccent">@color/colorAccent_institutionnel</item>
+    </style>
+    <style name="InstitutionnelNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
+        <item name="colorAccent">@color/colorAccent_institutionnel</item>
+    </style>
+    <!-- Maternelle theme. -->
+    <style name="Maternelle" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_maternelle</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
+        <item name="colorAccent">@color/colorAccent_maternelle</item>
+    </style>
+    <style name="MaternelleNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_maternelle</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
+        <item name="colorAccent">@color/colorAccent_maternelle</item>
+    </style>
+    <!-- Art theme. -->
+    <style name="Art" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_art</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
+        <item name="colorAccent">@color/colorAccent_art</item>
+    </style>
+    <style name="ArtNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_art</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
+        <item name="colorAccent">@color/colorAccent_art</item>
+    </style>
+    <!-- Sciences theme. -->
+    <style name="Sciences" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_sciences</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
+        <item name="colorAccent">@color/colorAccent_sciences</item>
+    </style>
+    <style name="SciencesNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_sciences</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
+        <item name="colorAccent">@color/colorAccent_sciences</item>
+    </style>
+    <!-- Education theme. -->
+    <style name="Education" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_education</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
+        <item name="colorAccent">@color/colorAccent_education</item>
+    </style>
+    <style name="EducationNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_education</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
+        <item name="colorAccent">@color/colorAccent_education</item>
+    </style>
+    <!-- Enseignement Pro theme. -->
+    <style name="EnseignementPro" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
+        <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
+    </style>
+    <style name="EnseignementProNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
+        <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
+    </style>
+    <!-- Langues theme. -->
+    <style name="Langues" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_langues</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
+        <item name="colorAccent">@color/colorAccent_langues</item>
+    </style>
+    <style name="LanguesNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_langues</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
+        <item name="colorAccent">@color/colorAccent_langues</item>
+    </style>
+    <!-- ActionEducative theme. -->
+    <style name="ActionEducative" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_action_educative</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
+        <item name="colorAccent">@color/colorAccent_action_educative</item>
+    </style>
+    <style name="ActionEducativeNoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_action_educative</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
+        <item name="colorAccent">@color/colorAccent_action_educative</item>
+    </style>
+    <!-- Cycle 2 theme. -->
+    <style name="Cycle2" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_cycle2</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
+        <item name="colorAccent">@color/colorAccent_cycle2</item>
+    </style>
+    <style name="Cycle2NoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_cycle2</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
+        <item name="colorAccent">@color/colorAccent_cycle2</item>
+    </style>
+    <!-- Cycle 3 theme. -->
+    <style name="Cycle3" parent="BaseTheme">
+        <item name="colorPrimary">@color/colorPrimary_cycle3</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
+        <item name="colorAccent">@color/colorAccent_cycle3</item>
+    </style>
+    <style name="Cycle3NoActionBar" parent="BaseThemeNoAction">
+        <item name="colorPrimary">@color/colorPrimary_cycle3</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
+        <item name="colorAccent">@color/colorAccent_cycle3</item>
+    </style>
+    <style name="theme" parent="@style/ThemeOverlay.AppCompat.Dark" />
+
+    <style name="popupTheme" parent="@style/ThemeOverlay.AppCompat.DayNight" />
+
+    <style name="progress" parent="SpinKitView.Circle" />
+
+    <style name="progressBottom" parent="SpinKitView.ThreeBounce" />
+
+    <style name="searchBarSepia" parent="MaterialSearchBarDark" />
+</resources>

app/src/acad/res/xml/file_paths.xml

@@ -3,4 +3,9 @@
     <external-path
         name="my_images"
         path="/TubeAcad/" />
+
+    <external-path
+        name="external_files"
+        path="/"/>
+
 </paths>

app/src/bittube/res/color/bottom_nav_color.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorAccent" android:state_checked="true" />
-    <item android:color="@android:color/tab_indicator_text" />
-</selector>

app/src/bittube/res/drawable-anydpi-v24/ic_notification_tubelab.xml

@@ -1,864 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group
-        android:scaleX="0.66"
-        android:scaleY="0.66"
-        android:translateX="21"
-        android:translateY="21">
-        <path android:pathData="M85.355,14.645C75.91,5.201 63.354,0 50,0C36.644,0 24.088,5.201 14.645,14.645S0,36.644 0,50c0,13.357 5.201,25.913 14.645,35.355C24.087,94.799 36.643,100 50,100c13.357,0 25.913,-5.201 35.355,-14.645C94.799,75.912 100,63.356 100,50C100,36.646 94.799,24.09 85.355,14.645z">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="15.7699"
-                    android:endY="86.8818"
-                    android:startX="83.2562"
-                    android:startY="14.1677"
-                    android:type="linear">
-                    <item
-                        android:color="#FF28D1BC"
-                        android:offset="0" />
-                    <item
-                        android:color="#FF00ABFF"
-                        android:offset="0.6" />
-                    <item
-                        android:color="#FF2A5ED6"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M3.151,32.464L13.3,46.493L30.239,4.045c-5.75,2.474 -11.035,6.041 -15.595,10.6C9.504,19.786 5.623,25.851 3.151,32.464z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="24.2938"
-                    android:endY="39.2239"
-                    android:startX="-4.1098"
-                    android:startY="-39.1612"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.5762" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M2.3,34.893c-1.5,4.8 -2.3,9.8 -2.3,15c0,2.8 0.2,5.5 0.7,8.2l7.8,10l36.878,-26.896L2.3,34.893z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="26.5038"
-                    android:endY="54.332794"
-                    android:startX="-2.655"
-                    android:startY="33.41799"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.006" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M40.8,5.893l27.6,28.3l8.9,-26.2c-5.8,-3.8 -12.3,-6.3 -19.2,-7.4L40.8,5.893z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="62.8149"
-                    android:endY="14.768093"
-                    android:startX="84.794"
-                    android:startY="0.65519285"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.0013" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M42.79,46.347l25.8,0.6l-27.6,-28.3z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="45.013"
-                    android:endY="42.08"
-                    android:startX="59.9387"
-                    android:startY="27.9081"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M96.88,67.451C98.928,61.941 100,56.054 100,50c0,-0.202 -0.005,-0.402 -0.007,-0.604L68.806,34.399L96.88,67.451z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="79.7008"
-                    android:endY="33.716"
-                    android:startX="107.2237"
-                    android:startY="81.6425"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.0029" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M27.8,15.893l17.4,11.8l3.7,-21.1z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="48.8608"
-                    android:endY="17.1429"
-                    android:startX="27.8"
-                    android:startY="17.1429"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="8.440641E-4" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M97.976,35.848l-5.312,-1.255l3.7,24l3.329,-3.044C99.895,53.719 100,51.868 100,50C100,45.14 99.308,40.386 97.976,35.848z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="93.5393"
-                    android:endY="46.7512"
-                    android:startX="101.8224"
-                    android:startY="45.4073"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.0017" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M72.998,85.447l2.742,7.442c2.87,-1.729 5.579,-3.761 8.092,-6.075L72.998,85.447z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="77.1128"
-                    android:endY="79.7658"
-                    android:startX="81.8324"
-                    android:startY="102.8394"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.0013" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="0.9982" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M87.435,83.143c2.349,-2.646 4.393,-5.5 6.108,-8.522l-28.357,2.776L87.435,83.143z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="65.4945"
-                    android:endY="79.3595"
-                    android:startX="123.109"
-                    android:startY="78.2586"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.0022" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="0.9966" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M72.9,85.193l-56.3,-11.1l7.2,18.4c1.6,1 3.3,1.9 5.1,2.7L72.9,85.193z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="38.2047"
-                    android:endY="89.4249"
-                    android:startX="58.4365"
-                    android:startY="59.1884"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0.0015" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:fillAlpha="0.71"
-            android:pathData="M79.09,58.897l-21,1.5l10.3,18.9z"
-            android:strokeAlpha="0.71">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="61.745285"
-                    android:endY="71.03565"
-                    android:startX="78.23818"
-                    android:startY="57.920563"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFFFFFF"
-                        android:offset="0" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="0.9993" />
-                </gradient>
-            </aapt:attr>
-        </path>
-        <group>
-            <clip-path android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0" />
-            <path android:pathData="M31.304,22.589v0.7c0,0.1 0,0.1 -0.1,0.2l-1.9,0.8c0,0 0,0 -0.1,0s0,0 -0.1,0l-0.4,-0.2l19.7,27l2.4,-1.7L31.304,22.589z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="50.7969"
-                        android:endY="36.839092"
-                        android:startX="28.7808"
-                        android:startY="36.839092"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.006" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M65.409,20.005l-0.005,-1.116l-17,30.7l2.5,1.4l16.722,-30.026L65.409,20.005z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="48.3499"
-                        android:endY="34.939095"
-                        android:startX="67.5984"
-                        android:startY="34.939095"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0013" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M79.625,18.344l-0.021,-1.254l-31.3,32.1l2.1,2l31.2,-32L79.625,18.344z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="48.3039"
-                        android:endY="34.138992"
-                        android:startX="81.6039"
-                        android:startY="34.138992"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="7.851759E-5" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M90.104,35.389c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2l-41.1,15.7l1,2.7l41.3,-15.8L90.104,35.389z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="48.8205"
-                        android:endY="42.388992"
-                        android:startX="91.2039"
-                        android:startY="42.388992"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0038" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M11.804,27.989v1.8c0,0.1 -0.1,0.2 -0.1,0.2l-1.2,0.5l38.5,20.9l1.4,-2.6L11.804,27.989z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="50.3298"
-                        android:endY="39.689095"
-                        android:startX="10.4298"
-                        android:startY="39.689095"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0025" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M17.265,50.089c0.1,0 0.1,0.2 0.1,0.2v2.5c0,0.1 -0.1,0.2 -0.1,0.2l32.439,-1.3l-0.1,-2.9L17.265,50.089z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="49.6603"
-                        android:endY="50.888992"
-                        android:startX="17.2212"
-                        android:startY="50.888992"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="3.140703E-4" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M7.668,60.675c0.036,0.014 0.234,0.056 0.236,0.214l0,0l0,0v1.9l42.1,-11.2l-0.9,-2.8l-42.8,11.4C6.304,60.189 7.632,60.661 7.668,60.675z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="50.0039"
-                        android:endY="55.789093"
-                        android:startX="6.304"
-                        android:startY="55.789093"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0047" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M33.904,62.147v1.942l16.7,-11.95l-1.8,-2.3L32.611,61.406L33.904,62.147z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="50.5851"
-                        android:endY="56.964092"
-                        android:startX="32.571"
-                        android:startY="56.964092"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.003" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M35.804,35.789v1.2c0,0.1 -0.1,0.2 -0.1,0.2l-1.8,0.8l14.5,13.4l2,-2.1L35.804,35.789z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="50.3668"
-                        android:endY="43.589092"
-                        android:startX="33.8669"
-                        android:startY="43.589092"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0048" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M55.804,33.089C55.804,33.089 55.704,33.089 55.804,33.089c-0.1,0 -0.1,0 -0.2,0l-1.9,-0.8l0,0l-5.4,17.5l2.8,0.9l5.5,-17.9L55.804,33.089z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="48.2319"
-                        android:endY="41.489094"
-                        android:startX="56.5588"
-                        android:startY="41.489094"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M64.804,45.489l-13.8,3.2l0.7,2.8l13.8,-3.2L64.804,45.489z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="50.9512"
-                        android:endY="48.489094"
-                        android:startX="65.4322"
-                        android:startY="48.489094"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0032" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M74.107,63.536L74.107,63.536L74.107,63.536c0,-0.098 0,-0.098 0.098,-0.195l0,0l0,0l0,0l1.172,-0.391L50.571,49.278l-1.367,2.441l24.903,13.77C74.107,65.489 74.107,63.536 74.107,63.536z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="49.2177"
-                        android:endY="57.3833"
-                        android:startX="75.4526"
-                        android:startY="57.3833"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="5.496231E-4" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M81.904,79.089L81.904,79.089L81.904,79.089L81.904,79.089l2,-0.6c0,0 0,0 0.1,0l-33.7,-29.4l-1.9,2.2l33.3,29v-1C81.704,79.289 81.694,79.141 81.904,79.089z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="48.4039"
-                        android:endY="64.689095"
-                        android:startX="84.0039"
-                        android:startY="64.689095"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0012" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M54.404,79.689l2,-0.6h0.1l0.7,0.2l-6.2,-29.7l-2.8,0.6L54.404,79.689L54.404,79.689z">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="48.1377"
-                        android:endY="64.63899"
-                        android:startX="57.3221"
-                        android:startY="64.63899"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.0025" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-            <path android:pathData="M64.804,46.689l-15.6,2.1l0.4,2.9l30.2,-4.1l-0.4,-0.1c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2.5l0,0l0,0l0,0L64.804,46.689">
-                <aapt:attr name="android:fillColor">
-                    <gradient
-                        android:endX="49.1732"
-                        android:endY="48.239094"
-                        android:startX="79.7731"
-                        android:startY="48.239094"
-                        android:type="linear">
-                        <item
-                            android:color="#FFFFFFFF"
-                            android:offset="0.003" />
-                        <item
-                            android:color="#00FFFFFF"
-                            android:offset="1" />
-                    </gradient>
-                </aapt:attr>
-            </path>
-        </group>
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M51.639,0.029l-10.172,9.922l38.598,0.091"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M65.366,2.397L67.311,16.642"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M77.224,8.046L71.304,14.042"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M79.609,16.642L69.609,17.642"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M83.78,13.139L82.883,14.965"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M85.325,14.615c0.096,0.097 -3.374,29.468 -3.374,29.468"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M89.811,35.231L68.98,45.442"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M81.157,19.065L67.957,44.865"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M89.66,32.342l-48.193,-22.391l23.922,7.289"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M69.592,19.841L93.523,25.345"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M91.096,21.502L91.699,31.585"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M95.08,28.318L93.554,32.271"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M92.657,35.991L91.055,78.558"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M78.616,65.137L96.149,69.308"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M99.904,46.935L78.571,63.748"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M99.296,41.575c-0.585,0.17 -15.743,4.529 -15.743,4.529l16.414,5.629"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M99.766,54.87l-15.164,16.679l5.749,7.991"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M77.456,66.713L83.427,78.637"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M84.31,82.536L83.75,86.889"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M85.28,82.142L86.327,84.354"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M81.12,48.139l-4.73,14.382l-8.132,-14.106"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M79.18,45.887L68.951,46.291"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M79.305,47.596L17.837,88.283"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M54.335,79.846L33.835,64.846"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M65.137,48.23L16.967,87.533"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M75.145,66.556c-0.008,0.074 -16.683,13.266 -16.683,13.266"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M74.354,66.171L62.454,98.371"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M67.749,96.77L22.551,91.808"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M54.293,81.937L19.29,89.467"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M54.846,82.756l-18.767,15.187l48.523,-26.394"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M25.193,93.341L55.115,99.637"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M31.046,65.521L15.515,86.205"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M54.466,32.642L33.573,61.932"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M34.116,62.841L64.78,47.542"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M64.799,46.436L17.528,51.124"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M17.481,52.92L29.665,61.822"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M7.972,61.193L64.229,47.287"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M29.602,63.342L8.042,62.247"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M32.453,37.508L14.288,84.989"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M28.519,23.938L11.678,82.116"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M6.456,64.297L5.153,72.159"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M3.605,62.036L1.439,61.984"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M0.08,52.807L13.108,51.842"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M9.157,30.693L6.857,59.693"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M14.243,53.353L6.765,60.325"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M27.926,23.641L16.156,49.667"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M16.351,27.987L15.502,49.442"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M31.704,37.136L17.432,50.364"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M1.452,37.962L13.741,49.851"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M8.149,30.316L0.472,43.105"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M0.306,44.454L13.082,50.537"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M14.188,15.113L10.004,26.542"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M11.786,27.339L14.886,26.239"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M16.953,12.477L16.651,24.087"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M19.154,24.807L27.254,21.972"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M20.361,9.72L28.536,20.331"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M54.069,29.329L27.064,5.547"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M31.287,22.039L53.587,29.739"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M53.593,30.937L35.793,34.637"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillAlpha="0.6"
-            android:fillColor="#FF000000"
-            android:pathData="M64.821,45.539L35.934,36.076"
-            android:strokeAlpha="0.6" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M81.802,15.419l-1.317,0.456l1.327,0.511l1.327,-0.511L81.802,15.419zM80.162,18.059l1.476,0.588v-1.92l-1.476,-0.588V18.059zM82.004,16.705v1.942l1.441,-0.584v-1.924L82.004,16.705z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M67.443,17.033l-1.317,0.456L67.453,18l1.327,-0.511L67.443,17.033zM65.804,19.673l1.476,0.588v-1.92l-1.476,-0.588V19.673zM67.646,18.319v1.942l1.441,-0.584v-1.924L67.646,18.319z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M55.737,29.211l-1.317,0.456l1.327,0.511l1.327,-0.511L55.737,29.211zM54.098,31.851l1.476,0.588v-1.92l-1.476,-0.588V31.851zM55.94,30.497v1.942l1.441,-0.584v-1.924L55.94,30.497z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M29.251,20.523l-1.317,0.456l1.327,0.511l1.327,-0.511L29.251,20.523zM27.611,23.164l1.476,0.588v-1.92l-1.476,-0.588V23.164zM29.453,21.81v1.942l1.441,-0.584v-1.924L29.453,21.81z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M15.227,49.775l-1.317,0.456l1.327,0.511l1.327,-0.511L15.227,49.775zM13.587,52.415l1.476,0.588v-1.92l-1.476,-0.588V52.415zM15.429,51.062v1.942l1.441,-0.584v-1.924L15.429,51.062z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M9.601,26.95l-1.317,0.456l1.327,0.511l1.327,-0.511L9.601,26.95zM7.962,29.59l1.476,0.588v-1.92L7.962,27.67V29.59zM9.804,28.236v1.942l1.441,-0.584V27.67L9.804,28.236z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M56.429,79.561l-1.317,0.456l1.327,0.511l1.327,-0.511L56.429,79.561zM54.79,82.201l1.476,0.588v-1.92l-1.476,-0.588V82.201zM56.632,80.847v1.942l1.441,-0.584v-1.924L56.632,80.847z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M33.602,34.175l-1.317,0.456l1.327,0.511l1.327,-0.511L33.602,34.175zM31.963,36.815l1.476,0.588v-1.92l-1.476,-0.588V36.815zM33.804,35.462v1.942l1.441,-0.584v-1.924L33.804,35.462z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M31.796,61.722l-1.317,0.456l1.327,0.511l1.327,-0.511L31.796,61.722zM30.156,64.362l1.476,0.588v-1.92l-1.476,-0.588V64.362zM31.998,63.009v1.942l1.441,-0.584v-1.924L31.998,63.009z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M83.96,79.141l-1.317,0.456l1.327,0.511l1.327,-0.511L83.96,79.141zM82.321,81.781l1.476,0.588v-1.92l-1.476,-0.588V81.781zM84.162,80.428v1.942l1.441,-0.584v-1.924L84.162,80.428z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M76.393,63.075l-1.317,0.456l1.327,0.511l1.327,-0.511L76.393,63.075zM74.754,65.715l1.476,0.588v-1.92l-1.476,-0.588V65.715zM76.596,64.362v1.942l1.441,-0.584v-1.924L76.596,64.362z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M81.202,44.475l-1.317,0.456l1.327,0.511l1.327,-0.511L81.202,44.475zM79.563,47.115l1.476,0.588v-1.92l-1.476,-0.588V47.115zM81.404,45.762v1.942l1.441,-0.584v-1.924L81.404,45.762z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M92.296,32.228l-1.317,0.456l1.327,0.511l1.327,-0.511L92.296,32.228zM90.656,34.868l1.476,0.588v-1.92l-1.476,-0.588V34.868zM92.498,33.515v1.942l1.441,-0.584v-1.924L92.498,33.515z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M5.806,60.518l-1.317,0.456l1.327,0.511l1.327,-0.511L5.806,60.518zM4.167,63.158l1.476,0.588v-1.92l-1.476,-0.588V63.158zM6.009,61.804v1.942l1.441,-0.584v-1.924L6.009,61.804z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M24.691,30.255c-0.615,0.788 -0.538,1.99 0.329,2.667c0.867,0.677 1.99,0.538 2.667,-0.329c6.397,-8.2 16.796,-12.263 27.125,-10.546c0.658,0.133 1.342,-0.095 1.773,-0.646c0.185,-0.237 0.29,-0.535 0.396,-0.833c0.088,-0.438 0.019,-1 -0.314,-1.386s-0.727,-0.694 -1.165,-0.782C43.638,16.373 31.949,20.952 24.691,30.255z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M71.1,47.4L41.3,29.2c-1,-0.5 -2.2,-0.5 -3.2,0.1s-1.6,1.6 -1.6,2.8v36.2c0,1.1 0.6,2.2 1.6,2.8c0.5,0.3 1.1,0.5 1.6,0.5s1.1,-0.1 1.6,-0.4L71.1,53c1,-0.6 1.6,-1.6 1.6,-2.8C72.7,49.1 72.1,48 71.1,47.4zM68.5,50.2L40.3,67.4V33L68.5,50.2z" />
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M79.6,20.4C71.7,12.6 61.2,8.2 50,8.2s-21.7,4.3 -29.6,12.2C12.6,28.3 8.2,38.8 8.2,50s4.3,21.7 12.2,29.6S38.8,91.8 50,91.8s21.7,-4.3 29.6,-12.2S91.8,61.2 91.8,50S87.4,28.3 79.6,20.4zM88.1,50c0,10.2 -4,19.7 -11.2,26.9C69.7,84.1 60.2,88.1 50,88.1s-19.7,-4 -26.9,-11.2C15.9,69.7 11.9,60.2 11.9,50s4,-19.7 11.2,-26.9S39.9,11.9 50,11.9c10.2,0 19.7,4 26.9,11.2C84.1,30.3 88.1,39.8 88.1,50z" />
-    </group>
-</vector>
-

app/src/bittube/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,862 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group
-      android:scaleX="0.66"
-      android:scaleY="0.66"
-      android:translateX="21"
-      android:translateY="21">
-    <path android:pathData="M85.355,14.645C75.91,5.201 63.354,0 50,0C36.644,0 24.088,5.201 14.645,14.645S0,36.644 0,50c0,13.357 5.201,25.913 14.645,35.355C24.087,94.799 36.643,100 50,100c13.357,0 25.913,-5.201 35.355,-14.645C94.799,75.912 100,63.356 100,50C100,36.646 94.799,24.09 85.355,14.645z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="15.7699"
-            android:endY="86.8818"
-            android:startX="83.2562"
-            android:startY="14.1677"
-            android:type="linear">
-          <item
-              android:color="#FF28D1BC"
-              android:offset="0" />
-          <item
-              android:color="#FF00ABFF"
-              android:offset="0.6" />
-          <item
-              android:color="#FF2A5ED6"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M3.151,32.464L13.3,46.493L30.239,4.045c-5.75,2.474 -11.035,6.041 -15.595,10.6C9.504,19.786 5.623,25.851 3.151,32.464z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="24.2938"
-            android:endY="39.2239"
-            android:startX="-4.1098"
-            android:startY="-39.1612"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.5762" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M2.3,34.893c-1.5,4.8 -2.3,9.8 -2.3,15c0,2.8 0.2,5.5 0.7,8.2l7.8,10l36.878,-26.896L2.3,34.893z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="26.5038"
-            android:endY="54.332794"
-            android:startX="-2.655"
-            android:startY="33.41799"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.006" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M40.8,5.893l27.6,28.3l8.9,-26.2c-5.8,-3.8 -12.3,-6.3 -19.2,-7.4L40.8,5.893z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="62.8149"
-            android:endY="14.768093"
-            android:startX="84.794"
-            android:startY="0.65519285"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0013" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M42.79,46.347l25.8,0.6l-27.6,-28.3z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="45.013"
-            android:endY="42.08"
-            android:startX="59.9387"
-            android:startY="27.9081"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M96.88,67.451C98.928,61.941 100,56.054 100,50c0,-0.202 -0.005,-0.402 -0.007,-0.604L68.806,34.399L96.88,67.451z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="79.7008"
-            android:endY="33.716"
-            android:startX="107.2237"
-            android:startY="81.6425"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0029" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M27.8,15.893l17.4,11.8l3.7,-21.1z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.8608"
-            android:endY="17.1429"
-            android:startX="27.8"
-            android:startY="17.1429"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="8.440641E-4" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M97.976,35.848l-5.312,-1.255l3.7,24l3.329,-3.044C99.895,53.719 100,51.868 100,50C100,45.14 99.308,40.386 97.976,35.848z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="93.5393"
-            android:endY="46.7512"
-            android:startX="101.8224"
-            android:startY="45.4073"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0017" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M72.998,85.447l2.742,7.442c2.87,-1.729 5.579,-3.761 8.092,-6.075L72.998,85.447z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="77.1128"
-            android:endY="79.7658"
-            android:startX="81.8324"
-            android:startY="102.8394"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0013" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="0.9982" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M87.435,83.143c2.349,-2.646 4.393,-5.5 6.108,-8.522l-28.357,2.776L87.435,83.143z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="65.4945"
-            android:endY="79.3595"
-            android:startX="123.109"
-            android:startY="78.2586"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0022" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="0.9966" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M72.9,85.193l-56.3,-11.1l7.2,18.4c1.6,1 3.3,1.9 5.1,2.7L72.9,85.193z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="38.2047"
-            android:endY="89.4249"
-            android:startX="58.4365"
-            android:startY="59.1884"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0015" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:fillAlpha="0.71"
-        android:pathData="M79.09,58.897l-21,1.5l10.3,18.9z"
-        android:strokeAlpha="0.71">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="61.745285"
-            android:endY="71.03565"
-            android:startX="78.23818"
-            android:startY="57.920563"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="0.9993" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <group>
-      <clip-path android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0" />
-      <path android:pathData="M31.304,22.589v0.7c0,0.1 0,0.1 -0.1,0.2l-1.9,0.8c0,0 0,0 -0.1,0s0,0 -0.1,0l-0.4,-0.2l19.7,27l2.4,-1.7L31.304,22.589z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="50.7969"
-              android:endY="36.839092"
-              android:startX="28.7808"
-              android:startY="36.839092"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.006" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M65.409,20.005l-0.005,-1.116l-17,30.7l2.5,1.4l16.722,-30.026L65.409,20.005z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="48.3499"
-              android:endY="34.939095"
-              android:startX="67.5984"
-              android:startY="34.939095"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0013" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M79.625,18.344l-0.021,-1.254l-31.3,32.1l2.1,2l31.2,-32L79.625,18.344z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="48.3039"
-              android:endY="34.138992"
-              android:startX="81.6039"
-              android:startY="34.138992"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="7.851759E-5" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M90.104,35.389c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2l-41.1,15.7l1,2.7l41.3,-15.8L90.104,35.389z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="48.8205"
-              android:endY="42.388992"
-              android:startX="91.2039"
-              android:startY="42.388992"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0038" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M11.804,27.989v1.8c0,0.1 -0.1,0.2 -0.1,0.2l-1.2,0.5l38.5,20.9l1.4,-2.6L11.804,27.989z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="50.3298"
-              android:endY="39.689095"
-              android:startX="10.4298"
-              android:startY="39.689095"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0025" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M17.265,50.089c0.1,0 0.1,0.2 0.1,0.2v2.5c0,0.1 -0.1,0.2 -0.1,0.2l32.439,-1.3l-0.1,-2.9L17.265,50.089z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="49.6603"
-              android:endY="50.888992"
-              android:startX="17.2212"
-              android:startY="50.888992"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="3.140703E-4" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M7.668,60.675c0.036,0.014 0.234,0.056 0.236,0.214l0,0l0,0v1.9l42.1,-11.2l-0.9,-2.8l-42.8,11.4C6.304,60.189 7.632,60.661 7.668,60.675z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="50.0039"
-              android:endY="55.789093"
-              android:startX="6.304"
-              android:startY="55.789093"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0047" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M33.904,62.147v1.942l16.7,-11.95l-1.8,-2.3L32.611,61.406L33.904,62.147z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="50.5851"
-              android:endY="56.964092"
-              android:startX="32.571"
-              android:startY="56.964092"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.003" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M35.804,35.789v1.2c0,0.1 -0.1,0.2 -0.1,0.2l-1.8,0.8l14.5,13.4l2,-2.1L35.804,35.789z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="50.3668"
-              android:endY="43.589092"
-              android:startX="33.8669"
-              android:startY="43.589092"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0048" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M55.804,33.089C55.804,33.089 55.704,33.089 55.804,33.089c-0.1,0 -0.1,0 -0.2,0l-1.9,-0.8l0,0l-5.4,17.5l2.8,0.9l5.5,-17.9L55.804,33.089z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="48.2319"
-              android:endY="41.489094"
-              android:startX="56.5588"
-              android:startY="41.489094"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M64.804,45.489l-13.8,3.2l0.7,2.8l13.8,-3.2L64.804,45.489z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="50.9512"
-              android:endY="48.489094"
-              android:startX="65.4322"
-              android:startY="48.489094"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0032" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M74.107,63.536L74.107,63.536L74.107,63.536c0,-0.098 0,-0.098 0.098,-0.195l0,0l0,0l0,0l1.172,-0.391L50.571,49.278l-1.367,2.441l24.903,13.77C74.107,65.489 74.107,63.536 74.107,63.536z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="49.2177"
-              android:endY="57.3833"
-              android:startX="75.4526"
-              android:startY="57.3833"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="5.496231E-4" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M81.904,79.089L81.904,79.089L81.904,79.089L81.904,79.089l2,-0.6c0,0 0,0 0.1,0l-33.7,-29.4l-1.9,2.2l33.3,29v-1C81.704,79.289 81.694,79.141 81.904,79.089z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="48.4039"
-              android:endY="64.689095"
-              android:startX="84.0039"
-              android:startY="64.689095"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0012" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M54.404,79.689l2,-0.6h0.1l0.7,0.2l-6.2,-29.7l-2.8,0.6L54.404,79.689L54.404,79.689z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="48.1377"
-              android:endY="64.63899"
-              android:startX="57.3221"
-              android:startY="64.63899"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.0025" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path android:pathData="M64.804,46.689l-15.6,2.1l0.4,2.9l30.2,-4.1l-0.4,-0.1c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2.5l0,0l0,0l0,0L64.804,46.689">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:endX="49.1732"
-              android:endY="48.239094"
-              android:startX="79.7731"
-              android:startY="48.239094"
-              android:type="linear">
-            <item
-                android:color="#FFFFFFFF"
-                android:offset="0.003" />
-            <item
-                android:color="#00FFFFFF"
-                android:offset="1" />
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M51.639,0.029l-10.172,9.922l38.598,0.091"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M65.366,2.397L67.311,16.642"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M77.224,8.046L71.304,14.042"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M79.609,16.642L69.609,17.642"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M83.78,13.139L82.883,14.965"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M85.325,14.615c0.096,0.097 -3.374,29.468 -3.374,29.468"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M89.811,35.231L68.98,45.442"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M81.157,19.065L67.957,44.865"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M89.66,32.342l-48.193,-22.391l23.922,7.289"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M69.592,19.841L93.523,25.345"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M91.096,21.502L91.699,31.585"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M95.08,28.318L93.554,32.271"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M92.657,35.991L91.055,78.558"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M78.616,65.137L96.149,69.308"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M99.904,46.935L78.571,63.748"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M99.296,41.575c-0.585,0.17 -15.743,4.529 -15.743,4.529l16.414,5.629"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M99.766,54.87l-15.164,16.679l5.749,7.991"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M77.456,66.713L83.427,78.637"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M84.31,82.536L83.75,86.889"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M85.28,82.142L86.327,84.354"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M81.12,48.139l-4.73,14.382l-8.132,-14.106"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M79.18,45.887L68.951,46.291"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M79.305,47.596L17.837,88.283"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M54.335,79.846L33.835,64.846"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M65.137,48.23L16.967,87.533"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M75.145,66.556c-0.008,0.074 -16.683,13.266 -16.683,13.266"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M74.354,66.171L62.454,98.371"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M67.749,96.77L22.551,91.808"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M54.293,81.937L19.29,89.467"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M54.846,82.756l-18.767,15.187l48.523,-26.394"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M25.193,93.341L55.115,99.637"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M31.046,65.521L15.515,86.205"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M54.466,32.642L33.573,61.932"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M34.116,62.841L64.78,47.542"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M64.799,46.436L17.528,51.124"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M17.481,52.92L29.665,61.822"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M7.972,61.193L64.229,47.287"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M29.602,63.342L8.042,62.247"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M32.453,37.508L14.288,84.989"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M28.519,23.938L11.678,82.116"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M6.456,64.297L5.153,72.159"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M3.605,62.036L1.439,61.984"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M0.08,52.807L13.108,51.842"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M9.157,30.693L6.857,59.693"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M14.243,53.353L6.765,60.325"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M27.926,23.641L16.156,49.667"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M16.351,27.987L15.502,49.442"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M31.704,37.136L17.432,50.364"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M1.452,37.962L13.741,49.851"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M8.149,30.316L0.472,43.105"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M0.306,44.454L13.082,50.537"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M14.188,15.113L10.004,26.542"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M11.786,27.339L14.886,26.239"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M16.953,12.477L16.651,24.087"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M19.154,24.807L27.254,21.972"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M20.361,9.72L28.536,20.331"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M54.069,29.329L27.064,5.547"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M31.287,22.039L53.587,29.739"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M53.593,30.937L35.793,34.637"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillAlpha="0.6"
-        android:fillColor="#FF000000"
-        android:pathData="M64.821,45.539L35.934,36.076"
-        android:strokeAlpha="0.6" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M81.802,15.419l-1.317,0.456l1.327,0.511l1.327,-0.511L81.802,15.419zM80.162,18.059l1.476,0.588v-1.92l-1.476,-0.588V18.059zM82.004,16.705v1.942l1.441,-0.584v-1.924L82.004,16.705z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M67.443,17.033l-1.317,0.456L67.453,18l1.327,-0.511L67.443,17.033zM65.804,19.673l1.476,0.588v-1.92l-1.476,-0.588V19.673zM67.646,18.319v1.942l1.441,-0.584v-1.924L67.646,18.319z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M55.737,29.211l-1.317,0.456l1.327,0.511l1.327,-0.511L55.737,29.211zM54.098,31.851l1.476,0.588v-1.92l-1.476,-0.588V31.851zM55.94,30.497v1.942l1.441,-0.584v-1.924L55.94,30.497z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M29.251,20.523l-1.317,0.456l1.327,0.511l1.327,-0.511L29.251,20.523zM27.611,23.164l1.476,0.588v-1.92l-1.476,-0.588V23.164zM29.453,21.81v1.942l1.441,-0.584v-1.924L29.453,21.81z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M15.227,49.775l-1.317,0.456l1.327,0.511l1.327,-0.511L15.227,49.775zM13.587,52.415l1.476,0.588v-1.92l-1.476,-0.588V52.415zM15.429,51.062v1.942l1.441,-0.584v-1.924L15.429,51.062z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M9.601,26.95l-1.317,0.456l1.327,0.511l1.327,-0.511L9.601,26.95zM7.962,29.59l1.476,0.588v-1.92L7.962,27.67V29.59zM9.804,28.236v1.942l1.441,-0.584V27.67L9.804,28.236z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M56.429,79.561l-1.317,0.456l1.327,0.511l1.327,-0.511L56.429,79.561zM54.79,82.201l1.476,0.588v-1.92l-1.476,-0.588V82.201zM56.632,80.847v1.942l1.441,-0.584v-1.924L56.632,80.847z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M33.602,34.175l-1.317,0.456l1.327,0.511l1.327,-0.511L33.602,34.175zM31.963,36.815l1.476,0.588v-1.92l-1.476,-0.588V36.815zM33.804,35.462v1.942l1.441,-0.584v-1.924L33.804,35.462z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M31.796,61.722l-1.317,0.456l1.327,0.511l1.327,-0.511L31.796,61.722zM30.156,64.362l1.476,0.588v-1.92l-1.476,-0.588V64.362zM31.998,63.009v1.942l1.441,-0.584v-1.924L31.998,63.009z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M83.96,79.141l-1.317,0.456l1.327,0.511l1.327,-0.511L83.96,79.141zM82.321,81.781l1.476,0.588v-1.92l-1.476,-0.588V81.781zM84.162,80.428v1.942l1.441,-0.584v-1.924L84.162,80.428z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M76.393,63.075l-1.317,0.456l1.327,0.511l1.327,-0.511L76.393,63.075zM74.754,65.715l1.476,0.588v-1.92l-1.476,-0.588V65.715zM76.596,64.362v1.942l1.441,-0.584v-1.924L76.596,64.362z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M81.202,44.475l-1.317,0.456l1.327,0.511l1.327,-0.511L81.202,44.475zM79.563,47.115l1.476,0.588v-1.92l-1.476,-0.588V47.115zM81.404,45.762v1.942l1.441,-0.584v-1.924L81.404,45.762z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M92.296,32.228l-1.317,0.456l1.327,0.511l1.327,-0.511L92.296,32.228zM90.656,34.868l1.476,0.588v-1.92l-1.476,-0.588V34.868zM92.498,33.515v1.942l1.441,-0.584v-1.924L92.498,33.515z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M5.806,60.518l-1.317,0.456l1.327,0.511l1.327,-0.511L5.806,60.518zM4.167,63.158l1.476,0.588v-1.92l-1.476,-0.588V63.158zM6.009,61.804v1.942l1.441,-0.584v-1.924L6.009,61.804z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M24.691,30.255c-0.615,0.788 -0.538,1.99 0.329,2.667c0.867,0.677 1.99,0.538 2.667,-0.329c6.397,-8.2 16.796,-12.263 27.125,-10.546c0.658,0.133 1.342,-0.095 1.773,-0.646c0.185,-0.237 0.29,-0.535 0.396,-0.833c0.088,-0.438 0.019,-1 -0.314,-1.386s-0.727,-0.694 -1.165,-0.782C43.638,16.373 31.949,20.952 24.691,30.255z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M71.1,47.4L41.3,29.2c-1,-0.5 -2.2,-0.5 -3.2,0.1s-1.6,1.6 -1.6,2.8v36.2c0,1.1 0.6,2.2 1.6,2.8c0.5,0.3 1.1,0.5 1.6,0.5s1.1,-0.1 1.6,-0.4L71.1,53c1,-0.6 1.6,-1.6 1.6,-2.8C72.7,49.1 72.1,48 71.1,47.4zM68.5,50.2L40.3,67.4V33L68.5,50.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M79.6,20.4C71.7,12.6 61.2,8.2 50,8.2s-21.7,4.3 -29.6,12.2C12.6,28.3 8.2,38.8 8.2,50s4.3,21.7 12.2,29.6S38.8,91.8 50,91.8s21.7,-4.3 29.6,-12.2S91.8,61.2 91.8,50S87.4,28.3 79.6,20.4zM88.1,50c0,10.2 -4,19.7 -11.2,26.9C69.7,84.1 60.2,88.1 50,88.1s-19.7,-4 -26.9,-11.2C15.9,69.7 11.9,60.2 11.9,50s4,-19.7 11.2,-26.9S39.9,11.9 50,11.9c10.2,0 19.7,4 26.9,11.2C84.1,30.3 88.1,39.8 88.1,50z" />
-  </group>
-</vector>

app/src/bittube/res/drawable/bittube.xml

@@ -1,856 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="100dp"
-    android:height="100dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-  <path android:pathData="M85.355,14.645C75.91,5.201 63.354,0 50,0C36.644,0 24.088,5.201 14.645,14.645S0,36.644 0,50c0,13.357 5.201,25.913 14.645,35.355C24.087,94.799 36.643,100 50,100c13.357,0 25.913,-5.201 35.355,-14.645C94.799,75.912 100,63.356 100,50C100,36.646 94.799,24.09 85.355,14.645z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="15.7699"
-          android:endY="86.8818"
-          android:startX="83.2562"
-          android:startY="14.1677"
-          android:type="linear">
-        <item
-            android:color="#FF28D1BC"
-            android:offset="0" />
-        <item
-            android:color="#FF00ABFF"
-            android:offset="0.6" />
-        <item
-            android:color="#FF2A5ED6"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M3.151,32.464L13.3,46.493L30.239,4.045c-5.75,2.474 -11.035,6.041 -15.595,10.6C9.504,19.786 5.623,25.851 3.151,32.464z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="24.2938"
-          android:endY="39.2239"
-          android:startX="-4.1098"
-          android:startY="-39.1612"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.5762" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M2.3,34.893c-1.5,4.8 -2.3,9.8 -2.3,15c0,2.8 0.2,5.5 0.7,8.2l7.8,10l36.878,-26.896L2.3,34.893z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="26.5038"
-          android:endY="54.332794"
-          android:startX="-2.655"
-          android:startY="33.41799"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.006" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M40.8,5.893l27.6,28.3l8.9,-26.2c-5.8,-3.8 -12.3,-6.3 -19.2,-7.4L40.8,5.893z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="62.8149"
-          android:endY="14.768093"
-          android:startX="84.794"
-          android:startY="0.65519285"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.0013" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M42.79,46.347l25.8,0.6l-27.6,-28.3z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="45.013"
-          android:endY="42.08"
-          android:startX="59.9387"
-          android:startY="27.9081"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M96.88,67.451C98.928,61.941 100,56.054 100,50c0,-0.202 -0.005,-0.402 -0.007,-0.604L68.806,34.399L96.88,67.451z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="79.7008"
-          android:endY="33.716"
-          android:startX="107.2237"
-          android:startY="81.6425"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.0029" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M27.8,15.893l17.4,11.8l3.7,-21.1z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="48.8608"
-          android:endY="17.1429"
-          android:startX="27.8"
-          android:startY="17.1429"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="8.440641E-4" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M97.976,35.848l-5.312,-1.255l3.7,24l3.329,-3.044C99.895,53.719 100,51.868 100,50C100,45.14 99.308,40.386 97.976,35.848z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="93.5393"
-          android:endY="46.7512"
-          android:startX="101.8224"
-          android:startY="45.4073"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.0017" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M72.998,85.447l2.742,7.442c2.87,-1.729 5.579,-3.761 8.092,-6.075L72.998,85.447z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="77.1128"
-          android:endY="79.7658"
-          android:startX="81.8324"
-          android:startY="102.8394"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.0013" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="0.9982" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M87.435,83.143c2.349,-2.646 4.393,-5.5 6.108,-8.522l-28.357,2.776L87.435,83.143z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="65.4945"
-          android:endY="79.3595"
-          android:startX="123.109"
-          android:startY="78.2586"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.0022" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="0.9966" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M72.9,85.193l-56.3,-11.1l7.2,18.4c1.6,1 3.3,1.9 5.1,2.7L72.9,85.193z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="38.2047"
-          android:endY="89.4249"
-          android:startX="58.4365"
-          android:startY="59.1884"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0.0015" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="1" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillAlpha="0.71"
-      android:pathData="M79.09,58.897l-21,1.5l10.3,18.9z"
-      android:strokeAlpha="0.71">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="61.745285"
-          android:endY="71.03565"
-          android:startX="78.23818"
-          android:startY="57.920563"
-          android:type="linear">
-        <item
-            android:color="#FFFFFFFF"
-            android:offset="0" />
-        <item
-            android:color="#00FFFFFF"
-            android:offset="0.9993" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <group>
-    <clip-path android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0" />
-    <path android:pathData="M31.304,22.589v0.7c0,0.1 0,0.1 -0.1,0.2l-1.9,0.8c0,0 0,0 -0.1,0s0,0 -0.1,0l-0.4,-0.2l19.7,27l2.4,-1.7L31.304,22.589z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="50.7969"
-            android:endY="36.839092"
-            android:startX="28.7808"
-            android:startY="36.839092"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.006" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M65.409,20.005l-0.005,-1.116l-17,30.7l2.5,1.4l16.722,-30.026L65.409,20.005z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.3499"
-            android:endY="34.939095"
-            android:startX="67.5984"
-            android:startY="34.939095"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0013" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M79.625,18.344l-0.021,-1.254l-31.3,32.1l2.1,2l31.2,-32L79.625,18.344z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.3039"
-            android:endY="34.138992"
-            android:startX="81.6039"
-            android:startY="34.138992"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="7.851759E-5" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M90.104,35.389c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2l-41.1,15.7l1,2.7l41.3,-15.8L90.104,35.389z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.8205"
-            android:endY="42.388992"
-            android:startX="91.2039"
-            android:startY="42.388992"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0038" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M11.804,27.989v1.8c0,0.1 -0.1,0.2 -0.1,0.2l-1.2,0.5l38.5,20.9l1.4,-2.6L11.804,27.989z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="50.3298"
-            android:endY="39.689095"
-            android:startX="10.4298"
-            android:startY="39.689095"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0025" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M17.265,50.089c0.1,0 0.1,0.2 0.1,0.2v2.5c0,0.1 -0.1,0.2 -0.1,0.2l32.439,-1.3l-0.1,-2.9L17.265,50.089z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="49.6603"
-            android:endY="50.888992"
-            android:startX="17.2212"
-            android:startY="50.888992"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="3.140703E-4" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M7.668,60.675c0.036,0.014 0.234,0.056 0.236,0.214l0,0l0,0v1.9l42.1,-11.2l-0.9,-2.8l-42.8,11.4C6.304,60.189 7.632,60.661 7.668,60.675z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="50.0039"
-            android:endY="55.789093"
-            android:startX="6.304"
-            android:startY="55.789093"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0047" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M33.904,62.147v1.942l16.7,-11.95l-1.8,-2.3L32.611,61.406L33.904,62.147z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="50.5851"
-            android:endY="56.964092"
-            android:startX="32.571"
-            android:startY="56.964092"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.003" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M35.804,35.789v1.2c0,0.1 -0.1,0.2 -0.1,0.2l-1.8,0.8l14.5,13.4l2,-2.1L35.804,35.789z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="50.3668"
-            android:endY="43.589092"
-            android:startX="33.8669"
-            android:startY="43.589092"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0048" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M55.804,33.089C55.804,33.089 55.704,33.089 55.804,33.089c-0.1,0 -0.1,0 -0.2,0l-1.9,-0.8l0,0l-5.4,17.5l2.8,0.9l5.5,-17.9L55.804,33.089z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.2319"
-            android:endY="41.489094"
-            android:startX="56.5588"
-            android:startY="41.489094"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M64.804,45.489l-13.8,3.2l0.7,2.8l13.8,-3.2L64.804,45.489z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="50.9512"
-            android:endY="48.489094"
-            android:startX="65.4322"
-            android:startY="48.489094"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0032" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M74.107,63.536L74.107,63.536L74.107,63.536c0,-0.098 0,-0.098 0.098,-0.195l0,0l0,0l0,0l1.172,-0.391L50.571,49.278l-1.367,2.441l24.903,13.77C74.107,65.489 74.107,63.536 74.107,63.536z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="49.2177"
-            android:endY="57.3833"
-            android:startX="75.4526"
-            android:startY="57.3833"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="5.496231E-4" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M81.904,79.089L81.904,79.089L81.904,79.089L81.904,79.089l2,-0.6c0,0 0,0 0.1,0l-33.7,-29.4l-1.9,2.2l33.3,29v-1C81.704,79.289 81.694,79.141 81.904,79.089z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.4039"
-            android:endY="64.689095"
-            android:startX="84.0039"
-            android:startY="64.689095"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0012" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M54.404,79.689l2,-0.6h0.1l0.7,0.2l-6.2,-29.7l-2.8,0.6L54.404,79.689L54.404,79.689z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="48.1377"
-            android:endY="64.63899"
-            android:startX="57.3221"
-            android:startY="64.63899"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.0025" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path android:pathData="M64.804,46.689l-15.6,2.1l0.4,2.9l30.2,-4.1l-0.4,-0.1c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2.5l0,0l0,0l0,0L64.804,46.689">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:endX="49.1732"
-            android:endY="48.239094"
-            android:startX="79.7731"
-            android:startY="48.239094"
-            android:type="linear">
-          <item
-              android:color="#FFFFFFFF"
-              android:offset="0.003" />
-          <item
-              android:color="#00FFFFFF"
-              android:offset="1" />
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M51.639,0.029l-10.172,9.922l38.598,0.091"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M65.366,2.397L67.311,16.642"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M77.224,8.046L71.304,14.042"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M79.609,16.642L69.609,17.642"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M83.78,13.139L82.883,14.965"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M85.325,14.615c0.096,0.097 -3.374,29.468 -3.374,29.468"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M89.811,35.231L68.98,45.442"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M81.157,19.065L67.957,44.865"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M89.66,32.342l-48.193,-22.391l23.922,7.289"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M69.592,19.841L93.523,25.345"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M91.096,21.502L91.699,31.585"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M95.08,28.318L93.554,32.271"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M92.657,35.991L91.055,78.558"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M78.616,65.137L96.149,69.308"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M99.904,46.935L78.571,63.748"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M99.296,41.575c-0.585,0.17 -15.743,4.529 -15.743,4.529l16.414,5.629"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M99.766,54.87l-15.164,16.679l5.749,7.991"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M77.456,66.713L83.427,78.637"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M84.31,82.536L83.75,86.889"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M85.28,82.142L86.327,84.354"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M81.12,48.139l-4.73,14.382l-8.132,-14.106"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M79.18,45.887L68.951,46.291"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M79.305,47.596L17.837,88.283"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M54.335,79.846L33.835,64.846"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M65.137,48.23L16.967,87.533"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M75.145,66.556c-0.008,0.074 -16.683,13.266 -16.683,13.266"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M74.354,66.171L62.454,98.371"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M67.749,96.77L22.551,91.808"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M54.293,81.937L19.29,89.467"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M54.846,82.756l-18.767,15.187l48.523,-26.394"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M25.193,93.341L55.115,99.637"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M31.046,65.521L15.515,86.205"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M54.466,32.642L33.573,61.932"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M34.116,62.841L64.78,47.542"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M64.799,46.436L17.528,51.124"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M17.481,52.92L29.665,61.822"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M7.972,61.193L64.229,47.287"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M29.602,63.342L8.042,62.247"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M32.453,37.508L14.288,84.989"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M28.519,23.938L11.678,82.116"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M6.456,64.297L5.153,72.159"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M3.605,62.036L1.439,61.984"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M0.08,52.807L13.108,51.842"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M9.157,30.693L6.857,59.693"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M14.243,53.353L6.765,60.325"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M27.926,23.641L16.156,49.667"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M16.351,27.987L15.502,49.442"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M31.704,37.136L17.432,50.364"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M1.452,37.962L13.741,49.851"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M8.149,30.316L0.472,43.105"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M0.306,44.454L13.082,50.537"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M14.188,15.113L10.004,26.542"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M11.786,27.339L14.886,26.239"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M16.953,12.477L16.651,24.087"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M19.154,24.807L27.254,21.972"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M20.361,9.72L28.536,20.331"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M54.069,29.329L27.064,5.547"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M31.287,22.039L53.587,29.739"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M53.593,30.937L35.793,34.637"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillAlpha="0.6"
-      android:fillColor="#FF000000"
-      android:pathData="M64.821,45.539L35.934,36.076"
-      android:strokeAlpha="0.6" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M81.802,15.419l-1.317,0.456l1.327,0.511l1.327,-0.511L81.802,15.419zM80.162,18.059l1.476,0.588v-1.92l-1.476,-0.588V18.059zM82.004,16.705v1.942l1.441,-0.584v-1.924L82.004,16.705z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M67.443,17.033l-1.317,0.456L67.453,18l1.327,-0.511L67.443,17.033zM65.804,19.673l1.476,0.588v-1.92l-1.476,-0.588V19.673zM67.646,18.319v1.942l1.441,-0.584v-1.924L67.646,18.319z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M55.737,29.211l-1.317,0.456l1.327,0.511l1.327,-0.511L55.737,29.211zM54.098,31.851l1.476,0.588v-1.92l-1.476,-0.588V31.851zM55.94,30.497v1.942l1.441,-0.584v-1.924L55.94,30.497z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M29.251,20.523l-1.317,0.456l1.327,0.511l1.327,-0.511L29.251,20.523zM27.611,23.164l1.476,0.588v-1.92l-1.476,-0.588V23.164zM29.453,21.81v1.942l1.441,-0.584v-1.924L29.453,21.81z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M15.227,49.775l-1.317,0.456l1.327,0.511l1.327,-0.511L15.227,49.775zM13.587,52.415l1.476,0.588v-1.92l-1.476,-0.588V52.415zM15.429,51.062v1.942l1.441,-0.584v-1.924L15.429,51.062z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M9.601,26.95l-1.317,0.456l1.327,0.511l1.327,-0.511L9.601,26.95zM7.962,29.59l1.476,0.588v-1.92L7.962,27.67V29.59zM9.804,28.236v1.942l1.441,-0.584V27.67L9.804,28.236z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M56.429,79.561l-1.317,0.456l1.327,0.511l1.327,-0.511L56.429,79.561zM54.79,82.201l1.476,0.588v-1.92l-1.476,-0.588V82.201zM56.632,80.847v1.942l1.441,-0.584v-1.924L56.632,80.847z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M33.602,34.175l-1.317,0.456l1.327,0.511l1.327,-0.511L33.602,34.175zM31.963,36.815l1.476,0.588v-1.92l-1.476,-0.588V36.815zM33.804,35.462v1.942l1.441,-0.584v-1.924L33.804,35.462z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M31.796,61.722l-1.317,0.456l1.327,0.511l1.327,-0.511L31.796,61.722zM30.156,64.362l1.476,0.588v-1.92l-1.476,-0.588V64.362zM31.998,63.009v1.942l1.441,-0.584v-1.924L31.998,63.009z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M83.96,79.141l-1.317,0.456l1.327,0.511l1.327,-0.511L83.96,79.141zM82.321,81.781l1.476,0.588v-1.92l-1.476,-0.588V81.781zM84.162,80.428v1.942l1.441,-0.584v-1.924L84.162,80.428z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M76.393,63.075l-1.317,0.456l1.327,0.511l1.327,-0.511L76.393,63.075zM74.754,65.715l1.476,0.588v-1.92l-1.476,-0.588V65.715zM76.596,64.362v1.942l1.441,-0.584v-1.924L76.596,64.362z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M81.202,44.475l-1.317,0.456l1.327,0.511l1.327,-0.511L81.202,44.475zM79.563,47.115l1.476,0.588v-1.92l-1.476,-0.588V47.115zM81.404,45.762v1.942l1.441,-0.584v-1.924L81.404,45.762z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M92.296,32.228l-1.317,0.456l1.327,0.511l1.327,-0.511L92.296,32.228zM90.656,34.868l1.476,0.588v-1.92l-1.476,-0.588V34.868zM92.498,33.515v1.942l1.441,-0.584v-1.924L92.498,33.515z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M5.806,60.518l-1.317,0.456l1.327,0.511l1.327,-0.511L5.806,60.518zM4.167,63.158l1.476,0.588v-1.92l-1.476,-0.588V63.158zM6.009,61.804v1.942l1.441,-0.584v-1.924L6.009,61.804z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M24.691,30.255c-0.615,0.788 -0.538,1.99 0.329,2.667c0.867,0.677 1.99,0.538 2.667,-0.329c6.397,-8.2 16.796,-12.263 27.125,-10.546c0.658,0.133 1.342,-0.095 1.773,-0.646c0.185,-0.237 0.29,-0.535 0.396,-0.833c0.088,-0.438 0.019,-1 -0.314,-1.386s-0.727,-0.694 -1.165,-0.782C43.638,16.373 31.949,20.952 24.691,30.255z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M71.1,47.4L41.3,29.2c-1,-0.5 -2.2,-0.5 -3.2,0.1s-1.6,1.6 -1.6,2.8v36.2c0,1.1 0.6,2.2 1.6,2.8c0.5,0.3 1.1,0.5 1.6,0.5s1.1,-0.1 1.6,-0.4L71.1,53c1,-0.6 1.6,-1.6 1.6,-2.8C72.7,49.1 72.1,48 71.1,47.4zM68.5,50.2L40.3,67.4V33L68.5,50.2z" />
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M79.6,20.4C71.7,12.6 61.2,8.2 50,8.2s-21.7,4.3 -29.6,12.2C12.6,28.3 8.2,38.8 8.2,50s4.3,21.7 12.2,29.6S38.8,91.8 50,91.8s21.7,-4.3 29.6,-12.2S91.8,61.2 91.8,50S87.4,28.3 79.6,20.4zM88.1,50c0,10.2 -4,19.7 -11.2,26.9C69.7,84.1 60.2,88.1 50,88.1s-19.7,-4 -26.9,-11.2C15.9,69.7 11.9,60.2 11.9,50s4,-19.7 11.2,-26.9S39.9,11.9 50,11.9c10.2,0 19.7,4 26.9,11.2C84.1,30.3 88.1,39.8 88.1,50z" />
-</vector>

app/src/bittube/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/bittube/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/bittube/res/values/colors.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#343434</color>
-    <color name="colorPrimaryDark">#343434</color>
-    <color name="colorAccent">#00abff</color>
-
-    <color name="tag_color">#bbF2690D</color>
-    <color name="tag_color_text">#FAFAFA</color>
-    <color name="positive_thumbs">#2b90d9</color>
-    <color name="favorite">#ca8f04</color>
-    <color name="bookmark">#795548</color>
-    <color name="negative_thumbs">#F44336</color>
-    <color name="backgroundDark">#DD000000</color>
-    <color name="red_1">#F44336</color>
-    <color name="gray_light">#80808080</color>
-</resources>

app/src/bittube/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
-</resources>

app/src/bittube/res/xml/file_paths.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path
-        name="my_images"
-        path="/Bittube/" />
-
-</paths>

app/src/fdroid_acad/AndroidManifest.xml

@@ -15,14 +15,16 @@
         tools:replace="android:allowBackup">
 
         <activity
-            android:name=".MainActivity"
-            tools:node="merge">
+            android:name=".activities.MainActivity"
+            tools:node="merge"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
+                <data android:host="*" />
                 <data android:mimeType="*/*" />
                 <data android:pathPattern=".*\\.tubelab" />
                 <data android:pathPattern=".*\\..*\\.tubelab" />

app/src/fdroid_full/AndroidManifest.xml

@@ -15,7 +15,8 @@
         tools:replace="android:allowBackup">
 
         <activity
-            android:name=".PeertubeActivity"
+            android:name=".activities.PeertubeActivity"
+            android:exported="true"
             tools:node="mergeOnlyAttributes">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

app/src/full/java/app/fedilab/fedilabtube/activities/BaseActivity.java

@@ -0,0 +1,26 @@
+package app.fedilab.fedilabtube.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class BaseActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}

app/src/full/java/app/fedilab/fedilabtube/helper/Theme.java

@@ -0,0 +1,26 @@
+package app.fedilab.fedilabtube.helper;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+import androidx.appcompat.app.AppCompatActivity;
+
+import app.fedilab.fedilabtube.R;
+
+public class Theme {
+
+    @SuppressWarnings("unused")
+    public static void setTheme(AppCompatActivity activity, String instance, boolean noActionBar) {
+        activity.setTheme(noActionBar?R.style.AppThemeNoActionBar:R.style.AppTheme);
+    }
+}

app/src/full/res/values-night/styles.xml

@@ -24,6 +24,9 @@
         <item name="android:colorBackground">@android:color/black</item>
     </style>
 
+
+
+
     <style name="theme" parent="@style/ThemeOverlay.AppCompat.Dark" />
 
     <style name="popupTheme" parent="@style/ThemeOverlay.AppCompat.Dark" />

app/src/google_acad/AndroidManifest.xml

@@ -15,15 +15,17 @@
         tools:replace="android:allowBackup">
 
         <activity
-            android:name=".MainActivity"
-            tools:node="merge">
+            android:name=".activities.MainActivity"
+            tools:node="merge"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:mimeType="*/*" />
+                <data android:host="*" />
+                <data android:mimeType="application/json" />
                 <data android:pathPattern=".*\\.tubelab" />
                 <data android:pathPattern=".*\\..*\\.tubelab" />
                 <data android:pathPattern=".*\\..*\\..*\\.tubelab" />
@@ -32,6 +34,8 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.tubelab" />
             </intent-filter>
         </activity>
-
+        <meta-data
+            android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
+            android:value="app.fedilab.fedilabtube.provider.CastOptionsProvider" />
     </application>
 </manifest>

app/src/google_cast_lib/java/app/fedilab/fedilabtube/BaseMainActivity.java

@@ -0,0 +1,42 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import app.fedilab.fedilabtube.activities.BaseActivity;
+import app.fedilab.fedilabtube.databinding.ActivityMainBinding;
+
+public class BaseMainActivity extends BaseActivity {
+
+    protected ActivityMainBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+    }
+
+    //Method for discovering cast devices
+    public void discoverCast() {
+    }
+
+}

app/src/google_cast_lib/java/app/fedilab/fedilabtube/BasePeertubeActivity.java

@@ -0,0 +1,182 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaMetadata;
+import com.google.android.gms.cast.framework.CastButtonFactory;
+import com.google.android.gms.cast.framework.CastContext;
+import com.google.android.gms.cast.framework.CastSession;
+import com.google.android.gms.cast.framework.SessionManagerListener;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient;
+import com.google.android.gms.common.images.WebImage;
+
+import app.fedilab.fedilabtube.activities.BaseActivity;
+import app.fedilab.fedilabtube.client.data.VideoData;
+import app.fedilab.fedilabtube.databinding.ActivityPeertubeBinding;
+import app.fedilab.fedilabtube.helper.Helper;
+
+public class BasePeertubeActivity extends BaseActivity {
+
+    protected ActivityPeertubeBinding binding;
+    protected VideoData.Video peertube;
+    protected SimpleExoPlayer player;
+    protected String videoURL;
+    protected String subtitlesStr;
+
+    private CastContext mCastContext;
+    private CastSession mCastSession;
+    private SessionManagerListener<CastSession> mSessionManagerListener;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityPeertubeBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+        final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        int search_cast = sharedpreferences.getInt(getString(R.string.set_cast_choice), BuildConfig.cast_enabled);
+        if (search_cast == 1) {
+            setupCastListener();
+            mCastContext = CastContext.getSharedInstance(BasePeertubeActivity.this);
+            mCastSession = mCastContext.getSessionManager().getCurrentCastSession();
+
+        }
+
+    }
+
+
+    protected void loadCast() {
+        MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
+
+        movieMetadata.putString(MediaMetadata.KEY_TITLE, peertube.getTitle());
+        movieMetadata.putString(MediaMetadata.KEY_ARTIST, peertube.getAccount().getDisplayName());
+        if (subtitlesStr != null) {
+            movieMetadata.putString(MediaMetadata.KEY_SUBTITLE, subtitlesStr);
+        }
+        movieMetadata.addImage(new WebImage(Uri.parse("https://" + peertube.getChannel().getHost() + peertube.getPreviewPath())));
+        MediaInfo mediaInfo = new MediaInfo.Builder(videoURL)
+                .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
+                .setMetadata(movieMetadata)
+                .setStreamDuration(peertube.getDuration() * 1000L)
+                .build();
+        if (mCastSession != null) {
+            RemoteMediaClient remoteMediaClient = mCastSession.getRemoteMediaClient();
+            remoteMediaClient.load(mediaInfo);
+        }
+    }
+
+
+    private void setupCastListener() {
+        mSessionManagerListener = new SessionManagerListener<CastSession>() {
+            @Override
+            public void onSessionStarting(@NonNull CastSession castSession) {
+            }
+
+            @Override
+            public void onSessionStarted(@NonNull CastSession castSession, String s) {
+                onApplicationConnected(castSession, true);
+            }
+
+            @Override
+            public void onSessionStartFailed(@NonNull CastSession castSession, int i) {
+                onApplicationDisconnected();
+            }
+
+            @Override
+            public void onSessionEnding(@NonNull CastSession castSession) {
+                onApplicationDisconnected();
+            }
+
+            @Override
+            public void onSessionEnded(@NonNull CastSession castSession, int i) {
+                onApplicationDisconnected();
+            }
+
+            @Override
+            public void onSessionResuming(@NonNull CastSession castSession, String s) {
+            }
+
+            @Override
+            public void onSessionResumed(@NonNull CastSession castSession, boolean b) {
+                onApplicationConnected(castSession, false);
+            }
+
+            @Override
+            public void onSessionResumeFailed(@NonNull CastSession castSession, int i) {
+                onApplicationDisconnected();
+            }
+
+            @Override
+            public void onSessionSuspended(@NonNull CastSession castSession, int i) {
+                onApplicationDisconnected();
+            }
+
+            private void onApplicationConnected(CastSession castSession, boolean hide) {
+                mCastSession = castSession;
+                supportInvalidateOptionsMenu();
+                player.setPlayWhenReady(false);
+                if (hide) {
+                    binding.doubleTapPlayerView.setVisibility(View.INVISIBLE);
+                }
+                binding.minController.castMiniController.setVisibility(View.VISIBLE);
+                loadCast();
+            }
+
+            private void onApplicationDisconnected() {
+                binding.doubleTapPlayerView.setVisibility(View.VISIBLE);
+                binding.minController.castMiniController.setVisibility(View.GONE);
+                supportInvalidateOptionsMenu();
+            }
+        };
+    }
+
+    @Override
+    protected void onResume() {
+        mCastContext.getSessionManager().addSessionManagerListener(
+                mSessionManagerListener, CastSession.class);
+        super.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        mCastContext.getSessionManager().removeSessionManagerListener(
+                mSessionManagerListener, CastSession.class);
+        super.onPause();
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.video_menu, menu);
+        CastButtonFactory.setUpMediaRouteButton(getApplicationContext(),
+                menu,
+                R.id.media_route_button);
+        return true;
+    }
+}

app/src/google_cast_lib/java/app/fedilab/fedilabtube/expandedcontrols/ExpandedControlsActivity.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 Google LLC. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.fedilab.fedilabtube.expandedcontrols;
+
+import android.view.Menu;
+
+import com.google.android.gms.cast.framework.CastButtonFactory;
+import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActivity;
+
+import app.fedilab.fedilabtube.R;
+
+
+public class ExpandedControlsActivity extends ExpandedControllerActivity {
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.video_menu, menu);
+        CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.media_route_button);
+        return true;
+    }
+}

app/src/google_cast_lib/java/app/fedilab/fedilabtube/provider/CastOptionsProvider.java

@@ -0,0 +1,26 @@
+package app.fedilab.fedilabtube.provider;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.cast.framework.CastOptions;
+import com.google.android.gms.cast.framework.OptionsProvider;
+import com.google.android.gms.cast.framework.SessionProvider;
+
+import java.util.List;
+
+import app.fedilab.fedilabtube.helper.Helper;
+
+public class CastOptionsProvider implements OptionsProvider {
+    @Override
+    public CastOptions getCastOptions(@NonNull Context context) {
+        return new CastOptions.Builder()
+                .setReceiverApplicationId(Helper.CAST_ID)
+                .build();
+    }
+    @Override
+    public List<SessionProvider> getAdditionalSessionProviders(@NonNull Context context) {
+        return null;
+    }
+}

app/src/google_cast_lib/res/layout/min_controller.xml

@@ -0,0 +1,20 @@
+<?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:id="@+id/castMiniController"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:visibility="gone">
+
+    <fragment
+        class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google_cast_lib/res/menu/video_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/media_route_button"
+        android:title="@string/cast"
+        app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
+        app:showAsAction="always" />
+</menu>

app/src/google_donation/res/layout/activity_donation.xml

@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".ShowChannelActivity">
+    tools:context=".activities.ShowChannelActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"

app/src/google_full/AndroidManifest.xml

@@ -15,8 +15,9 @@
         tools:replace="android:allowBackup">
 
         <activity
-            android:name=".PeertubeActivity"
-            tools:node="mergeOnlyAttributes">
+            android:name=".activities.PeertubeActivity"
+            android:exported="true"
+            tools:node="merge">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -28,8 +29,21 @@
                     android:pathPrefix="/videos/watch/"
                     android:scheme="https" />
             </intent-filter>
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.PeertubeActivity" />
         </activity>
 
+        <activity
+            android:name=".expandedcontrols.ExpandedControlsActivity"
+            android:theme="@style/AppThemeNoActionBar"
+
+            />
+
+        <meta-data
+            android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
+            android:value="app.fedilab.fedilabtube.provider.CastOptionsProvider" />
+
         <activity
             android:name=".DonationActivity"
             android:configChanges="orientation|screenSize"

app/src/main/AndroidManifest.xml

@@ -28,10 +28,10 @@
         android:theme="@style/AppTheme"
         tools:replace="android:allowBackup">
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:theme="@style/AppThemeNoActionBar"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name">
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -41,103 +41,88 @@
 
 
         <activity
-            android:name=".PeertubeActivity"
+            android:name=".activities.PeertubeActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
             tools:targetApi="n" />
         <activity
-            android:name=".PeertubeEditUploadActivity"
+            android:name=".activities.PeertubeEditUploadActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:exported="false"
             android:windowSoftInputMode="stateAlwaysHidden" />
 
         <activity
-            android:name=".ShowChannelActivity"
+            android:name=".activities.ShowChannelActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".ShowAccountActivity"
+            android:name=".activities.ShowAccountActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".AccountActivity"
+            android:name=".activities.AccountActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".MyAccountActivity"
+            android:name=".activities.MyAccountActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".SearchActivity"
+            android:name=".activities.SearchActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".AllPlaylistsActivity"
+            android:name=".activities.AllPlaylistsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".AllLocalPlaylistsActivity"
+            android:name=".activities.AllLocalPlaylistsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".InstancePickerActivity"
+            android:name=".activities.InstancePickerActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
 
         <activity
-            android:name=".PlaylistsActivity"
+            android:name=".activities.PlaylistsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".LocalPlaylistsActivity"
+            android:name=".activities.LocalPlaylistsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".VideosTimelineActivity"
+            android:name=".activities.VideosTimelineActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".SepiaSearchActivity"
+            android:name=".activities.SepiaSearchActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/sepia_search"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".ManageInstancesActivity"
+            android:name=".activities.ManageInstancesActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/instances_picker"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".WebviewActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" />
+            android:name=".activities.WebviewActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".WebviewConnectActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" />
+            android:name=".activities.WebviewConnectActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".MastodonWebviewConnectActivity"
+            android:name=".activities.MastodonWebviewConnectActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" />
+            />
         <activity
-            android:name=".LoginActivity"
+            android:name=".activities.LoginActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -151,22 +136,22 @@
         </activity>
 
         <activity
-            android:name=".SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/settings"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".PeertubeRegisterActivity"
+            android:name=".activities.PeertubeRegisterActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/register_account"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".PeertubeUploadActivity"
+            android:name=".activities.PeertubeUploadActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/upload_video"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".AboutActivity"
+            android:name=".activities.AboutActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/about_the_app"
             android:windowSoftInputMode="stateAlwaysHidden" />
@@ -175,12 +160,6 @@
             android:name=".services.RetrieveInfoService"
             android:exported="false" />
 
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove"
-            android:exported="false" />
-
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -191,6 +170,9 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
+
+
     </application>
 
 </manifest>

app/src/main/assets/categories.json

@@ -0,0 +1 @@
+{"1":"Music","2":"Films","3":"Vehicles","4":"Art","5":"Sports","6":"Travels","7":"Gaming","8":"People","9":"Comedy","10":"Entertainment","11":"News & Politics","12":"How To","13":"Education","14":"Activism","15":"Science & Technology","16":"Animals","17":"Kids","18":"Food"}

app/src/main/assets/languages.json

@@ -0,0 +1 @@
+{"aa":"Afar","ab":"Abkhazian","af":"Afrikaans","ak":"Akan","am":"Amharic","ar":"Arabic","an":"Aragonese","ase":"American Sign Language","as":"Assamese","av":"Avaric","avk":"Kotava","ay":"Aymara","az":"Azerbaijani","ba":"Bashkir","bm":"Bambara","be":"Belarusian","bn":"Bengali","bfi":"British Sign Language","bi":"Bislama","bo":"Tibetan","bs":"Bosnian","br":"Breton","bg":"Bulgarian","bzs":"Brazilian Sign Language","ca":"Catalan","cs":"Czech","ch":"Chamorro","ce":"Chechen","cv":"Chuvash","kw":"Cornish","co":"Corsican","cr":"Cree","cse":"Czech Sign Language","csl":"Chinese Sign Language","cy":"Welsh","da":"Danish","de":"German","dv":"Dhivehi","dsl":"Danish Sign Language","dz":"Dzongkha","el":"Greek","en":"English","eo":"Esperanto","et":"Estonian","eu":"Basque","ee":"Ewe","fo":"Faroese","fa":"Persian","fj":"Fijian","fi":"Finnish","fr":"French","fy":"Western Frisian","fsl":"French Sign Language","ff":"Fulah","gd":"Scottish Gaelic","ga":"Irish","gl":"Galician","gv":"Manx","gn":"Guarani","gsg":"German Sign Language","gu":"Gujarati","ht":"Haitian","ha":"Hausa","sh":"Serbo-Croatian","he":"Hebrew","hz":"Herero","hi":"Hindi","ho":"Hiri Motu","hr":"Croatian","hu":"Hungarian","hy":"Armenian","ig":"Igbo","ii":"Sichuan Yi","iu":"Inuktitut","id":"Indonesian","ik":"Inupiaq","is":"Icelandic","it":"Italian","jv":"Javanese","jbo":"Lojban","ja":"Japanese","jsl":"Japanese Sign Language","kab":"Kabyle","kl":"Kalaallisut","kn":"Kannada","ks":"Kashmiri","ka":"Georgian","kr":"Kanuri","kk":"Kazakh","km":"Khmer","ki":"Kikuyu","rw":"Kinyarwanda","ky":"Kirghiz","kv":"Komi","kg":"Kongo","ko":"Korean","kj":"Kuanyama","ku":"Kurdish","lo":"Lao","la":"Latin","lv":"Latvian","li":"Limburgan","ln":"Lingala","lt":"Lithuanian","lb":"Luxembourgish","lu":"Luba-Katanga","lg":"Ganda","mh":"Marshallese","ml":"Malayalam","mr":"Marathi","mk":"Macedonian","mg":"Malagasy","mt":"Maltese","mn":"Mongolian","mi":"Maori","ms":"Malay (macrolanguage)","my":"Burmese","na":"Nauru","nv":"Navajo","nr":"South Ndebele","nd":"North Ndebele","ng":"Ndonga","ne":"Nepali (macrolanguage)","nl":"Dutch","nn":"Norwegian Nynorsk","nb":"Norwegian Bokmål","no":"Norwegian","ny":"Nyanja","oc":"Occitan","oj":"Ojibwa","or":"Oriya (macrolanguage)","om":"Oromo","os":"Ossetian","pa":"Panjabi","pks":"Pakistan Sign Language","pl":"Polish","pt":"Portuguese","ps":"Pushto","qu":"Quechua","rm":"Romansh","ro":"Romanian","rsl":"Russian Sign Language","rn":"Rundi","ru":"Russian","sg":"Sango","sdl":"Saudi Arabian Sign Language","sfs":"South African Sign Language","si":"Sinhala","sk":"Slovak","sl":"Slovenian","se":"Northern Sami","sm":"Samoan","sn":"Shona","sd":"Sindhi","so":"Somali","st":"Southern Sotho","es":"Spanish","sq":"Albanian","sc":"Sardinian","sr":"Serbian","ss":"Swati","su":"Sundanese","sw":"Swahili (macrolanguage)","sv":"Swedish","swl":"Swedish Sign Language","ty":"Tahitian","ta":"Tamil","tt":"Tatar","te":"Telugu","tg":"Tajik","tl":"Tagalog","th":"Thai","ti":"Tigrinya","tlh":"Klingon","to":"Tonga (Tonga Islands)","tn":"Tswana","ts":"Tsonga","tk":"Turkmen","tr":"Turkish","tw":"Twi","ug":"Uighur","uk":"Ukrainian","ur":"Urdu","uz":"Uzbek","ve":"Venda","vi":"Vietnamese","wa":"Walloon","wo":"Wolof","xh":"Xhosa","yi":"Yiddish","yo":"Yoruba","za":"Zhuang","zh":"Chinese","zu":"Zulu","zxx":"No linguistic content","zh-Hans":"Simplified Chinese","zh-Hant":"Traditional Chinese"}

app/src/main/java/app/fedilab/fedilabtube/BaseFedilabTube.java

@@ -22,8 +22,6 @@ import android.os.Build;
 
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
-import androidx.work.Configuration;
-import androidx.work.WorkManager;
 
 import net.gotev.uploadservice.UploadServiceConfig;
 import net.gotev.uploadservice.observer.request.GlobalRequestObserver;
@@ -37,7 +35,7 @@ import app.fedilab.fedilabtube.worker.WorkHelper;
 
 public class BaseFedilabTube extends MultiDexApplication {
 
-    static String UPLOAD_CHANNEL_ID = "upload_info_peertube";
+    public static String UPLOAD_CHANNEL_ID = "upload_info_peertube";
 
     @Override
     public void onCreate() {
@@ -45,10 +43,6 @@ public class BaseFedilabTube extends MultiDexApplication {
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         int interval = sharedpreferences.getInt(Helper.NOTIFICATION_INTERVAL, 60);
 
-        Configuration myConfig = new Configuration.Builder()
-                .setMinimumLoggingLevel(android.util.Log.INFO)
-                .build();
-        WorkManager.initialize(BaseFedilabTube.this, myConfig);
         if (interval >= 15) {
             WorkHelper.fetchNotifications(this, interval);
         }
@@ -65,7 +59,7 @@ public class BaseFedilabTube extends MultiDexApplication {
 
         MultiDex.install(BaseFedilabTube.this);
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        int themePref = sharedpreferences.getInt(Helper.SET_THEME, Helper.DEFAULT_MODE);
+        int themePref = sharedpreferences.getInt(Helper.SET_THEME, BuildConfig.default_theme);
         ThemeHelper.switchTo(themePref);
 
 

app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -28,17 +28,20 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 
-public class AboutActivity extends AppCompatActivity {
-
+public class AboutActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
@@ -58,10 +61,10 @@ public class AboutActivity extends AppCompatActivity {
         //Developer click for Mastodon account
         TextView developer_mastodon = findViewById(R.id.developer_mastodon);
         SpannableString content = new SpannableString(developer_mastodon.getText().toString());
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AboutActivity.this, Helper.getColorAccent())), 0, content.length(), 0);
+        content.setSpan(new ForegroundColorSpan(Helper.fetchAccentColor(AboutActivity.this)), 0, content.length(), 0);
         developer_mastodon.setText(content);
         developer_mastodon.setOnClickListener(v -> {
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://toot.fedilab.app/@Tubelab"));
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://toot.fedilab.app/@apps"));
             startActivity(browserIntent);
         });
 
@@ -80,15 +83,6 @@ public class AboutActivity extends AppCompatActivity {
         TextView app_name = findViewById(R.id.app_name);
         app_name.setText(R.string.app_name);
 
-        //Developer Github
-        TextView github = findViewById(R.id.github);
-        content = new SpannableString(github.getText().toString());
-        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        github.setText(content);
-        github.setOnClickListener(v -> {
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/stom79"));
-            startActivity(browserIntent);
-        });
 
         //Developer Framagit
         TextView framagit = findViewById(R.id.framagit);
@@ -100,15 +94,6 @@ public class AboutActivity extends AppCompatActivity {
             startActivity(browserIntent);
         });
 
-        //Developer Codeberg
-        TextView codeberg = findViewById(R.id.codeberg);
-        content = new SpannableString(codeberg.getText().toString());
-        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        codeberg.setText(content);
-        codeberg.setOnClickListener(v -> {
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://codeberg.org/tom79"));
-            startActivity(browserIntent);
-        });
 
         LinearLayout donation_container = findViewById(R.id.donation_container);
         if (BuildConfig.google_restriction || !BuildConfig.full_instances) {
@@ -122,19 +107,10 @@ public class AboutActivity extends AppCompatActivity {
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.paypal.me/Mastalab"));
             startActivity(browserIntent);
         });
-        if (BuildConfig.FLAVOR.equals("queermotion")) {
-            donatePaypal.setVisibility(View.GONE);
-            LinearLayout dev_info = findViewById(R.id.dev_info);
-            dev_info.setVisibility(View.GONE);
-        }
         Button donateLiberapay = findViewById(R.id.donate_liberapay);
         donateLiberapay.setOnClickListener(v -> {
             Intent browserIntent;
-            if (BuildConfig.FLAVOR.equals("queermotion")) {
-                browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://soutenir.queermotion.org"));
-            } else {
-                browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://liberapay.com/tom79"));
-            }
+            browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://liberapay.com/tom79"));
 
             startActivity(browserIntent);
         });
@@ -142,7 +118,7 @@ public class AboutActivity extends AppCompatActivity {
 
         TextView license = findViewById(R.id.license);
         content = new SpannableString(license.getText().toString());
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AboutActivity.this, Helper.getColorAccent())), 0, content.length(), 0);
+        content.setSpan(new ForegroundColorSpan(Helper.fetchAccentColor(AboutActivity.this)), 0, content.length(), 0);
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
         license.setText(content);
         license.setOnClickListener(v -> {

app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.MainActivity.badgeCount;
+
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
@@ -31,7 +33,6 @@ import android.view.MenuItem;
 import android.view.View;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -43,6 +44,7 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.jetbrains.annotations.NotNull;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.databinding.ActivityAccountBinding;
@@ -50,21 +52,22 @@ import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayNotificationsFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.SwitchAccountHelper;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 
-import static app.fedilab.fedilabtube.MainActivity.badgeCount;
 
-
-public class AccountActivity extends AppCompatActivity {
+public class AccountActivity extends BaseActivity {
 
 
     private ActivityAccountBinding binding;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         binding = ActivityAccountBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
         setContentView(view);
@@ -74,7 +77,7 @@ public class AccountActivity extends AppCompatActivity {
 
         SpannableString content_create = new SpannableString(getString(R.string.join_peertube));
         content_create.setSpan(new UnderlineSpan(), 0, content_create.length(), 0);
-        content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AccountActivity.this, Helper.getColorAccent())), 0, content_create.length(),
+        content_create.setSpan(new ForegroundColorSpan(Helper.fetchAccentColor(AccountActivity.this)), 0, content_create.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
 
@@ -91,12 +94,11 @@ public class AccountActivity extends AppCompatActivity {
 
         setTitle(String.format("@%s", account.getUsername()));
 
-        Helper.loadGiF(AccountActivity.this, account.getAvatar().getPath(), binding.profilePicture);
+        Helper.loadAvatar(AccountActivity.this, account, binding.profilePicture);
         binding.username.setText(String.format("@%s", account.getUsername()));
         binding.displayname.setText(account.getDisplayName());
 
         binding.instance.setText(account.getHost());
-        binding.editProfile.setOnClickListener(v -> startActivity(new Intent(AccountActivity.this, MyAccountActivity.class)));
 
         binding.logoutButton.setOnClickListener(v -> {
             AlertDialog.Builder dialogBuilderLogoutAccount = new AlertDialog.Builder(AccountActivity.this);
@@ -213,7 +215,6 @@ public class AccountActivity extends AppCompatActivity {
         } else {
             binding.accountTabLayout.setVisibility(View.GONE);
             binding.accountViewpager.setVisibility(View.GONE);
-            binding.editProfile.setVisibility(View.GONE);
             binding.remoteAccount.setVisibility(View.VISIBLE);
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
@@ -259,6 +260,11 @@ public class AccountActivity extends AppCompatActivity {
         super.onDestroy();
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        overridePendingTransition(R.anim.slide_out_up, R.anim.slide_in_up_down);
+    }
 
     /**
      * Pager adapter for three tabs (notifications, muted, blocked)
@@ -292,11 +298,5 @@ public class AccountActivity extends AppCompatActivity {
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        overridePendingTransition(R.anim.slide_out_up, R.anim.slide_in_up_down);
-    }
-
 
 }

app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -21,7 +21,6 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -31,13 +30,16 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import java.util.ArrayList;
 import java.util.List;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
 import app.fedilab.fedilabtube.client.data.VideoPlaylistData;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 
 
-public class AllLocalPlaylistsActivity extends AppCompatActivity implements PlaylistAdapter.AllPlaylistRemoved {
+public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved {
 
 
     PlaylistAdapter playlistAdapter;
@@ -45,10 +47,11 @@ public class AllLocalPlaylistsActivity extends AppCompatActivity implements Play
     private RelativeLayout textviewNoAction;
     private List<Playlist> playlists;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         setContentView(R.layout.activity_all_playlist);
 
         if (getSupportActionBar() != null)

app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,9 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
@@ -35,7 +38,6 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
@@ -53,6 +55,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData;
@@ -63,15 +66,14 @@ import app.fedilab.fedilabtube.databinding.ActivityAllPlaylistBinding;
 import app.fedilab.fedilabtube.databinding.AddPlaylistBinding;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
-
-public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistAdapter.AllPlaylistRemoved {
+public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapter.AllPlaylistRemoved {
 
 
     private static final int PICK_AVATAR = 467;
@@ -86,10 +88,11 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
     private Uri inputData;
     private ActivityAllPlaylistBinding binding;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         binding = ActivityAllPlaylistBinding.inflate(getLayoutInflater());
         View viewRoot = binding.getRoot();
         setContentView(viewRoot);

app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -15,6 +15,8 @@ package app.fedilab.fedilabtube;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -22,14 +24,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -40,18 +38,20 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.data.InstanceData;
 import app.fedilab.fedilabtube.client.entities.InstanceParams;
+import app.fedilab.fedilabtube.databinding.ActivityInstancePickerBinding;
 import app.fedilab.fedilabtube.drawer.InstanceAdapter;
+import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.RoundedBackgroundSpan;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.InstancesVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
-
-public class InstancePickerActivity extends AppCompatActivity {
+public class InstancePickerActivity extends BaseActivity {
 
 
     boolean[] checkedItemsCategory;
@@ -61,44 +61,37 @@ public class InstancePickerActivity extends AppCompatActivity {
     String[] itemsKeyLanguage;
     String[] itemsLabelLanguage;
     InstanceParams instanceParams;
-    private RelativeLayout mainLoader, textviewNoAction;
-    private TextView categories_view, languages_view;
     private InstancesVM viewModel;
+    private ActivityInstancePickerBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+        binding = ActivityInstancePickerBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
 
-        setContentView(R.layout.activity_instance_picker);
+        binding.loader.setVisibility(View.VISIBLE);
 
-        mainLoader = findViewById(R.id.loader);
-        textviewNoAction = findViewById(R.id.no_action);
-        mainLoader.setVisibility(View.VISIBLE);
-        Button pickup_categories = findViewById(R.id.pickup_categories);
-        Button pickup_languages = findViewById(R.id.pickup_languages);
-        categories_view = findViewById(R.id.categories_view);
-        languages_view = findViewById(R.id.languages_view);
-        Spinner sensitive = findViewById(R.id.sensitive);
 
         String[] channelSensitive = new String[]{"do_not_list", "blur", "display", "no_opinion"};
         String[] channelSensitivesLabel = new String[]{getString(R.string.do_not_list), getString(R.string.blur), getString(R.string.display), getString(R.string.no_opinion)};
         ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(InstancePickerActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, channelSensitivesLabel);
-        sensitive.setAdapter(adapterChannel);
+        binding.sensitive.setAdapter(adapterChannel);
 
 
         viewModel = new ViewModelProvider(InstancePickerActivity.this).get(InstancesVM.class);
 
-        sensitive.setSelection(1, false);
-        sensitive.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sensitive.setSelection(1, false);
+        binding.sensitive.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 instanceParams.setNsfwPolicy(channelSensitive[position]);
-                mainLoader.setVisibility(View.VISIBLE);
+                binding.loader.setVisibility(View.VISIBLE);
                 viewModel.getInstances(instanceParams).observe(InstancePickerActivity.this, apiResponse -> manageVIewInstance(apiResponse));
             }
 
@@ -114,7 +107,7 @@ public class InstancePickerActivity extends AppCompatActivity {
             itemsLabelLanguage = new String[languages.size()];
             itemsKeyLanguage = new String[languages.size()];
 
-            pickup_languages.setOnClickListener(v -> {
+            binding.pickupLanguages.setOnClickListener(v -> {
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(InstancePickerActivity.this);
 
                 int i = 0;
@@ -157,13 +150,13 @@ public class InstancePickerActivity extends AppCompatActivity {
                         j++;
                     }
                     instanceParams.setLanguagesOr(langs);
-                    languages_view.setText(stringBuilder, TextView.BufferType.SPANNABLE);
-                    if (languages_view.getText().toString().trim().length() > 0) {
-                        languages_view.setVisibility(View.VISIBLE);
+                    binding.languagesView.setText(stringBuilder, TextView.BufferType.SPANNABLE);
+                    if (binding.languagesView.getText().toString().trim().length() > 0) {
+                        binding.languagesView.setVisibility(View.VISIBLE);
                     } else {
-                        languages_view.setVisibility(View.GONE);
+                        binding.languagesView.setVisibility(View.GONE);
                     }
-                    mainLoader.setVisibility(View.VISIBLE);
+                    binding.loader.setVisibility(View.VISIBLE);
                     viewModel.getInstances(instanceParams).observe(InstancePickerActivity.this, this::manageVIewInstance);
                 });
                 dialogBuilder.setPositiveButton(R.string.validate, (dialog, id) -> dialog.dismiss());
@@ -181,7 +174,7 @@ public class InstancePickerActivity extends AppCompatActivity {
             itemsKeyCategory = new int[categories.size()];
 
 
-            pickup_categories.setOnClickListener(v -> {
+            binding.pickupCategories.setOnClickListener(v -> {
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(InstancePickerActivity.this);
                 int i = 0;
                 if (categories.size() > 0) {
@@ -222,13 +215,13 @@ public class InstancePickerActivity extends AppCompatActivity {
                         j++;
                     }
                     instanceParams.setCategoriesOr(cats);
-                    categories_view.setText(stringBuilder, TextView.BufferType.SPANNABLE);
-                    if (categories_view.getText().toString().trim().length() > 0) {
-                        categories_view.setVisibility(View.VISIBLE);
+                    binding.categoriesView.setText(stringBuilder, TextView.BufferType.SPANNABLE);
+                    if (binding.categoriesView.getText().toString().trim().length() > 0) {
+                        binding.categoriesView.setVisibility(View.VISIBLE);
                     } else {
-                        categories_view.setVisibility(View.GONE);
+                        binding.categoriesView.setVisibility(View.GONE);
                     }
-                    mainLoader.setVisibility(View.VISIBLE);
+                    binding.loader.setVisibility(View.VISIBLE);
                     viewModel.getInstances(instanceParams).observe(InstancePickerActivity.this, this::manageVIewInstance);
                 });
                 dialogBuilder.setPositiveButton(R.string.validate, (dialog, id) -> dialog.dismiss());
@@ -240,7 +233,7 @@ public class InstancePickerActivity extends AppCompatActivity {
         }
 
 
-        mainLoader.setVisibility(View.VISIBLE);
+        binding.loader.setVisibility(View.VISIBLE);
 
         setTitle(R.string.instances_picker);
 
@@ -261,7 +254,7 @@ public class InstancePickerActivity extends AppCompatActivity {
 
 
     public void manageVIewInstance(APIResponse apiResponse) {
-        mainLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.GONE);
         if (apiResponse.getError() != null) {
             Toasty.error(InstancePickerActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
@@ -269,10 +262,10 @@ public class InstancePickerActivity extends AppCompatActivity {
         List<InstanceData.Instance> instances = apiResponse.getInstances();
         RecyclerView lv_instances = findViewById(R.id.lv_instances);
         if ((instances == null || instances.size() == 0)) {
-            textviewNoAction.setVisibility(View.VISIBLE);
+            binding.noAction.setVisibility(View.VISIBLE);
             lv_instances.setVisibility(View.GONE);
         } else {
-            textviewNoAction.setVisibility(View.GONE);
+            binding.noAction.setVisibility(View.GONE);
             lv_instances.setVisibility(View.VISIBLE);
             InstanceAdapter instanceAdapter = new InstanceAdapter(instances);
             lv_instances.setAdapter(instanceAdapter);

app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -21,9 +21,12 @@ import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.data.PlaylistData;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
@@ -34,7 +37,7 @@ public class LocalPlaylistsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 

app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
+
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -31,33 +33,34 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.List;
 
-import app.fedilab.fedilabtube.client.mastodon.RetrofitMastodonAPI;
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.InstanceData;
+import app.fedilab.fedilabtube.client.data.PluginData;
+import app.fedilab.fedilabtube.client.entities.AcadInstances;
 import app.fedilab.fedilabtube.client.entities.Error;
 import app.fedilab.fedilabtube.client.entities.Oauth;
 import app.fedilab.fedilabtube.client.entities.OauthParams;
 import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
+import app.fedilab.fedilabtube.client.mastodon.RetrofitMastodonAPI;
 import app.fedilab.fedilabtube.databinding.ActivityLoginBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
 
-
-public class LoginActivity extends AppCompatActivity {
+public class LoginActivity extends BaseActivity {
 
 
     private static String client_id;
@@ -65,9 +68,12 @@ public class LoginActivity extends AppCompatActivity {
     private ActivityLoginBinding binding;
     private String acadInstance;
 
+
+
     @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityLoginBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
@@ -78,14 +84,10 @@ public class LoginActivity extends AppCompatActivity {
 
 
         SpannableString content_create;
-        if (BuildConfig.FLAVOR.compareTo("queermotion") == 0) {
-            content_create = new SpannableString(getString(R.string.register_account));
-        } else {
-            content_create = new SpannableString(getString(R.string.join_peertube));
-        }
+        content_create = new SpannableString(getString(R.string.join_peertube));
 
         content_create.setSpan(new UnderlineSpan(), 0, content_create.length(), 0);
-        content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, Helper.getColorAccent())), 0, content_create.length(),
+        content_create.setSpan(new ForegroundColorSpan(Helper.fetchAccentColor(LoginActivity.this)), 0, content_create.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         binding.createAnAccountPeertube.setText(content_create, TextView.BufferType.SPANNABLE);
 
@@ -100,9 +102,7 @@ public class LoginActivity extends AppCompatActivity {
         if (BuildConfig.full_instances && BuildConfig.instance_switcher) {
             binding.loginInstanceContainer.setVisibility(View.VISIBLE);
         }
-        if (BuildConfig.FLAVOR.compareTo("queermotion") == 0) {
-            binding.loginInstance.setText("queermotion.org");
-        }
+
 
         if (Helper.isTablet(LoginActivity.this)) {
 
@@ -120,16 +120,7 @@ public class LoginActivity extends AppCompatActivity {
         }
 
         if (!BuildConfig.full_instances) {
-            binding.loginUid.setOnFocusChangeListener((v, hasFocus) -> {
-                if (!hasFocus) {
-                    if (binding.loginUid.getText() != null && android.util.Patterns.EMAIL_ADDRESS.matcher(binding.loginUid.getText().toString().trim()).matches()) {
-                        String[] emailArray = binding.loginUid.getText().toString().split("@");
-                        if (emailArray.length > 1) {
-                            binding.loginButton.callOnClick();
-                        }
-                    }
-                }
-            });
+
             binding.loginUidContainer.setVisibility(View.GONE);
             binding.loginPasswdContainer.setVisibility(View.GONE);
             binding.loginInstanceContainer.setVisibility(View.GONE);
@@ -137,24 +128,21 @@ public class LoginActivity extends AppCompatActivity {
             binding.instancePickerTitle.setVisibility(View.VISIBLE);
             binding.instancePicker.setVisibility(View.VISIBLE);
 
-            HashMap<String, String> instancesMap = new HashMap<>(HelperAcadInstance.instances_themes);
-            Iterator<Map.Entry<String, String>> it = instancesMap.entrySet().iterator();
-            String[] academiesKey = new String[HelperAcadInstance.instances_themes.size()];
-            String[] academiesValue = new String[HelperAcadInstance.instances_themes.size()];
+
+            List<AcadInstances> acadInstances = AcadInstances.getInstances();
+            String[] academiesKey = new String[acadInstances.size()];
+            String[] academiesValue = new String[acadInstances.size()];
             String acad = HelperInstance.getLiveInstance(LoginActivity.this);
             int position = 0;
             int i = 0;
-            while (it.hasNext()) {
-                Map.Entry<String, String> pair = it.next();
-                academiesKey[i] = pair.getKey();
-                academiesValue[i] = pair.getValue();
-                if (pair.getValue().compareTo(acad) == 0) {
+            for (AcadInstances ac : acadInstances) {
+                academiesKey[i] = ac.getName();
+                academiesValue[i] = ac.getUrl();
+                if (ac.getUrl().compareTo(acad) == 0) {
                     position = i;
                 }
-                it.remove();
                 i++;
             }
-            binding.instancePicker.setSelection(position, true);
             ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(LoginActivity.this,
                     android.R.layout.simple_spinner_dropdown_item, academiesKey);
             binding.instancePicker.setAdapter(adapterChannel);
@@ -162,6 +150,10 @@ public class LoginActivity extends AppCompatActivity {
                 @Override
                 public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                     acadInstance = academiesValue[position];
+                    binding.loginUidContainer.setVisibility(View.GONE);
+                    binding.loginPasswdContainer.setVisibility(View.GONE);
+                    binding.loginInstanceContainer.setVisibility(View.GONE);
+                    binding.createAnAccountPeertube.setVisibility(View.GONE);
                 }
 
                 @Override
@@ -169,6 +161,7 @@ public class LoginActivity extends AppCompatActivity {
 
                 }
             });
+            binding.instancePicker.setSelection(position, true);
         }
         if (BuildConfig.allow_remote_connections) {
             binding.loginInstance.setOnFocusChangeListener((v, hasFocus) -> {
@@ -196,9 +189,18 @@ public class LoginActivity extends AppCompatActivity {
         }
 
         binding.loginButton.setOnClickListener(v -> {
-            if (!BuildConfig.full_instances) {
+            if (!BuildConfig.full_instances && AcadInstances.isOpenId(acadInstance)) {
                 new Thread(() -> {
                     try {
+                        InstanceData.InstanceConfig instanceConfig = new RetrofitPeertubeAPI(LoginActivity.this).getConfigInstance();
+                        PluginData.Plugin plugin = instanceConfig.getPlugin();
+                        List<PluginData.PluginInfo> pluginInfos = plugin.getRegistered();
+                        String openIdVersion = "0.0.7";
+                        for(PluginData.PluginInfo pluginInfo: pluginInfos) {
+                            if(pluginInfo.getName().toLowerCase().contains("openid")) {
+                                openIdVersion = pluginInfo.getVersion();
+                            }
+                        }
                         Oauth oauth = new RetrofitPeertubeAPI(LoginActivity.this, acadInstance, null).oauthClient(null, null, null, null);
                         if (oauth == null) {
                             runOnUiThread(() -> {
@@ -216,7 +218,7 @@ public class LoginActivity extends AppCompatActivity {
                         editor.apply();
                         Intent intent = new Intent(LoginActivity.this, WebviewConnectActivity.class);
                         Bundle b = new Bundle();
-                        b.putString("url", "https://" + acadInstance + "/plugins/auth-openid-connect/0.0.1/auth/openid-connect");
+                        b.putString("url", "https://" + acadInstance + "/plugins/auth-openid-connect/"+openIdVersion+"/auth/openid-connect");
                         intent.putExtras(b);
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         startActivity(intent);
@@ -275,15 +277,13 @@ public class LoginActivity extends AppCompatActivity {
                     return;
                 }
                 String finalInstance = instance;
-                if (BuildConfig.full_instances) {
-                    new Thread(() -> {
-                        WellKnownNodeinfo.NodeInfo instanceNodeInfo = null;
-                        if (BuildConfig.allow_remote_connections) {
-                            instanceNodeInfo = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).getNodeInfo();
-                        }
-                        connectToFediverse(finalInstance, instanceNodeInfo);
-                    }).start();
-                }
+                new Thread(() -> {
+                    WellKnownNodeinfo.NodeInfo instanceNodeInfo = null;
+                    if (BuildConfig.allow_remote_connections) {
+                        instanceNodeInfo = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).getNodeInfo();
+                    }
+                    connectToFediverse(finalInstance, instanceNodeInfo);
+                }).start();
             }
         });
     }

app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,19 +14,20 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.MainActivity.TypeOfConnection.NORMAL;
+import static app.fedilab.fedilabtube.activities.MainActivity.TypeOfConnection.SURFING;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Looper;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -37,14 +38,12 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.TooltipCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
@@ -53,27 +52,23 @@ import com.kobakei.ratethisapp.RateThisApp;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import app.fedilab.fedilabtube.BaseMainActivity;
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.DonationActivity;
+import app.fedilab.fedilabtube.Matomo;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.client.data.InstanceData;
-import app.fedilab.fedilabtube.client.data.VideoData;
+import app.fedilab.fedilabtube.client.entities.AcadInstances;
 import app.fedilab.fedilabtube.client.entities.Error;
 import app.fedilab.fedilabtube.client.entities.OauthParams;
 import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
@@ -89,23 +84,16 @@ import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.PlaylistExportHelper;
 import app.fedilab.fedilabtube.helper.SwitchAccountHelper;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.services.RetrieveInfoService;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.sqlite.StoredInstanceDAO;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
-import su.litvak.chromecast.api.v2.ChromeCast;
-import su.litvak.chromecast.api.v2.ChromeCasts;
-import su.litvak.chromecast.api.v2.ChromeCastsListener;
-import su.litvak.chromecast.api.v2.MediaStatus;
-
-import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.NORMAL;
-import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.SURFING;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
 
-public class MainActivity extends AppCompatActivity implements ChromeCastsListener {
+public class MainActivity extends BaseMainActivity {
 
 
     public static int PICK_INSTANCE = 5641;
@@ -113,44 +101,33 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
     public static UserMe userMe;
     public static InstanceData.InstanceConfig instanceConfig;
     public static TypeOfConnection typeOfConnection;
-    public static List<ChromeCast> chromeCasts;
-    public static ChromeCast chromeCast;
-    public static boolean chromecastActivated = false;
+    public static int badgeCount;
     private DisplayVideosFragment recentFragment, locaFragment, trendingFragment, subscriptionFragment, mostLikedFragment;
     private DisplayOverviewFragment overviewFragment;
     private ActivityMainBinding binding;
-    public static int badgeCount;
     private final BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = item -> {
         int itemId = item.getItemId();
         String type = null;
         if (itemId == R.id.navigation_discover) {
             setTitleCustom(R.string.title_discover);
-            binding.viewpager.setCurrentItem(0);
+            binding.viewpager.setCurrentItem(3);
             type = HelperAcadInstance.DISCOVER;
         } else if (itemId == R.id.navigation_subscription) {
-            binding.viewpager.setCurrentItem(1);
+            binding.viewpager.setCurrentItem(4);
             setTitleCustom(R.string.subscriptions);
             type = HelperAcadInstance.SUBSCRIPTIONS;
         } else if (itemId == R.id.navigation_trending) {
             setTitleCustom(R.string.title_trending);
-            if (Helper.isLoggedIn(MainActivity.this)) {
-                binding.viewpager.setCurrentItem(2);
-            } else {
-                binding.viewpager.setCurrentItem(1);
-            }
-            type = HelperAcadInstance.TRENDING;
-        } else if (itemId == R.id.navigation_most_liked) {
-            setTitleCustom(R.string.title_most_liked);
             binding.viewpager.setCurrentItem(2);
-            type = HelperAcadInstance.MOSTLIKED;
+            type = HelperAcadInstance.TRENDING;
         } else if (itemId == R.id.navigation_recently_added) {
             setTitleCustom(R.string.title_recently_added);
-            binding.viewpager.setCurrentItem(3);
+            binding.viewpager.setCurrentItem(1);
             type = HelperAcadInstance.RECENTLY_ADDED;
         } else if (itemId == R.id.navigation_local) {
             setTitleCustom(R.string.title_local);
-            binding.viewpager.setCurrentItem(4);
+            binding.viewpager.setCurrentItem(0);
             type = HelperAcadInstance.LOCAL;
         }
         if (type != null) {
@@ -158,8 +135,7 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         }
         return true;
     };
-    private BroadcastReceiver manage_chromecast;
-    private VideoData.Video castedTube;
+
 
     @SuppressLint("ApplySharedPref")
     public static void showRadioButtonDialogFullInstances(Activity activity, boolean storeInDb) {
@@ -234,123 +210,20 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         }
     }
 
-    @Override
-    public void newChromeCastDiscovered(ChromeCast chromeCast) {
-        if (chromeCasts == null) {
-            chromeCasts = new ArrayList<>();
-            chromeCasts.add(chromeCast);
-        } else {
-            boolean canBeAdded = true;
-            for (ChromeCast cast : chromeCasts) {
-                if (cast.getName().compareTo(chromeCast.getName()) == 0) {
-                    canBeAdded = false;
-                    break;
-                }
-            }
-            if (canBeAdded) {
-                chromeCasts.add(chromeCast);
-            }
-        }
-        try {
-            if (chromeCast.isAppRunning(Helper.CAST_ID) && chromeCast.getMediaStatus() != null && chromeCast.getMediaStatus().playerState != null) {
-                if (binding.castInfo.getVisibility() == View.GONE) {
-                    binding.castInfo.setVisibility(View.VISIBLE);
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Override
-    public void chromeCastRemoved(ChromeCast chromeCast) {
-
-    }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         binding = null;
-        ChromeCasts.unregisterListener(this);
-        if (manage_chromecast != null) {
-            LocalBroadcastManager.getInstance(MainActivity.this).unregisterReceiver(manage_chromecast);
-
-            new Thread(() -> {
-                if (chromeCasts != null && chromeCasts.size() > 0) {
-                    for (ChromeCast cast : chromeCasts) {
-                        try {
-                            cast.stopApp();
-                            cast.disconnect();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }).start();
-        }
-        if (chromeCasts != null) {
-            chromeCasts = null;
-        }
-        if (chromeCast != null) {
-            chromeCast = null;
-        }
-    }
-
-    //Method for discovering cast devices
-    public void discoverCast() {
-        new Thread(() -> {
-            if (chromeCasts != null) {
-                for (ChromeCast cast : chromeCasts) {
-                    try {
-                        cast.disconnect();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-                chromeCasts = null;
-            }
-            chromeCasts = new ArrayList<>();
-            try {
-                List<NetworkInterface> interfaces;
-                interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
-                for (NetworkInterface ni : interfaces) {
-                    if ((!ni.isLoopback()) && ni.isUp() && (ni.getName().equals("wlan0"))) {
-                        Enumeration<InetAddress> inetAddressEnumeration = ni.getInetAddresses();
-                        while (inetAddressEnumeration.hasMoreElements()) {
-                            InetAddress inetAddress = inetAddressEnumeration.nextElement();
-                            ChromeCasts.restartDiscovery(inetAddress);
-                            int tryFind = 0;
-                            while (ChromeCasts.get().isEmpty() && tryFind < 5) {
-                                try {
-                                    //noinspection BusyWait
-                                    Thread.sleep(1000);
-                                    tryFind++;
-                                } catch (InterruptedException ignored) {
-                                }
-                            }
-                        }
-                    }
-                }
-                ChromeCasts.stopDiscovery();
-                Handler mainHandler = new Handler(Looper.getMainLooper());
-                Runnable myRunnable = this::invalidateOptionsMenu;
-                mainHandler.post(myRunnable);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }).start();
     }
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(MainActivity.this, HelperInstance.getLiveInstance(this),true);
         super.onCreate(savedInstanceState);
-        binding = ActivityMainBinding.inflate(getLayoutInflater());
-        View view = binding.getRoot();
-        setContentView(view);
-        ChromeCastsListener chromeCastsListener = this;
-        ChromeCasts.registerListener(chromeCastsListener);
+
+        binding = super.binding;
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -400,7 +273,11 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
                 invalidateOptionsMenu();
             }).start();
         }
-        binding.viewpager.setOffscreenPageLimit(5);
+        if (Helper.isLoggedIn(MainActivity.this)) {
+            binding.viewpager.setOffscreenPageLimit(5);
+        }else {
+            binding.viewpager.setOffscreenPageLimit(4);
+        }
 
         Matomo.sendEvent(MainActivity.this, "UTILISATEUR", "DEMARRAGE", HelperInstance.getLiveInstance(MainActivity.this), Helper.isLoggedIn(MainActivity.this) ? 1 : 0);
 
@@ -462,94 +339,17 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         }
 
 
-        binding.castClose.setOnClickListener(v -> {
-            Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
-            Bundle b = new Bundle();
-            b.putInt("displayed", 0);
-            intentBC.putExtras(b);
-            LocalBroadcastManager.getInstance(MainActivity.this).sendBroadcast(intentBC);
-        });
-
-        binding.castTogglePlay.setOnClickListener(v -> {
-            if (chromeCast != null) {
-                new Thread(() -> {
-                    try {
-                        Handler mainHandler = new Handler(Looper.getMainLooper());
-                        Runnable myRunnable = () -> binding.castTogglePlay.setVisibility(View.GONE);
-                        mainHandler.post(myRunnable);
-                        int icon = -1;
-                        if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PLAYING) {
-                            chromeCast.pause();
-                            icon = R.drawable.ic_baseline_play_arrow_32;
-                        } else if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PAUSED) {
-                            chromeCast.play();
-                            icon = R.drawable.ic_baseline_pause_32;
-                        }
-                        if (icon != -1) {
-                            int finalIcon = icon;
-                            myRunnable = () -> binding.castTogglePlay.setImageResource(finalIcon);
-                            mainHandler.post(myRunnable);
-                        }
-                        myRunnable = () -> binding.castTogglePlay.setVisibility(View.VISIBLE);
-                        mainHandler.post(myRunnable);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }).start();
-            }
-        });
-        manage_chromecast = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                Bundle b = intent.getExtras();
-                assert b != null;
-                int state = b.getInt("state_asked", -1);
-                int displayed = b.getInt("displayed", -1);
-                castedTube = b.getParcelable("castedTube");
-
-                if (state == 1) {
-                    discoverCast();
-                } else if (state == 0) {
-                    new Thread(() -> {
-                        try {
-                            if (chromeCast != null) {
-                                chromeCast.stopApp();
-                                chromeCast.disconnect();
-                            }
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
-                }
-                if (displayed == 1) {
-                    chromecastActivated = true;
-                    if (castedTube != null) {
-                        binding.castInfo.setVisibility(View.VISIBLE);
-                        Helper.loadGiF(MainActivity.this, castedTube.getThumbnailPath(), binding.castView);
-                        binding.castTitle.setText(castedTube.getTitle());
-                        binding.castDescription.setText(castedTube.getDescription());
-                    }
-                } else if (displayed == 0) {
-                    chromecastActivated = false;
-                    binding.castInfo.setVisibility(View.GONE);
-                    new Thread(() -> {
-                        try {
-                            if (chromeCast != null) {
-                                chromeCast.stopApp();
-                            }
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
-                }
-            }
-        };
         final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
 
-        LocalBroadcastManager.getInstance(MainActivity.this).registerReceiver(manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS));
-        int search_cast = sharedpreferences.getInt(getString(R.string.set_cast_choice), 0);
+
+        int search_cast = sharedpreferences.getInt(getString(R.string.set_cast_choice), BuildConfig.cast_enabled);
         if (search_cast == 1) {
-            discoverCast();
+            super.discoverCast();
+        }
+        //Instance
+        if(HelperInstance.getLiveInstance(MainActivity.this) == null) {
+            Intent intent = new Intent(MainActivity.this, InstancePickerActivity.class);
+            startActivityForResult(intent, PICK_INSTANCE);
         }
     }
 
@@ -699,9 +499,9 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         MenuItem settingsItem = menu.findItem(R.id.action_settings);
         MenuItem sepiaSearchItem = menu.findItem(R.id.action_sepia_search);
         MenuItem incognitoItem = menu.findItem(R.id.action_incognito);
-        MenuItem instanceItem = menu.findItem(R.id.action_change_instance);
         MenuItem accountItem = menu.findItem(R.id.action_account);
         MenuItem donateItem = menu.findItem(R.id.action_donate);
+        MenuItem changeInstanceItem = menu.findItem(R.id.action_change_instance);
 
         FrameLayout rootView = (FrameLayout) accountItem.getActionView();
 
@@ -715,24 +515,15 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
             redCircle.setVisibility(View.GONE);
         }
         TooltipCompat.setTooltipText(accountItem.getActionView(), getText(R.string.account));
-        if (BuildConfig.full_instances && BuildConfig.google_restriction) {
+        if (BuildConfig.FLAVOR.compareTo("google_full") == 0) {
             donateItem.setVisible(true);
         }
 
-        if (BuildConfig.surfing_mode && ((Helper.isLoggedIn(MainActivity.this) && typeOfConnection == NORMAL) || typeOfConnection == SURFING)) {
-            binding.instances.setVisibility(View.VISIBLE);
-            binding.instances.setOnClickListener(null);
-            binding.instances.setOnClickListener(v -> {
-                Intent intent = new Intent(MainActivity.this, ManageInstancesActivity.class);
-                startActivity(intent);
-                overridePendingTransition(R.anim.slide_in_up, R.anim.slide_out_up);
-            });
-        } else {
-            binding.instances.setVisibility(View.GONE);
+        if (!BuildConfig.instance_switcher) {
+            changeInstanceItem.setVisible(false);
         }
         switch (typeOfConnection) {
             case UNKNOWN:
-                instanceItem.setVisible(false);
                 accountItem.setVisible(false);
                 uploadItem.setVisible(false);
                 myVideosItem.setVisible(false);
@@ -746,7 +537,9 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
             case NORMAL:
                 accountItem.setVisible(true);
                 if (Helper.isLoggedIn(MainActivity.this)) {
-                    instanceItem.setVisible(false);
+                    if (!BuildConfig.full_instances) {
+                        changeInstanceItem.setVisible(false);
+                    }
                     uploadItem.setVisible(true);
                     myVideosItem.setVisible(true);
                     playslistItem.setVisible(true);
@@ -758,18 +551,16 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
                     boolean checked = sharedpreferences.getBoolean(getString(R.string.set_store_in_history), true);
                     incognitoItem.setChecked(checked);
                 } else {
-                    instanceItem.setVisible(true);
                     uploadItem.setVisible(false);
                     myVideosItem.setVisible(false);
                     playslistItem.setVisible(!BuildConfig.full_instances);
                     historyItem.setVisible(false);
                     settingsItem.setVisible(true);
-                    mostLikedItem.setVisible(false);
+                    mostLikedItem.setVisible(true);
                     incognitoItem.setVisible(false);
                 }
                 break;
             case SURFING:
-                instanceItem.setVisible(false);
                 accountItem.setVisible(true);
                 uploadItem.setVisible(false);
                 myVideosItem.setVisible(false);
@@ -781,9 +572,6 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
                 break;
         }
 
-        if (!BuildConfig.instance_switcher) {
-            instanceItem.setVisible(false);
-        }
 
         if (!BuildConfig.sepia_search) {
             sepiaSearchItem.setVisible(false);
@@ -827,7 +615,9 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         String action = "TIMELINE";
         if (item.getItemId() == R.id.action_change_instance) {
             if (BuildConfig.full_instances) {
-                showRadioButtonDialogFullInstances(MainActivity.this, false);
+                Intent intent = new Intent(MainActivity.this, ManageInstancesActivity.class);
+                startActivity(intent);
+                overridePendingTransition(R.anim.slide_in_up, R.anim.slide_out_up);
             } else {
                 showRadioButtonDialog();
             }
@@ -941,21 +731,19 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         String acad = HelperInstance.getLiveInstance(MainActivity.this);
         int i = 0;
-        HashMap<String, String> instancesMap = new HashMap<>(HelperAcadInstance.instances_themes);
-        Iterator<Map.Entry<String, String>> it = instancesMap.entrySet().iterator();
-        String[] academiesKey = new String[HelperAcadInstance.instances_themes.size()];
-        String[] academiesValue = new String[HelperAcadInstance.instances_themes.size()];
+        List<AcadInstances> acadInstances = AcadInstances.getInstances();
+        String[] academiesKey = new String[acadInstances.size()];
+        String[] academiesValue = new String[acadInstances.size()];
         int position = 0;
-        while (it.hasNext()) {
-            Map.Entry<String, String> pair = it.next();
-            academiesKey[i] = pair.getKey();
-            academiesValue[i] = pair.getValue();
-            if (pair.getValue().compareTo(acad) == 0) {
+        for (AcadInstances ac : acadInstances) {
+            academiesKey[i] = ac.getName();
+            academiesValue[i] = ac.getUrl();
+            if (ac.getUrl().compareTo(acad) == 0) {
                 position = i;
             }
-            it.remove();
             i++;
         }
+
         alt_bld.setSingleChoiceItems(academiesKey, position, (dialog, item) -> {
             String newInstance = academiesValue[item];
             SharedPreferences.Editor editor = sharedpreferences.edit();
@@ -1003,28 +791,26 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
             if (Helper.isLoggedIn(MainActivity.this)) {
                 switch (position) {
                     case 0:
-                        return overviewFragment;
+                        return locaFragment;
                     case 1:
-                        return subscriptionFragment;
+                        return recentFragment;
                     case 2:
                         return trendingFragment;
                     case 3:
-                        return recentFragment;
+                        return overviewFragment;
                     case 4:
-                        return locaFragment;
+                        return subscriptionFragment;
                 }
             } else {
                 switch (position) {
                     case 0:
-                        return overviewFragment;
-                    case 1:
-                        return trendingFragment;
-                    case 2:
-                        return mostLikedFragment;
-                    case 3:
-                        return recentFragment;
-                    case 4:
                         return locaFragment;
+                    case 1:
+                        return recentFragment;
+                    case 2:
+                        return trendingFragment;
+                    case 3:
+                        return overviewFragment;
                 }
             }
             return overviewFragment;
@@ -1032,7 +818,11 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
 
         @Override
         public int getCount() {
-            return 5;
+            if (Helper.isLoggedIn(MainActivity.this)) {
+                return 5;
+            }else {
+                return 4;
+            }
         }
     }
 }

app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,9 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.MainActivity.PICK_INSTANCE_SURF;
+import static app.fedilab.fedilabtube.activities.MainActivity.showRadioButtonDialogFullInstances;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
@@ -23,34 +26,35 @@ import android.os.Handler;
 import android.view.MenuItem;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.InstanceData;
 import app.fedilab.fedilabtube.databinding.ActivityManageInstancesBinding;
 import app.fedilab.fedilabtube.drawer.AboutInstanceAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.sqlite.StoredInstanceDAO;
 import app.fedilab.fedilabtube.viewmodel.InfoInstanceVM;
 
-import static app.fedilab.fedilabtube.MainActivity.PICK_INSTANCE_SURF;
-import static app.fedilab.fedilabtube.MainActivity.showRadioButtonDialogFullInstances;
 
-
-public class ManageInstancesActivity extends AppCompatActivity implements AboutInstanceAdapter.AllInstancesRemoved {
+public class ManageInstancesActivity extends BaseActivity implements AboutInstanceAdapter.AllInstancesRemoved {
 
     private ActivityManageInstancesBinding binding;
     private List<InstanceData.AboutInstance> aboutInstances;
     private AboutInstanceAdapter aboutInstanceAdapter;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityManageInstancesBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();

app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 
 
 import android.annotation.SuppressLint;
@@ -33,17 +33,19 @@ import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 
-import app.fedilab.fedilabtube.client.mastodon.RetrofitMastodonAPI;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.entities.Error;
 import app.fedilab.fedilabtube.client.entities.OauthParams;
 import app.fedilab.fedilabtube.client.entities.Token;
+import app.fedilab.fedilabtube.client.mastodon.RetrofitMastodonAPI;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
 
-public class MastodonWebviewConnectActivity extends AppCompatActivity {
+public class MastodonWebviewConnectActivity extends BaseActivity {
 
 
     private WebView webView;
@@ -78,8 +80,8 @@ public class MastodonWebviewConnectActivity extends AppCompatActivity {
 
     @SuppressLint("SetJavaScriptEnabled")
     public void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         setContentView(R.layout.activity_webview_connect);
         Bundle b = getIntent().getExtras();
         if (b != null) {
@@ -97,11 +99,7 @@ public class MastodonWebviewConnectActivity extends AppCompatActivity {
         clearCookies(MastodonWebviewConnectActivity.this);
         webView.getSettings().setJavaScriptEnabled(true);
 
-        if (Build.VERSION.SDK_INT >= 21) {
-            CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
-        } else {
-            CookieManager.getInstance().setAcceptCookie(true);
-        }
+        CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
 
         final ProgressBar pbar = findViewById(R.id.progress_bar);
         webView.setWebChromeClient(new WebChromeClient() {

app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,9 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
+import static app.fedilab.fedilabtube.worker.WorkHelper.NOTIFICATION_WORKER;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
@@ -31,7 +34,6 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -45,6 +47,7 @@ import com.bumptech.glide.request.RequestOptions;
 
 import org.jetbrains.annotations.NotNull;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.entities.Error;
 import app.fedilab.fedilabtube.client.entities.NotificationSettings;
@@ -52,13 +55,13 @@ import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.client.entities.UserSettings;
 import app.fedilab.fedilabtube.databinding.ActivityMyAccountSettingsBinding;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperAcadInstance;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.worker.WorkHelper;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
-import static app.fedilab.fedilabtube.worker.WorkHelper.NOTIFICATION_WORKER;
-
-public class MyAccountActivity extends AppCompatActivity {
+public class MyAccountActivity extends BaseActivity {
 
     private static final int PICK_IMAGE = 466;
     ActivityMyAccountSettingsBinding binding;
@@ -66,8 +69,10 @@ public class MyAccountActivity extends AppCompatActivity {
     private String fileName;
     private NotificationSettings notificationSettings;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityMyAccountSettingsBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
@@ -94,8 +99,7 @@ public class MyAccountActivity extends AppCompatActivity {
         initializeValues(notificationSettings.getNewCommentOnMyVideo(), binding.notifNewCommentApp, binding.notifNewCommentMail);
         initializeValues(notificationSettings.getNewVideoFromSubscription(), binding.notifNewVideoApp, binding.notifNewVideoMail);
 
-        Helper.loadGiF(MyAccountActivity.this, MainActivity.userMe.getAccount().getAvatar() != null ? MainActivity.userMe.getAccount().getAvatar().getPath() : null, binding.profilePicture);
-
+        Helper.loadAvatar(MyAccountActivity.this, MainActivity.userMe.getAccount(), binding.profilePicture);
         String[] refresh_array = getResources().getStringArray(R.array.refresh_time);
         ArrayAdapter<String> refreshArray = new ArrayAdapter<>(MyAccountActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, refresh_array);

app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,18 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.ADD_COMMENT;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.RATEVIDEO;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPLY;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_VIDEO;
+import static app.fedilab.fedilabtube.helper.Helper.canMakeAction;
+import static app.fedilab.fedilabtube.helper.Helper.getAttColor;
+import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
+import static app.fedilab.fedilabtube.helper.Helper.loadAvatar;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -44,7 +56,6 @@ import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -52,7 +63,6 @@ import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.TranslateAnimation;
 import android.view.inputmethod.InputMethodManager;
-import android.webkit.MimeTypeMap;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -63,24 +73,16 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
-import com.frostwire.jlibtorrent.SessionManager;
-import com.github.se_bastiaan.torrentstream.StreamStatus;
-import com.github.se_bastiaan.torrentstream.Torrent;
-import com.github.se_bastiaan.torrentstream.TorrentOptions;
-import com.github.se_bastiaan.torrentstream.TorrentStream;
-import com.github.se_bastiaan.torrentstream.listeners.TorrentListener;
 import com.github.vkay94.dtpv.youtube.YouTubeOverlay;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -101,9 +103,7 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.DefaultTimeBar;
 import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.upstream.FileDataSource;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoListener;
@@ -111,8 +111,6 @@ import com.google.android.material.snackbar.Snackbar;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -120,11 +118,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import app.fedilab.fedilabtube.BasePeertubeActivity;
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.Matomo;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.MenuItemVideo;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
@@ -150,6 +150,7 @@ import app.fedilab.fedilabtube.drawer.MenuItemAdapter;
 import app.fedilab.fedilabtube.helper.CacheDataSourceFactory;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.viewmodel.CaptionsVM;
@@ -163,36 +164,17 @@ import app.fedilab.fedilabtube.webview.CustomWebview;
 import app.fedilab.fedilabtube.webview.MastalabWebChromeClient;
 import app.fedilab.fedilabtube.webview.MastalabWebViewClient;
 import es.dmoral.toasty.Toasty;
-import su.litvak.chromecast.api.v2.ChromeCast;
-import su.litvak.chromecast.api.v2.MediaStatus;
-import su.litvak.chromecast.api.v2.Status;
-
-import static app.fedilab.fedilabtube.MainActivity.chromeCast;
-import static app.fedilab.fedilabtube.MainActivity.chromeCasts;
-import static app.fedilab.fedilabtube.MainActivity.chromecastActivated;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.ADD_COMMENT;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.RATEVIDEO;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPLY;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_VIDEO;
-import static app.fedilab.fedilabtube.helper.Helper.CAST_ID;
-import static app.fedilab.fedilabtube.helper.Helper.canMakeAction;
-import static app.fedilab.fedilabtube.helper.Helper.getAttColor;
-import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
-import static app.fedilab.fedilabtube.helper.Helper.loadGiF;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
-import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO;
 
 
-public class PeertubeActivity extends AppCompatActivity implements CommentListAdapter.AllCommentRemoved, Player.EventListener, VideoListener, TorrentListener, MenuAdapter.ItemClicked, MenuItemAdapter.ItemAction {
+public class PeertubeActivity extends BasePeertubeActivity implements CommentListAdapter.AllCommentRemoved, Player.EventListener, VideoListener, MenuAdapter.ItemClicked, MenuItemAdapter.ItemAction {
 
     public static String video_id;
     public static List<String> playedVideos = new ArrayList<>();
+    Uri captionURI;
+    String captionLang;
     private String peertubeInstance, videoUuid;
     private ImageView fullScreenIcon;
-    private SimpleExoPlayer player;
     private boolean fullScreenMode;
-    private VideoData.Video peertube;
     private int mode;
     private Map<String, List<PlaylistExist>> playlists;
     private boolean playInMinimized, autoPlay, autoFullscreen;
@@ -210,7 +192,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private BroadcastReceiver mPowerKeyReceiver = null;
     private boolean isPlayInMinimized;
     private VideoData.Video nextVideo;
-    private TorrentStream torrentStream;
     private String show_more_content;
     private videoOrientation videoOrientationType;
     private int initialOrientation;
@@ -218,10 +199,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private String currentCaption;
     private boolean isRemote;
     private boolean willPlayFromIntent;
-    private String chromeCastVideoURL;
     private app.fedilab.fedilabtube.client.mastodon.Status status;
-    Uri captionURI;
-    String captionLang;
 
     public static void hideKeyboard(Activity activity) {
         if (activity != null && activity.getWindow() != null) {
@@ -241,76 +219,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }
     }
 
-    @Override
-    public void onStreamPrepared(Torrent torrent) {
-        torrent.startDownload();
-    }
-
-    @Override
-    public void onStreamStarted(Torrent torrent) {
-
-
-    }
-
-    @Override
-    public void onStreamError(Torrent torrent, Exception e) {
-        e.printStackTrace();
-    }
-
-    @Override
-    public void onStreamReady(Torrent torrent) {
-        if (torrent.getVideoFile() != null) {
-            for (int i = 0; i < torrent.getFileNames().length; i++) {
-                torrent.getTorrentHandle().renameFile(i, torrent.getFileNames()[0].replaceAll("[^a-zA-Z0-9/.-]", "_"));
-            }
-            startStream(peertube, torrent.getVideoFile().getAbsolutePath().replaceAll("[^a-zA-Z0-9/.-]", "_"), null, autoPlay, -1, null, null, true);
-            PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);
-            ConstraintLayout torrent_info = controlView.findViewById(R.id.torrent_info);
-            TextView dowload_rate = controlView.findViewById(R.id.dowload_rate);
-            TextView upload_rate = controlView.findViewById(R.id.upload_rate);
-            torrent_info.setVisibility(View.VISIBLE);
-
-            new Timer().scheduleAtFixedRate(new TimerTask() {
-                @Override
-                public void run() {
-                    SessionManager sessionManager = torrentStream.getSessionManager();
-                    if (sessionManager != null) {
-                        long upload = sessionManager.uploadRate();
-                        long download = sessionManager.downloadRate();
-                        runOnUiThread(() -> {
-                            dowload_rate.setText(String.format("▼ %s", Helper.rateSize(PeertubeActivity.this, download)));
-                            upload_rate.setText(String.format("▲ %s", Helper.rateSize(PeertubeActivity.this, upload)));
-                        });
-                    }
-                }
-            }, 0, 1000);
-        } else {
-            Toasty.error(PeertubeActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-        }
-
-    }
-
-
-    @Override
-    public void onStreamProgress(Torrent torrent, StreamStatus status) {
-        if (binding != null) {
-            PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);
-            TextView peers_number = controlView.findViewById(R.id.peers_number);
-            peers_number.setText(getString(R.string.peers, status.peers));
-        }
-    }
-
-    @Override
-    public void onStreamStopped() {
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
-        binding = ActivityPeertubeBinding.inflate(getLayoutInflater());
-        View view = binding.getRoot();
-        setContentView(view);
+        binding = super.binding;
         videoOrientationType = videoOrientation.LANDSCAPE;
         max_id = "0";
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
@@ -318,19 +232,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
         if (Helper.canMakeAction(PeertubeActivity.this) && !sepiaSearch) {
             Account account = new AccountDAO(PeertubeActivity.this, db).getAccountByToken(token);
-            Helper.loadGiF(PeertubeActivity.this, account.getAvatar() != null ? account.getAvatar().getPath() : null, binding.myPp);
+            Helper.loadAvatar(PeertubeActivity.this, account, binding.myPp);
         }
         isRemote = false;
-        TorrentOptions torrentOptions = new TorrentOptions.Builder()
-                .saveLocation(getCacheDir() + "/torrent/")
-                .autoDownload(true)
-                .removeFilesAfterStop(true)
-                .build();
 
 
         fullScreenMode = false;
-        torrentStream = TorrentStream.init(torrentOptions);
-        torrentStream.addListener(PeertubeActivity.this);
         initialOrientation = getResources().getConfiguration().orientation;
         if (Helper.isTablet(PeertubeActivity.this)) {
 
@@ -512,34 +419,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             }
         });
 
-        binding.castPlay.setOnClickListener(v -> {
-            binding.castLoader.setVisibility(View.VISIBLE);
-            if (chromeCast != null) {
-                new Thread(() -> {
-                    try {
-                        int icon = -1;
-                        if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PLAYING) {
-                            chromeCast.pause();
-                            icon = R.drawable.ic_baseline_play_arrow_32;
-                        } else if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PAUSED) {
-                            chromeCast.play();
-                            icon = R.drawable.ic_baseline_pause_32;
-                        }
-                        if (icon != -1) {
-                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                            int finalIcon = icon;
-                            Runnable myRunnable = () -> binding.castPlay.setImageResource(finalIcon);
-                            mainHandler.post(myRunnable);
-                        }
-                        Handler mainHandler = new Handler(Looper.getMainLooper());
-                        Runnable myRunnable = () -> binding.castLoader.setVisibility(View.GONE);
-                        mainHandler.post(myRunnable);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }).start();
-            }
-        });
 
     }
 
@@ -798,20 +677,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }).start();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(@NotNull Menu menu) {
-        getMenuInflater().inflate(R.menu.video_menu, menu);
-        MenuItem castItem = menu.findItem(R.id.action_cast);
-        if (chromeCasts != null && chromeCasts.size() > 0) {
-            castItem.setVisible(true);
-            if (chromeCast != null && chromeCast.isConnected()) {
-                castItem.setIcon(R.drawable.ic_baseline_cast_connected_24);
-            } else {
-                castItem.setIcon(R.drawable.ic_baseline_cast_24);
-            }
-        }
-        return true;
-    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -821,101 +686,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             }
             finish();
             return true;
-        } else if (item.getItemId() == R.id.action_cast) {
-            if (chromeCasts != null && chromeCasts.size() > 0) {
-                String[] chromecast_choice = new String[chromeCasts.size()];
-                AlertDialog.Builder alt_bld = new AlertDialog.Builder(this);
-                alt_bld.setTitle(R.string.chromecast_choice);
-                int i = 0;
-                for (ChromeCast cc : chromeCasts) {
-                    chromecast_choice[i] = cc.getTitle();
-                    i++;
-                }
-                i = 0;
-                for (ChromeCast cc : chromeCasts) {
-                    if (chromecastActivated && cc.isConnected()) {
-                        break;
-                    }
-                    i++;
-                }
-
-                alt_bld.setSingleChoiceItems(chromecast_choice, i, (dialog, position) -> {
-                    chromeCast = chromeCasts.get(position);
-                    new Thread(() -> {
-                        if (chromeCast != null) {
-                            Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
-                            Bundle b = new Bundle();
-                            if (chromecastActivated) {
-                                b.putInt("displayed", 0);
-                                intentBC.putExtras(b);
-                                LocalBroadcastManager.getInstance(PeertubeActivity.this).sendBroadcast(intentBC);
-                                Handler mainHandler = new Handler(Looper.getMainLooper());
-                                Runnable myRunnable = () -> {
-                                    binding.doubleTapPlayerView.setVisibility(View.VISIBLE);
-                                    binding.castController.setVisibility(View.GONE);
-                                };
-                                mainHandler.post(myRunnable);
-
-                            } else {
-                                b.putInt("displayed", 1);
-                                b.putParcelable("castedTube", peertube);
-                                intentBC.putExtras(b);
-                                LocalBroadcastManager.getInstance(PeertubeActivity.this).sendBroadcast(intentBC);
-                                try {
-                                    Handler mainHandler = new Handler(Looper.getMainLooper());
-                                    Runnable myRunnable = () -> {
-                                        invalidateOptionsMenu();
-                                        binding.castLoader.setVisibility(View.VISIBLE);
-                                        player.setPlayWhenReady(false);
-                                        binding.doubleTapPlayerView.setVisibility(View.GONE);
-                                        binding.castController.setVisibility(View.VISIBLE);
-                                        dialog.dismiss();
-                                        if (chromeCastVideoURL != null) {
-                                            if (player != null && player.getCurrentPosition() > 0) {
-                                                chromeCastVideoURL += "?start=" + (player.getCurrentPosition() / 1000);
-                                            }
-                                        }
-                                    };
-                                    mainHandler.post(myRunnable);
-                                    if (!chromeCast.isConnected()) {
-                                        chromeCast.connect();
-                                    }
-                                    myRunnable = this::invalidateOptionsMenu;
-                                    mainHandler.post(myRunnable);
-                                    Status status = chromeCast.getStatus();
-                                    if (chromeCast.isAppAvailable(CAST_ID) && !status.isAppRunning(CAST_ID)) {
-                                        chromeCast.launchApp(CAST_ID);
-                                    }
-
-                                    if (chromeCastVideoURL != null) {
-                                        String mime = MimeTypeMap.getFileExtensionFromUrl(chromeCastVideoURL);
-                                        chromeCast.setRequestTimeout(60000);
-                                        chromeCast.load(peertube.getTitle(), null, chromeCastVideoURL, mime);
-                                        chromeCast.play();
-                                        binding.castPlay.setImageResource(R.drawable.ic_baseline_pause_32);
-                                    }
-                                    myRunnable = () -> binding.castLoader.setVisibility(View.GONE);
-                                    mainHandler.post(myRunnable);
-                                } catch (IOException | GeneralSecurityException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-
-                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                            Runnable myRunnable = () -> {
-                                invalidateOptionsMenu();
-                                dialog.dismiss();
-                            };
-                            mainHandler.post(myRunnable);
-
-                        }
-                    }).start();
-
-                });
-                alt_bld.setPositiveButton(R.string.close, (dialog, id) -> dialog.dismiss());
-                AlertDialog alert = alt_bld.create();
-                alert.show();
-            }
         }
         return super.onOptionsItemSelected(item);
     }
@@ -1207,13 +977,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         binding.peertubeDislikeCount.setText(Helper.withSuffix(peertube.getDislikes()));
         binding.peertubeLikeCount.setText(Helper.withSuffix(peertube.getLikes()));
         binding.peertubeViewCount.setText(Helper.withSuffix(peertube.getViews()));
-        String ppChannelURL;
-        if (sepiaSearch) {
-            ppChannelURL = peertube.getChannel().getAvatar() != null ? "https://" + peertubeInstance + peertube.getChannel().getAvatar().getPath() : null;
-        } else {
-            ppChannelURL = peertube.getChannel().getAvatar() != null ? peertube.getChannel().getAvatar().getPath() : null;
-        }
-        loadGiF(PeertubeActivity.this, ppChannelURL, binding.ppChannel);
+        loadAvatar(PeertubeActivity.this, peertube.getChannel(), binding.ppChannel);
         binding.ppChannel.setOnClickListener(v -> {
             Intent intent = new Intent(PeertubeActivity.this, ShowChannelActivity.class);
             Bundle b = new Bundle();
@@ -1329,7 +1093,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             startStream(
                     apiResponse.getPeertubes().get(0),
                     null,
-                    null,
                     autoPlay, position, null, null, true);
             player.prepare();
             player.setPlayWhenReady(autoPlay);
@@ -1417,83 +1180,69 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         });
     }
 
+
     /**
      * Manage video to play with different factors
      *
      * @param video           VideoData.Video
-     * @param localTorrentUrl String if not null that will be used
      * @param resolution      String the current resolution asked
      * @param autoPlay        boolean
      * @param position        int current position
      * @param subtitles       Uri uri for subtitles
      * @param lang            String ("en","fr", etc.)
      */
-    private void stream(VideoData.Video video, String localTorrentUrl, String resolution, boolean autoPlay, long position, Uri subtitles, String lang) {
-        String videoURL = localTorrentUrl == null ? video.getFileUrl(resolution, PeertubeActivity.this) : localTorrentUrl;
+    private void stream(VideoData.Video video, String resolution, boolean autoPlay, long position, Uri subtitles, String lang) {
+        videoURL = video.getFileUrl(resolution, PeertubeActivity.this);
+        if (subtitles != null) {
+            subtitlesStr = subtitles.toString();
+        }
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         int video_cache = sharedpreferences.getInt(Helper.SET_VIDEO_CACHE, Helper.DEFAULT_VIDEO_CACHE_MB);
-        if (videoURL != null && (videoURL.endsWith(".torrent") || videoURL.startsWith("magnet"))) {
-            torrentStream.startStream(videoURL);
-            return;
-        } else {
-            ProgressiveMediaSource videoSource = null;
-            HlsMediaSource hlsMediaSource = null;
-            SingleSampleMediaSource subtitleSource = null;
-            DataSource.Factory dataSourceFactory = null;
-            if (localTorrentUrl != null) {
-                DataSpec dataSpec = new DataSpec(Uri.fromFile(new java.io.File(localTorrentUrl)));
-                FileDataSource fileDataSource = new FileDataSource();
-                try {
-                    fileDataSource.open(dataSpec);
-                    dataSourceFactory = () -> fileDataSource;
-                } catch (FileDataSource.FileDataSourceException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (video_cache == 0 || dataSourceFactory != null || video.isLive()) {
-                if (dataSourceFactory == null) {
-                    dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
-                            Util.getUserAgent(PeertubeActivity.this, null), null);
-                }
+        ProgressiveMediaSource videoSource = null;
+        HlsMediaSource hlsMediaSource = null;
+        SingleSampleMediaSource subtitleSource = null;
+        DataSource.Factory dataSourceFactory;
+        if (video_cache == 0 || video.isLive()) {
+            dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
+                    Util.getUserAgent(PeertubeActivity.this, null), null);
 
-                if (subtitles != null) {
-                    MediaItem.Subtitle mediaSubtitle = new MediaItem.Subtitle(subtitles, MimeTypes.TEXT_VTT, lang);
-                    subtitleSource = new SingleSampleMediaSource.Factory(dataSourceFactory).createMediaSource(mediaSubtitle, C.TIME_UNSET);
-                }
-                MediaItem mediaItem = new MediaItem.Builder().setUri(Uri.parse(videoURL)).build();
-                if (videoURL != null && !videoURL.endsWith("m3u8")) {
-                    videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(mediaItem);
-                } else {
-                    hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory)
-                            .createMediaSource(mediaItem);
-                }
-            } else {
-                CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
-                MediaItem mediaItem = new MediaItem.Builder().setUri(videoURL).build();
-                if (subtitles != null) {
-                    MediaItem.Subtitle mediaSubtitle = new MediaItem.Subtitle(subtitles, MimeTypes.TEXT_VTT, lang, Format.NO_VALUE);
-                    subtitleSource = new SingleSampleMediaSource.Factory(cacheDataSourceFactory).createMediaSource(mediaSubtitle, C.TIME_UNSET);
-                }
-                if (videoURL != null && !videoURL.endsWith("m3u8")) {
-                    videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory).createMediaSource(mediaItem);
-                } else {
-                    hlsMediaSource = new HlsMediaSource.Factory(cacheDataSourceFactory)
-                            .createMediaSource(mediaItem);
-                }
+            if (subtitles != null) {
+                MediaItem.Subtitle mediaSubtitle = new MediaItem.Subtitle(subtitles, MimeTypes.TEXT_VTT, lang);
+                subtitleSource = new SingleSampleMediaSource.Factory(dataSourceFactory).createMediaSource(mediaSubtitle, C.TIME_UNSET);
             }
-            if (lang != null && subtitleSource != null && videoSource != null) {
-                MergingMediaSource mergedSource =
-                        new MergingMediaSource(videoSource, subtitleSource);
-                player.setMediaSource(mergedSource);
-            } else if (lang != null && subtitleSource != null) {
-                MergingMediaSource mergedSource =
-                        new MergingMediaSource(hlsMediaSource, subtitleSource);
-                player.setMediaSource(mergedSource);
-            } else if (videoSource != null) {
-                player.setMediaSource(videoSource);
+            MediaItem mediaItem = new MediaItem.Builder().setUri(Uri.parse(videoURL)).build();
+            if (videoURL != null && !videoURL.endsWith("m3u8")) {
+                videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(mediaItem);
             } else {
-                player.setMediaSource(hlsMediaSource);
+                hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory)
+                        .createMediaSource(mediaItem);
             }
+        } else {
+            CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
+            MediaItem mediaItem = new MediaItem.Builder().setUri(videoURL).build();
+            if (subtitles != null) {
+                MediaItem.Subtitle mediaSubtitle = new MediaItem.Subtitle(subtitles, MimeTypes.TEXT_VTT, lang, Format.NO_VALUE);
+                subtitleSource = new SingleSampleMediaSource.Factory(cacheDataSourceFactory).createMediaSource(mediaSubtitle, C.TIME_UNSET);
+            }
+            if (videoURL != null && !videoURL.endsWith("m3u8")) {
+                videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory).createMediaSource(mediaItem);
+            } else {
+                hlsMediaSource = new HlsMediaSource.Factory(cacheDataSourceFactory)
+                        .createMediaSource(mediaItem);
+            }
+        }
+        if (lang != null && subtitleSource != null && videoSource != null) {
+            MergingMediaSource mergedSource =
+                    new MergingMediaSource(videoSource, subtitleSource);
+            player.setMediaSource(mergedSource);
+        } else if (lang != null && subtitleSource != null) {
+            MergingMediaSource mergedSource =
+                    new MergingMediaSource(hlsMediaSource, subtitleSource);
+            player.setMediaSource(mergedSource);
+        } else if (videoSource != null) {
+            player.setMediaSource(videoSource);
+        } else {
+            player.setMediaSource(hlsMediaSource);
         }
         player.prepare();
         if (position > 0) {
@@ -1503,6 +1252,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         if (autoPlay) {
             binding.doubleTapPlayerView.hideController();
         }
+        // loadCast(video, videoURL, subtitles!=null?subtitles.toString():null);
     }
 
     private void fetchComments() {
@@ -1529,14 +1279,9 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }
     }
 
-    private void startStream(VideoData.Video video, String torrentLocal, String resolution, boolean autoPlay, long position, Uri subtitles, String lang, boolean promptNSFW) {
+    private void startStream(VideoData.Video video, String resolution, boolean autoPlay, long position, Uri subtitles, String lang, boolean promptNSFW) {
 
-        String videoURL;
-        if (torrentLocal != null) {
-            videoURL = torrentLocal;
-        } else {
-            videoURL = peertube.getFileUrl(resolution, PeertubeActivity.this);
-        }
+        String videoURL = peertube.getFileUrl(resolution, PeertubeActivity.this);
         if (peertube != null && peertube.isLive() && videoURL == null) {
             View parentLayout = findViewById(android.R.id.content);
             Snackbar snackbar = Snackbar.make(parentLayout, R.string.live_not_started, Snackbar.LENGTH_INDEFINITE);
@@ -1544,7 +1289,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             snackbar.show();
             return;
         }
-        chromeCastVideoURL = videoURL;
+
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         String nsfwAction = sharedpreferences.getString(getString(R.string.set_video_sensitive_choice), Helper.BLUR);
         if (promptNSFW && peertube != null && peertube.isNsfw() && (nsfwAction.compareTo(Helper.BLUR) == 0 || nsfwAction.compareTo(Helper.DO_NOT_LIST) == 0)) {
@@ -1559,13 +1304,13 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 finish();
             });
             dialogBuilder.setPositiveButton(R.string.play, (dialog, id) -> {
-                stream(video, null, resolution, autoPlay, position, subtitles, lang);
+                stream(video, resolution, autoPlay, position, subtitles, lang);
                 dialog.dismiss();
             });
             alertDialog = dialogBuilder.create();
             alertDialog.show();
         } else {
-            stream(video, torrentLocal, resolution, autoPlay, position, subtitles, lang);
+            stream(video, resolution, autoPlay, position, subtitles, lang);
         }
 
 
@@ -1574,7 +1319,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     @Override
     public void onConfigurationChanged(@NotNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (binding.castController.getVisibility() == View.VISIBLE) {
+        if (binding.minController.castMiniController.getVisibility() == View.VISIBLE) {
             return;
         }
         if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -1611,9 +1356,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         if (player != null) {
             player.release();
         }
-        if (torrentStream != null && torrentStream.isStreaming()) {
-            torrentStream.stopStream();
-        }
         unregisterReceiver();
     }
 
@@ -1627,7 +1369,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     public void onResume() {
         super.onResume();
         onStopCalled = false;
-        if (player != null && !player.isPlaying()) {
+        if (player != null && !player.isPlaying() && binding.minController.castMiniController.getVisibility() != View.VISIBLE) {
             player.setPlayWhenReady(autoPlay);
             if (autoPlay) {
                 binding.doubleTapPlayerView.hideController();
@@ -1643,7 +1385,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }
         if (player != null && (!isPlayInMinimized || !playInMinimized)) {
             player.setPlayWhenReady(false);
-        } else if (playInMinimized && binding.castController.getVisibility() != View.VISIBLE) {
+        } else if (playInMinimized && binding.minController.castMiniController.getVisibility() != View.VISIBLE) {
             enterVideoMode();
         }
     }
@@ -1948,7 +1690,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
                     startStream(
                             peertube,
-                            null,
                             res,
                             true, position, captionURI, captionLang, false);
                 }
@@ -1992,7 +1733,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 startStream(
                         peertube,
                         null,
-                        null,
                         true,
                         newPosition,
                         captionURI,
@@ -2147,7 +1887,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         if (comment != null) {
             binding.replyContent.setVisibility(View.VISIBLE);
             Account account = comment.getAccount();
-            Helper.loadGiF(PeertubeActivity.this, account.getAvatar() != null ? account.getAvatar().getPath() : null, binding.commentAccountProfile);
+            Helper.loadAvatar(PeertubeActivity.this, account, binding.commentAccountProfile);
             binding.commentAccountDisplayname.setText(account.getDisplayName());
             binding.commentAccountUsername.setText(account.getAcct());
             Spanned commentSpan;

app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,10 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.PEERTUBEDELETEVIDEO;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
@@ -30,7 +34,6 @@ import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
@@ -45,6 +48,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
@@ -55,18 +59,16 @@ import app.fedilab.fedilabtube.client.entities.ItemStr;
 import app.fedilab.fedilabtube.client.entities.VideoParams;
 import app.fedilab.fedilabtube.databinding.ActivityPeertubeEditBinding;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.MyVideoVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.PEERTUBEDELETEVIDEO;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
-
-public class PeertubeEditUploadActivity extends AppCompatActivity {
+public class PeertubeEditUploadActivity extends BaseActivity {
 
 
     private final int PICK_IMAGE = 50378;
@@ -82,8 +84,10 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
     private ActivityPeertubeEditBinding binding;
     private Uri inputData;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityPeertubeEditBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();

app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.MainActivity.PICK_INSTANCE;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
@@ -28,33 +30,34 @@ import android.view.View;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.entities.AccountCreation;
 import app.fedilab.fedilabtube.databinding.ActivityRegisterPeertubeBinding;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.MainActivity.PICK_INSTANCE;
-
-public class PeertubeRegisterActivity extends AppCompatActivity {
+public class PeertubeRegisterActivity extends BaseActivity {
 
 
     private String instance;
     private ActivityRegisterPeertubeBinding binding;
 
+
     @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         binding = ActivityRegisterPeertubeBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
         setContentView(mainView);
@@ -71,9 +74,6 @@ public class PeertubeRegisterActivity extends AppCompatActivity {
             binding.titleLoginInstance.setVisibility(View.GONE);
         }
 
-        if (BuildConfig.FLAVOR.compareTo("queermotion") == 0) {
-            binding.loginInstance.setText("queermotion.org");
-        }
 
         binding.username.setOnFocusChangeListener((view, focused) -> {
             if (!focused && binding.username.getText() != null) {

app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,10 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.MainActivity.userMe;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.Manifest;
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -31,7 +35,6 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.documentfile.provider.DocumentFile;
@@ -52,6 +55,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import app.fedilab.fedilabtube.BaseFedilabTube;
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData;
@@ -59,15 +65,12 @@ import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.databinding.ActivityPeertubeUploadBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.MainActivity.userMe;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
-
-public class PeertubeUploadActivity extends AppCompatActivity {
+public class PeertubeUploadActivity extends BaseActivity {
 
 
     public static final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 724;
@@ -79,10 +82,11 @@ public class PeertubeUploadActivity extends AppCompatActivity {
     private HashMap<String, String> channelToSend;
     private ActivityPeertubeUploadBinding binding;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -320,9 +324,7 @@ public class PeertubeUploadActivity extends AppCompatActivity {
                     filename = binding.videoTitle.getText().toString().trim();
                 }
                 try {
-                    SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
                     String token = Helper.getToken(PeertubeUploadActivity.this);
-
                     new MultipartUploadRequest(PeertubeUploadActivity.this, "https://" + HelperInstance.getLiveInstance(PeertubeUploadActivity.this) + "/api/v1/videos/upload")
                             .setMethod("POST")
                             .setBearerAuth(token)
@@ -413,6 +415,6 @@ public class PeertubeUploadActivity extends AppCompatActivity {
                 clearOnAction
         );
 
-        return new UploadNotificationConfig(FedilabTube.UPLOAD_CHANNEL_ID, ringToneEnabled, progress, success, error, cancelled);
+        return new UploadNotificationConfig(BaseFedilabTube.UPLOAD_CHANNEL_ID, ringToneEnabled, progress, success, error, cancelled);
     }
 }

app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -18,26 +18,28 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.data.PlaylistData;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.PlaylistExportHelper;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class PlaylistsActivity extends AppCompatActivity {
+public class PlaylistsActivity extends BaseActivity {
 
     private final int PICK_IMPORT = 5556;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 

app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -19,7 +19,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
@@ -30,13 +29,16 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.jetbrains.annotations.NotNull;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
 import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
 
-public class SearchActivity extends AppCompatActivity {
+public class SearchActivity extends BaseActivity {
 
 
     private String search;
@@ -44,6 +46,7 @@ public class SearchActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();

app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,9 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.PeertubeActivity.hideKeyboard;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -22,7 +25,6 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -37,26 +39,28 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.entities.SepiaSearch;
 import app.fedilab.fedilabtube.databinding.ActivitySepiaSearchBinding;
 import app.fedilab.fedilabtube.fragment.DisplaySepiaSearchFragment;
 import app.fedilab.fedilabtube.helper.Helper;
-
-import static app.fedilab.fedilabtube.PeertubeActivity.hideKeyboard;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+import app.fedilab.fedilabtube.helper.HelperAcadInstance;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 
-public class SepiaSearchActivity extends AppCompatActivity {
+public class SepiaSearchActivity extends BaseActivity {
 
 
     private SepiaSearch sepiaSearchVideo, sepiaSearchChannel;
 
     private ActivitySepiaSearchBinding binding;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         binding = ActivitySepiaSearchBinding.inflate(getLayoutInflater());
         View rootView = binding.getRoot();
         setContentView(rootView);

app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java

@@ -1,11 +1,11 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import app.fedilab.fedilabtube.fragment.SettingsFragment;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 /* Copyright 2020 Thomas Schneider
  *
@@ -22,10 +22,12 @@ import app.fedilab.fedilabtube.fragment.SettingsFragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-public class SettingsActivity extends AppCompatActivity {
+public class SettingsActivity extends BaseActivity {
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);

app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,10 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
+
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
@@ -31,7 +35,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
@@ -43,23 +46,22 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.jetbrains.annotations.NotNull;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData;
 import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.AccountsVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
-import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
 
-
-public class ShowAccountActivity extends AppCompatActivity {
+public class ShowAccountActivity extends BaseActivity {
 
 
     private ViewPager mPager;
@@ -70,8 +72,10 @@ public class ShowAccountActivity extends AppCompatActivity {
     private AccountData.Account account;
     private String accountAcct;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_show_account);
         setTitle("");
@@ -217,7 +221,7 @@ public class ShowAccountActivity extends AppCompatActivity {
         account_dn.setText(account.getDisplayName());
 
         manageNotes(account);
-        Helper.loadGiF(ShowAccountActivity.this, account.getAvatar() != null ? account.getAvatar().getPath() : null, account_pp);
+        Helper.loadAvatar(ShowAccountActivity.this, account, account_pp);
     }
 
     @Override

app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,6 +14,15 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
+import static app.fedilab.fedilabtube.activities.MainActivity.TypeOfConnection.SURFING;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.FOLLOW;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.UNFOLLOW;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.CHANNEL;
+import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
+
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
@@ -28,15 +37,12 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -53,14 +59,18 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData;
 import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
+import app.fedilab.fedilabtube.databinding.ActivityShowChannelBinding;
 import app.fedilab.fedilabtube.drawer.OwnAccountsAdapter;
 import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
@@ -69,44 +79,28 @@ import app.fedilab.fedilabtube.viewmodel.RelationshipVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
-import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
-import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.SURFING;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.FOLLOW;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.UNFOLLOW;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.CHANNEL;
-import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
 
+public class ShowChannelActivity extends BaseActivity {
 
-public class ShowChannelActivity extends AppCompatActivity {
-
-
-    private Button account_follow;
-    private ViewPager mPager;
-    private TabLayout tabLayout;
-    private TextView account_note, subscriber_count;
+    
     private Map<String, Boolean> relationship;
-    private ImageView account_pp;
-    private TextView account_dn;
     private Channel channel;
     private action doAction;
     private String channelAcct;
     private boolean sepiaSearch;
     private String peertubeInstance;
+    private ActivityShowChannelBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_show_channel);
+        binding = ActivityShowChannelBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
         setTitle("");
         Bundle b = getIntent().getExtras();
-        account_follow = findViewById(R.id.account_follow);
-        subscriber_count = findViewById(R.id.subscriber_count);
-        account_follow.setEnabled(false);
-        account_pp = findViewById(R.id.account_pp);
-        account_dn = findViewById(R.id.account_dn);
-        account_pp.setBackgroundResource(R.drawable.account_pp_border);
+        binding.accountFollow.setEnabled(false);
+        binding.accountPp.setBackgroundResource(R.drawable.account_pp_border);
         if (b != null) {
             channel = b.getParcelable("channel");
             channelAcct = b.getString("channelId");
@@ -121,40 +115,20 @@ public class ShowChannelActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
 
-        tabLayout = findViewById(R.id.account_tabLayout);
-        account_note = findViewById(R.id.account_note);
-
-
         ChannelsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(ChannelsVM.class);
         viewModel.get(sepiaSearch ? peertubeInstance : null, CHANNEL, channelAcct == null ? channel.getAcct() : channelAcct).observe(ShowChannelActivity.this, this::manageViewAccounts);
         manageChannel();
 
         if (MainActivity.typeOfConnection == MainActivity.TypeOfConnection.SURFING) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                int[][] states = new int[][]{
-                        new int[]{android.R.attr.state_enabled}, // enabled
-                        new int[]{-android.R.attr.state_enabled}, // disabled
-                        new int[]{-android.R.attr.state_checked}, // unchecked
-                        new int[]{android.R.attr.state_pressed}  // pressed
-                };
-
-                int[] colors = new int[]{
-                        ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
-                        ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
-                        ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
-                        ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent())
-                };
-                account_follow.setBackgroundTintList(new ColorStateList(states, colors));
-            }
-            account_follow.setText(getString(R.string.action_follow));
-            account_follow.setEnabled(true);
+            binding.accountFollow.setText(getString(R.string.action_follow));
+            binding.accountFollow.setEnabled(true);
             new Thread(() -> {
                 try {
                     SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                     List<AccountData.Account> accounts = new AccountDAO(ShowChannelActivity.this, db).getAllAccount();
                     runOnUiThread(() -> {
-                        account_follow.setVisibility(View.VISIBLE);
-                        account_follow.setOnClickListener(v -> {
+                        binding.accountFollow.setVisibility(View.VISIBLE);
+                        binding.accountFollow.setOnClickListener(v -> {
                             AlertDialog.Builder builderSingle = new AlertDialog.Builder(ShowChannelActivity.this);
                             builderSingle.setTitle(getString(R.string.list_of_accounts));
                             if (accounts != null && accounts.size() > 0) {
@@ -253,19 +227,17 @@ public class ShowChannelActivity extends AppCompatActivity {
         }
 
         setTitle(channel.getAcct());
-
-
-        mPager = findViewById(R.id.account_viewpager);
-        tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.videos)));
-        mPager.setOffscreenPageLimit(1);
+        
+        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.videos)));
+        binding.accountViewpager.setOffscreenPageLimit(1);
 
 
         PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
-        mPager.setAdapter(mPagerAdapter);
-        ViewGroup.LayoutParams params = tabLayout.getLayoutParams();
+        binding.accountViewpager.setAdapter(mPagerAdapter);
+        ViewGroup.LayoutParams params = binding.accountTabLayout.getLayoutParams();
         params.height = 0;
-        tabLayout.setLayoutParams(params);
-        mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        binding.accountTabLayout.setLayoutParams(params);
+        binding.accountViewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -273,7 +245,7 @@ public class ShowChannelActivity extends AppCompatActivity {
 
             @Override
             public void onPageSelected(int position) {
-                TabLayout.Tab tab = tabLayout.getTabAt(position);
+                TabLayout.Tab tab = binding.accountTabLayout.getTabAt(position);
                 if (tab != null)
                     tab.select();
             }
@@ -284,10 +256,10 @@ public class ShowChannelActivity extends AppCompatActivity {
             }
         });
 
-        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+        binding.accountTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
-                mPager.setCurrentItem(tab.getPosition());
+                binding.accountViewpager.setCurrentItem(tab.getPosition());
             }
 
             @Override
@@ -298,8 +270,8 @@ public class ShowChannelActivity extends AppCompatActivity {
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
                 Fragment fragment = null;
-                if (mPager.getAdapter() != null)
-                    fragment = (Fragment) mPager.getAdapter().instantiateItem(mPager, tab.getPosition());
+                if (binding.accountViewpager.getAdapter() != null)
+                    fragment = (Fragment) binding.accountViewpager.getAdapter().instantiateItem(binding.accountViewpager, tab.getPosition());
                 switch (tab.getPosition()) {
                     case 0:
                         if (fragment != null) {
@@ -317,19 +289,19 @@ public class ShowChannelActivity extends AppCompatActivity {
             }
         });
 
-        account_dn.setText(channel.getDisplayName());
+        binding.accountDn.setText(channel.getDisplayName());
 
 
         manageNotes(channel);
-        Helper.loadGiF(ShowChannelActivity.this, sepiaSearch ? peertubeInstance : null, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, account_pp);
+        Helper.loadAvatar(ShowChannelActivity.this, channel, binding.accountPp);
         //Follow button
         String target = channel.getAcct();
 
-        account_follow.setOnClickListener(v -> {
+        binding.accountFollow.setOnClickListener(v -> {
             if (doAction == action.NOTHING) {
                 Toasty.info(ShowChannelActivity.this, getString(R.string.nothing_to_do), Toast.LENGTH_LONG).show();
             } else if (doAction == action.FOLLOW) {
-                account_follow.setEnabled(false);
+                binding.accountFollow.setEnabled(false);
                 PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
                 viewModel.post(FOLLOW, target, null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(FOLLOW, apiResponse));
             } else if (doAction == action.UNFOLLOW) {
@@ -340,14 +312,14 @@ public class ShowChannelActivity extends AppCompatActivity {
                     unfollowConfirm.setMessage(channel.getAcct());
                     unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
                     unfollowConfirm.setPositiveButton(R.string.yes, (dialog, which) -> {
-                        account_follow.setEnabled(false);
+                        binding.accountFollow.setEnabled(false);
                         PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
                         viewModel.post(UNFOLLOW, target, null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(UNFOLLOW, apiResponse));
                         dialog.dismiss();
                     });
                     unfollowConfirm.show();
                 } else {
-                    account_follow.setEnabled(false);
+                    binding.accountFollow.setEnabled(false);
                     PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
                     viewModel.post(UNFOLLOW, target, null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(UNFOLLOW, apiResponse));
                 }
@@ -376,39 +348,19 @@ public class ShowChannelActivity extends AppCompatActivity {
 
     //Manages the visibility of the button
     private void manageButtonVisibility() {
-        if (relationship == null || MainActivity.typeOfConnection == SURFING)
+        if (relationship == null || MainActivity.typeOfConnection == SURFING || channel == null)
             return;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            int[][] states = new int[][]{
-                    new int[]{android.R.attr.state_enabled}, // enabled
-                    new int[]{-android.R.attr.state_enabled}, // disabled
-                    new int[]{-android.R.attr.state_checked}, // unchecked
-                    new int[]{android.R.attr.state_pressed}  // pressed
-            };
-
-            int[] colors = new int[]{
-                    ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
-                    ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
-                    ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent()),
-                    ContextCompat.getColor(ShowChannelActivity.this, Helper.getColorAccent())
-            };
-            account_follow.setBackgroundTintList(new ColorStateList(states, colors));
-        }
-        account_follow.setEnabled(true);
-
-        boolean isFollowing = relationship.get(channel.getAcct());
-        if (isFollowing) {
-            account_follow.setText(R.string.action_unfollow);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                account_follow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ShowChannelActivity.this, R.color.red_1)));
-            }
+        binding.accountFollow.setEnabled(true);
+        Boolean isFollowing = relationship.get(channel.getAcct());
+        if (isFollowing != null && isFollowing) {
+            binding.accountFollow.setText(R.string.action_unfollow);
+            binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ShowChannelActivity.this, R.color.red_1)));
             doAction = action.UNFOLLOW;
         } else {
-            account_follow.setText(R.string.action_follow);
+            binding.accountFollow.setText(R.string.action_follow);
             doAction = action.FOLLOW;
         }
-        account_follow.setVisibility(View.VISIBLE);
+        binding.accountFollow.setVisibility(View.VISIBLE);
     }
 
 
@@ -457,8 +409,8 @@ public class ShowChannelActivity extends AppCompatActivity {
             if (channel.getOwnerAccount() != null) {
                 this.channel.setOwnerAccount(channel.getOwnerAccount());
             }
-            subscriber_count.setText(getString(R.string.followers_count, Helper.withSuffix(channel.getFollowersCount())));
-            subscriber_count.setVisibility(View.VISIBLE);
+            binding.subscriberCount.setText(getString(R.string.followers_count, Helper.withSuffix(channel.getFollowersCount())));
+            binding.subscriberCount.setVisibility(View.VISIBLE);
             manageNotes(channel);
         }
     }
@@ -471,11 +423,11 @@ public class ShowChannelActivity extends AppCompatActivity {
             else
                 spannableString = new SpannableString(Html.fromHtml(channel.getDescription()));
 
-            account_note.setText(spannableString, TextView.BufferType.SPANNABLE);
-            account_note.setMovementMethod(LinkMovementMethod.getInstance());
-            account_note.setVisibility(View.VISIBLE);
+            binding.accountNote.setText(spannableString, TextView.BufferType.SPANNABLE);
+            binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());
+            binding.accountNote.setVisibility(View.VISIBLE);
         } else {
-            account_note.setVisibility(View.GONE);
+            binding.accountNote.setVisibility(View.GONE);
         }
     }
 

app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,13 +14,14 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.HISTORY;
+
 import android.app.AlertDialog;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -32,24 +33,26 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.databinding.ActivityVideosTimelineBinding;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 
-import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.HISTORY;
 
-
-public class VideosTimelineActivity extends AppCompatActivity {
+public class VideosTimelineActivity extends BaseActivity {
 
     private TimelineVM.TimelineType type;
     private DisplayVideosFragment displayVideosFragment;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
         ActivityVideosTimelineBinding binding = ActivityVideosTimelineBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
         setContentView(mainView);

app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -29,20 +29,22 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
 import org.jetbrains.annotations.NotNull;
 
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.webview.CustomWebview;
 import app.fedilab.fedilabtube.webview.MastalabWebChromeClient;
 import app.fedilab.fedilabtube.webview.MastalabWebViewClient;
 import es.dmoral.toasty.Toasty;
 
 
-public class WebviewActivity extends AppCompatActivity {
+public class WebviewActivity extends BaseActivity {
 
     private String url;
     private boolean peertubeLink;
@@ -52,9 +54,8 @@ public class WebviewActivity extends AppCompatActivity {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
-
-
         setContentView(R.layout.activity_webview);
         Bundle b = getIntent().getExtras();
         if (b != null) {

app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.fedilabtube;
+package app.fedilab.fedilabtube.activities;
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -14,39 +14,44 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 
 import java.net.URL;
 import java.util.regex.Matcher;
 
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.entities.Error;
 import app.fedilab.fedilabtube.client.entities.OauthParams;
 import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.helper.Helper;
-import app.fedilab.fedilabtube.webview.CustomWebview;
-
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
+import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 
-public class WebviewConnectActivity extends AppCompatActivity {
+public class WebviewConnectActivity extends BaseActivity {
 
 
-    private CustomWebview webView;
+    private WebView webView;
     private AlertDialog alert;
     private String clientId, clientSecret;
     private String url;
@@ -68,11 +73,13 @@ public class WebviewConnectActivity extends AppCompatActivity {
         }
     }
 
+
     @SuppressLint("SetJavaScriptEnabled")
     public void onCreate(Bundle savedInstanceState) {
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-
+        WebView.setWebContentsDebuggingEnabled(true);
         setContentView(R.layout.activity_webview_connect);
         Bundle b = getIntent().getExtras();
         if (b != null) {
@@ -87,11 +94,19 @@ public class WebviewConnectActivity extends AppCompatActivity {
         webView = findViewById(R.id.webviewConnect);
         clearCookies(WebviewConnectActivity.this);
         webView.getSettings().setJavaScriptEnabled(true);
-        if (Build.VERSION.SDK_INT >= 21) {
-            CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
-        } else {
-            CookieManager.getInstance().setAcceptCookie(true);
-        }
+        CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
+        webView.getSettings().setUseWideViewPort(true);
+        webView.getSettings().setLoadWithOverviewMode(true);
+        webView.getSettings().setSupportZoom(true);
+        webView.getSettings().setDisplayZoomControls(false);
+        webView.getSettings().setBuiltInZoomControls(true);
+        webView.getSettings().setAllowContentAccess(true);
+        webView.getSettings().setLoadsImagesAutomatically(true);
+        webView.getSettings().setSupportMultipleWindows(false);
+        webView.getSettings().setAppCacheEnabled(true);
+        webView.getSettings().setDatabaseEnabled(true);
+        webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
+        webView.getSettings().setMediaPlaybackRequiresUserGesture(true);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle(R.string.login);
@@ -112,8 +127,63 @@ public class WebviewConnectActivity extends AppCompatActivity {
 
         webView.setWebViewClient(new WebViewClient() {
 
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                super.onPageStarted(view, url, favicon);
+                //Avoid to load first page for academic  instances & openid
+                if (!BuildConfig.full_instances && url.contains("/client")) {
+                    view.stopLoading();
+                }
+            }
 
             @Override
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                if( request.getUrl() != null) {
+                    String url = request.getUrl().toString();
+                    Matcher matcher = Helper.redirectPattern.matcher(url);
+                    if (matcher.find()) {
+                        String externalAuthToken = matcher.group(1);
+                        String username = matcher.group(2);
+                        new Thread(() -> {
+                            try {
+                                OauthParams oauthParams = new OauthParams();
+                                oauthParams.setClient_id(sharedpreferences.getString(Helper.CLIENT_ID, null));
+                                oauthParams.setClient_secret(sharedpreferences.getString(Helper.CLIENT_SECRET, null));
+                                oauthParams.setGrant_type("password");
+                                oauthParams.setScope("upload");
+                                oauthParams.setResponse_type("code");
+                                oauthParams.setUsername(username);
+                                oauthParams.setExternalAuthToken(externalAuthToken);
+                                oauthParams.setPassword(externalAuthToken);
+                                String instance = new URL(url).getHost();
+                                Token token = null;
+                                try {
+                                    token = new RetrofitPeertubeAPI(WebviewConnectActivity.this, instance, null).manageToken(oauthParams);
+                                } catch (Error error) {
+                                    error.printStackTrace();
+                                    Error.displayError(WebviewConnectActivity.this, error);
+                                }
+                                if (token != null) {
+                                    SharedPreferences.Editor editor = sharedpreferences.edit();
+                                    editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token.getAccess_token());
+                                    editor.putString(Helper.PREF_SOFTWARE, null);
+                                    editor.putString(Helper.PREF_REMOTE_INSTANCE, null);
+                                    editor.putString(Helper.PREF_INSTANCE, instance);
+                                    editor.apply();
+                                    updateCredential(WebviewConnectActivity.this, token.getAccess_token(), clientId, clientSecret, token.getRefresh_token(), new URL(url).getHost(), null);
+                                    finish();
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+                        return true;
+                    }
+                }
+                return super.shouldOverrideUrlLoading(view, request);
+            }
+
+           /* @Override
             public void onPageFinished(WebView view, String url) {
                 Matcher matcher = Helper.redirectPattern.matcher(url);
                 if (matcher.find()) {
@@ -135,6 +205,7 @@ public class WebviewConnectActivity extends AppCompatActivity {
                             try {
                                 token = new RetrofitPeertubeAPI(WebviewConnectActivity.this, instance, null).manageToken(oauthParams);
                             } catch (Error error) {
+                                error.printStackTrace();
                                 Error.displayError(WebviewConnectActivity.this, error);
                             }
                             if (token != null) {
@@ -153,7 +224,7 @@ public class WebviewConnectActivity extends AppCompatActivity {
                     }).start();
                 }
                 super.onPageFinished(view, url);
-            }
+            }*/
         });
         webView.loadUrl(url);
 

app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java

@@ -38,6 +38,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -46,7 +48,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import app.fedilab.fedilabtube.BuildConfig;
-import app.fedilab.fedilabtube.MainActivity;
+import app.fedilab.fedilabtube.activities.MainActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.data.AccountData;
 import app.fedilab.fedilabtube.client.data.BlockData;
@@ -97,6 +99,10 @@ import retrofit2.converter.gson.GsonConverterFactory;
 @SuppressWarnings({"unused", "RedundantSuppression", "ConstantConditions"})
 public class RetrofitPeertubeAPI {
 
+    final OkHttpClient okHttpClient = new OkHttpClient.Builder()
+            .readTimeout(60, TimeUnit.SECONDS)
+            .connectTimeout(60, TimeUnit.SECONDS)
+            .build();
     private final String finalUrl;
     private final Context _context;
     private final String instance;
@@ -106,12 +112,6 @@ public class RetrofitPeertubeAPI {
     private Set<String> selection;
 
 
-    final OkHttpClient okHttpClient = new OkHttpClient.Builder()
-            .readTimeout(60, TimeUnit.SECONDS)
-            .connectTimeout(60, TimeUnit.SECONDS)
-            .build();
-
-
     public RetrofitPeertubeAPI(Context context) {
         _context = context;
         instance = HelperInstance.getLiveInstance(context);
@@ -845,16 +845,48 @@ public class RetrofitPeertubeAPI {
             if (response.isSuccessful()) {
                 peertubeInformation.setCategories(response.body());
             } else {
-                Error error = new Error();
-                error.setStatusCode(response.code());
-                if (response.errorBody() != null) {
-                    error.setError(response.errorBody().string());
-                } else {
-                    error.setError(_context.getString(R.string.toast_error));
+                String categoriesStr = Helper.readFileFromAssets(_context, "categories.json");
+                try {
+                    JSONObject obj = new JSONObject(categoriesStr);
+                    Iterator<String> iter = obj.keys();
+                    LinkedHashMap<Integer, String> data = new LinkedHashMap<>();
+                    while (iter.hasNext()) {
+                        String key = iter.next();
+                        try {
+                            String value = (String) obj.get(key);
+                            data.put(Integer.valueOf(key), value);
+                        } catch (JSONException ignored) {}
+                    }
+                    peertubeInformation.setCategories(data);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                    Error error = new Error();
+                    error.setStatusCode(response.code());
+                    if (response.errorBody() != null) {
+                        error.setError(response.errorBody().string());
+                    } else {
+                        error.setError(_context.getString(R.string.toast_error));
+                    }
                 }
+
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            String categoriesStr = Helper.readFileFromAssets(_context, "categories.json");
+            try {
+                JSONObject obj = new JSONObject(categoriesStr);
+                Iterator<String> iter = obj.keys();
+                LinkedHashMap<Integer, String> data = new LinkedHashMap<>();
+                while (iter.hasNext()) {
+                    String key = iter.next();
+                    try {
+                        String value = (String) obj.get(key);
+                        data.put(Integer.valueOf(key), value);
+                    } catch (JSONException ignored) {}
+                }
+                peertubeInformation.setCategories(data);
+            } catch (JSONException e2) {
+                e2.printStackTrace();
+            }
         }
         Call<Map<String, String>> languages = peertubeService.getLanguages();
         try {
@@ -862,16 +894,46 @@ public class RetrofitPeertubeAPI {
             if (response.isSuccessful()) {
                 peertubeInformation.setLanguages(response.body());
             } else {
-                Error error = new Error();
-                error.setStatusCode(response.code());
-                if (response.errorBody() != null) {
-                    error.setError(response.errorBody().string());
-                } else {
-                    error.setError(_context.getString(R.string.toast_error));
+                String languageSrt = Helper.readFileFromAssets(_context, "languages.json");
+                try {
+                    JSONObject obj = new JSONObject(languageSrt);
+                    Iterator<String> iter = obj.keys();
+                    LinkedHashMap<String, String> data = new LinkedHashMap<>();
+                    while (iter.hasNext()) {
+                        String key = iter.next();
+                        try {
+                            String value = (String) obj.get(key);
+                            data.put(key, value);
+                        } catch (JSONException ignored) {}
+                    }
+                    peertubeInformation.setLanguages(data);
+                } catch (JSONException e) {
+                    Error error = new Error();
+                    error.setStatusCode(response.code());
+                    if (response.errorBody() != null) {
+                        error.setError(response.errorBody().string());
+                    } else {
+                        error.setError(_context.getString(R.string.toast_error));
+                    }
                 }
+
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            String languageSrt = Helper.readFileFromAssets(_context, "languages.json");
+            try {
+                JSONObject obj = new JSONObject(languageSrt);
+                Iterator<String> iter = obj.keys();
+                LinkedHashMap<String, String> data = new LinkedHashMap<>();
+                while (iter.hasNext()) {
+                    String key = iter.next();
+                    try {
+                        String value = (String) obj.get(key);
+                        data.put(key, value);
+                    } catch (JSONException ignored) {}
+                }
+                peertubeInformation.setLanguages(data);
+            } catch (JSONException e2) {
+            }
         }
         Call<Map<Integer, String>> privacies = peertubeService.getPrivacies();
         try {

app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java

@@ -229,41 +229,14 @@ public class VideoData {
             if (resolution != null) {
                 for (File file : files) {
                     if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
-                        if (mode == Helper.VIDEO_MODE_MAGNET) {
-                            if (file.getMagnetUri() != null) {
-                                return file.getMagnetUri();
-                            } else {
-                                return file.getFileUrl();
-                            }
-                        } else if (mode == Helper.VIDEO_MODE_TORRENT) {
-                            if (file.getTorrentUrl() != null) {
-                                return file.getTorrentUrl();
-                            } else {
-                                return file.getFileUrl();
-                            }
-                        } else {
-                            return file.getFileUrl();
-                        }
+                        return file.getFileUrl();
                     }
                 }
             }
             File file = Helper.defaultFile(context, files);
+
             if (file != null) {
-                if (mode == Helper.VIDEO_MODE_MAGNET) {
-                    if (file.getMagnetUri() != null) {
-                        return file.getMagnetUri();
-                    } else {
-                        return file.getFileUrl();
-                    }
-                } else if (mode == Helper.VIDEO_MODE_TORRENT) {
-                    if (file.getTorrentUrl() != null) {
-                        return file.getTorrentUrl();
-                    } else {
-                        return file.getFileUrl();
-                    }
-                } else {
-                    return file.getFileUrl();
-                }
+                return file.getFileUrl();
             } else {
                 return null;
             }

app/src/main/java/app/fedilab/fedilabtube/client/entities/AcadInstances.java

@@ -0,0 +1,71 @@
+package app.fedilab.fedilabtube.client.entities;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import app.fedilab.fedilabtube.helper.HelperAcadInstance;
+
+public class AcadInstances {
+
+    private String name;
+    private String url;
+    private boolean openId;
+
+    public static boolean isOpenId(String domain) {
+        List<AcadInstances> instances = getInstances();
+        for (AcadInstances acadInstance : instances) {
+            if (acadInstance.getUrl().compareTo(domain) == 0) {
+                return acadInstance.isOpenId();
+            }
+        }
+        return false;
+    }
+
+    public static List<AcadInstances> getInstances() {
+        List<AcadInstances> acadInstances = new ArrayList<>();
+
+        LinkedHashMap<String, String> instancesMap = new LinkedHashMap<>(HelperAcadInstance.instances_themes);
+        Iterator<Map.Entry<String, String>> it = instancesMap.entrySet().iterator();
+        while (it.hasNext()) {
+            Map.Entry<String, String> pair = it.next();
+            AcadInstances acadInstance = new AcadInstances();
+            acadInstance.name = pair.getKey();
+            acadInstance.openId = true;
+            acadInstance.url = pair.getValue();
+            acadInstances.add(acadInstance);
+            it.remove();
+        }
+        return acadInstances;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public boolean isOpenId() {
+        return openId;
+    }
+
+}

app/src/main/java/app/fedilab/fedilabtube/client/mastodon/MastodonAccount.java

@@ -29,6 +29,18 @@ import app.fedilab.fedilabtube.client.entities.Avatar;
 public class MastodonAccount {
 
 
+    public static AccountData.Account convertToPeertubeAccount(MastodonAccount.Account initialAccount) {
+        AccountData.Account account = new AccountData.Account();
+        Avatar avatar = new Avatar();
+        avatar.setPath(initialAccount.getAvatar());
+        account.setAvatar(avatar);
+        account.setDescription(initialAccount.getDescription());
+        account.setDisplayName(initialAccount.getDisplayName());
+        account.setUsername(initialAccount.getUsername());
+        account.setHost(initialAccount.getHost());
+        return account;
+    }
+
     public static class Account implements Parcelable {
         public static final Creator<Account> CREATOR = new Creator<Account>() {
             @Override
@@ -240,16 +252,4 @@ public class MastodonAccount {
             dest.writeString(this.url);
         }
     }
-
-    public static AccountData.Account convertToPeertubeAccount(MastodonAccount.Account initialAccount) {
-        AccountData.Account account = new AccountData.Account();
-        Avatar avatar = new Avatar();
-        avatar.setPath(initialAccount.getAvatar());
-        account.setAvatar(avatar);
-        account.setDescription(initialAccount.getDescription());
-        account.setDisplayName(initialAccount.getDisplayName());
-        account.setUsername(initialAccount.getUsername());
-        account.setHost(initialAccount.getHost());
-        return account;
-    }
 }

app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java

@@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.concurrent.TimeUnit;
 
-import app.fedilab.fedilabtube.MainActivity;
+import app.fedilab.fedilabtube.activities.MainActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.entities.Error;
@@ -45,17 +45,33 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class RetrofitMastodonAPI {
 
+    final OkHttpClient okHttpClient = new OkHttpClient.Builder()
+            .readTimeout(60, TimeUnit.SECONDS)
+            .connectTimeout(60, TimeUnit.SECONDS)
+            .build();
     private final String finalUrl;
     private final String finalUrl2;
     private final Context _context;
     private String instance;
     private String token;
 
+    public RetrofitMastodonAPI(Context context) {
+        _context = context;
+        SharedPreferences sharedpreferences = _context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        this.instance = sharedpreferences.getString(Helper.PREF_REMOTE_INSTANCE, null);
+        this.token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
+        finalUrl = "https://" + this.instance + "/api/v1/";
+        finalUrl2 = "https://" + this.instance + "/api/v2/";
+    }
 
-    final OkHttpClient okHttpClient = new OkHttpClient.Builder()
-            .readTimeout(60, TimeUnit.SECONDS)
-            .connectTimeout(60, TimeUnit.SECONDS)
-            .build();
+
+    public RetrofitMastodonAPI(Context context, String instance, String token) {
+        _context = context;
+        this.instance = instance;
+        this.token = token;
+        finalUrl = "https://" + instance + "/api/v1/";
+        finalUrl2 = "https://" + this.instance + "/api/v2/";
+    }
 
     public Status search(String url) throws Error {
         MastodonService mastodonService2 = init2();
@@ -81,24 +97,6 @@ public class RetrofitMastodonAPI {
         return null;
     }
 
-
-    public RetrofitMastodonAPI(Context context) {
-        _context = context;
-        SharedPreferences sharedpreferences = _context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        this.instance = sharedpreferences.getString(Helper.PREF_REMOTE_INSTANCE, null);
-        this.token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-        finalUrl = "https://" + this.instance + "/api/v1/";
-        finalUrl2 = "https://" + this.instance + "/api/v2/";
-    }
-
-    public RetrofitMastodonAPI(Context context, String instance, String token) {
-        _context = context;
-        this.instance = instance;
-        this.token = token;
-        finalUrl = "https://" + instance + "/api/v1/";
-        finalUrl2 = "https://" + this.instance + "/api/v2/";
-    }
-
     public void updateCredential(Activity activity, String client_id, String client_secret, String refresh_token, String software) {
         new Thread(() -> {
             MastodonAccount.Account account;
@@ -340,6 +338,13 @@ public class RetrofitMastodonAPI {
         return null;
     }
 
+    private String getToken() {
+        if (token != null) {
+            return "Bearer " + token;
+        } else {
+            return null;
+        }
+    }
 
     public enum actionType {
         BOOST,
@@ -349,12 +354,4 @@ public class RetrofitMastodonAPI {
         BOOKMARK,
         UNBOOKMARK
     }
-
-    private String getToken() {
-        if (token != null) {
-            return "Bearer " + token;
-        } else {
-            return null;
-        }
-    }
 }

app/src/main/java/app/fedilab/fedilabtube/drawer/AboutInstanceAdapter.java

@@ -15,6 +15,8 @@ package app.fedilab.fedilabtube.drawer;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -45,8 +47,6 @@ import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.sqlite.StoredInstanceDAO;
 
-import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
-
 
 public class AboutInstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 

app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsHorizontalListAdapter.java

@@ -62,10 +62,9 @@ public class AccountsHorizontalListAdapter extends RecyclerView.Adapter<Recycler
             holder.binding.accountDn.setText(channel.getName().replace("@", ""));
 
         //Profile picture
-        Helper.loadGiF(context, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, holder.binding.accountPp, 270);
-
+        Helper.loadAvatar(context, channel, holder.binding.accountPp);
         if (channel.isSelected()) {
-            holder.binding.mainContainer.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, Helper.getColorAccent()), 50));
+            holder.binding.mainContainer.setBackgroundColor(ColorUtils.setAlphaComponent(Helper.fetchAccentColor(context), 50));
         } else {
             holder.binding.mainContainer.setBackgroundColor(Color.TRANSPARENT);
         }

app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java

@@ -36,7 +36,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import java.util.List;
 
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.ShowAccountActivity;
+import app.fedilab.fedilabtube.activities.ShowAccountActivity;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData.Account;
@@ -86,7 +86,7 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             account.setDescription("");
         }
         //Profile picture
-        Helper.loadGiF(context, account.getAvatar() != null ? account.getAvatar().getPath() : null, holder.account_pp);
+        Helper.loadAvatar(context, account, holder.account_pp);
         //Follow button
         if (type == RetrofitPeertubeAPI.DataType.MUTED) {
             holder.account_action.show();

app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java

@@ -35,9 +35,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
 
-import app.fedilab.fedilabtube.AccountActivity;
+import app.fedilab.fedilabtube.activities.AccountActivity;
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.ShowChannelActivity;
+import app.fedilab.fedilabtube.activities.ShowChannelActivity;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
 import app.fedilab.fedilabtube.helper.Helper;
@@ -74,7 +74,7 @@ public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         }
 
         //Profile picture
-        Helper.loadGiF(context, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, holder.account_pp);
+        Helper.loadAvatar(context, channel, holder.account_pp);
 
         if (!isMyChannel(channel)) {
             holder.more_actions.setVisibility(View.GONE);

app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java

@@ -14,6 +14,9 @@ package app.fedilab.fedilabtube.drawer;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPLY;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -50,9 +53,9 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import app.fedilab.fedilabtube.PeertubeActivity;
+import app.fedilab.fedilabtube.activities.PeertubeActivity;
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.ShowAccountActivity;
+import app.fedilab.fedilabtube.activities.ShowAccountActivity;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.CommentData.Comment;
@@ -64,9 +67,6 @@ import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.MUTE;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPLY;
-
 
 public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -275,18 +275,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
         holder.binding.commentDate.setText(Helper.dateDiff(context, comment.getCreatedAt()));
 
-        String avatarUrl;
-        if (instance != null) {
-            if (comment.getAccount().getAvatar() != null && comment.getAccount().getAvatar().getPath().startsWith("http")) {
-                avatarUrl = comment.getAccount().getAvatar().getPath();
-            } else {
-                avatarUrl = comment.getAccount().getAvatar() != null ? "https://" + instance + comment.getAccount().getAvatar().getPath() : null;
-            }
-        } else {
-            avatarUrl = comment.getAccount().getAvatar() != null ? comment.getAccount().getAvatar().getPath() : null;
-        }
-        Helper.loadGiF(context, avatarUrl, holder.binding.commentAccountProfile);
-
+        Helper.loadAvatar(context, comment.getAccount(), holder.binding.commentAccountProfile);
         holder.binding.commentAccountProfile.setOnClickListener(v -> {
             Bundle b = new Bundle();
             Intent intent = new Intent(context, ShowAccountActivity.class);

app/src/main/java/app/fedilab/fedilabtube/drawer/InstanceAdapter.java

@@ -15,6 +15,10 @@ package app.fedilab.fedilabtube.drawer;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static android.app.Activity.RESULT_OK;
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -41,10 +45,6 @@ import app.fedilab.fedilabtube.client.data.InstanceData.Instance;
 import app.fedilab.fedilabtube.databinding.DrawerInstanceBinding;
 import app.fedilab.fedilabtube.helper.RoundedBackgroundSpan;
 
-import static android.app.Activity.RESULT_OK;
-import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
-
 
 public class InstanceAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 

app/src/main/java/app/fedilab/fedilabtube/drawer/OwnAccountsAdapter.java

@@ -79,12 +79,7 @@ public class OwnAccountsAdapter extends ArrayAdapter<Account> {
 
         holder.account_un.setText(String.format("@%s", account.getAcct()));
         //Profile picture
-        if (account.getAvatar() != null && account.getAvatar().getPath().startsWith("http")) {
-            Helper.loadGiF(holder.account_pp.getContext(), account.getAvatar().getPath(), holder.account_pp);
-        } else {
-            Helper.loadGiF(holder.account_pp.getContext(), "https://" + account.getHost() + account.getAvatar().getPath(), holder.account_pp);
-        }
-
+        Helper.loadAvatar(holder.account_pp.getContext(), account, holder.account_pp);
         return convertView;
     }
 

app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java

@@ -14,6 +14,11 @@ package app.fedilab.fedilabtube.drawer;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.FOLLOW;
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.UNFOLLOW;
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.MY_VIDEOS;
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.SEPIA_SEARCH;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -49,10 +54,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import app.fedilab.fedilabtube.PeertubeActivity;
-import app.fedilab.fedilabtube.PeertubeEditUploadActivity;
+import app.fedilab.fedilabtube.activities.PeertubeActivity;
+import app.fedilab.fedilabtube.activities.PeertubeEditUploadActivity;
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.ShowChannelActivity;
+import app.fedilab.fedilabtube.activities.ShowChannelActivity;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData;
@@ -70,11 +75,6 @@ import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.FOLLOW;
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.UNFOLLOW;
-import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.MY_VIDEOS;
-import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.SEPIA_SEARCH;
-
 
 public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -144,8 +144,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
 
         holder.binding.peertubeAccountName.setText(video.getChannel().getAcct());
-        Helper.loadGiF(context, instance, video.getChannel().getAvatar() != null ? video.getChannel().getAvatar().getPath() : null, holder.binding.peertubeProfile);
-
+        Helper.loadAvatar(context, video.getChannel(), holder.binding.peertubeProfile);
         holder.binding.peertubeTitle.setText(video.getName());
         if (video.isLive()) {
             holder.binding.peertubeDuration.setText(R.string.live);

app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java

@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube.drawer;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.MainActivity.badgeCount;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -31,11 +33,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
 
-import app.fedilab.fedilabtube.AccountActivity;
-import app.fedilab.fedilabtube.PeertubeActivity;
+import app.fedilab.fedilabtube.activities.AccountActivity;
+import app.fedilab.fedilabtube.activities.PeertubeActivity;
 import app.fedilab.fedilabtube.R;
-import app.fedilab.fedilabtube.ShowAccountActivity;
-import app.fedilab.fedilabtube.ShowChannelActivity;
+import app.fedilab.fedilabtube.activities.ShowAccountActivity;
+import app.fedilab.fedilabtube.activities.ShowChannelActivity;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData;
 import app.fedilab.fedilabtube.client.data.ChannelData;
@@ -45,8 +47,6 @@ import app.fedilab.fedilabtube.fragment.DisplayNotificationsFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 
-import static app.fedilab.fedilabtube.MainActivity.badgeCount;
-
 
 public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -104,8 +104,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
             accountAction.setUsername(actor.getName());
             holder.peertube_notif_message.setOnClickListener(v -> markAsRead(notification, position));
         } else if (notification.getComment() != null) { //Comment Notification
-            String profileUrl = notification.getComment().getAccount().getAvatar() != null ? notification.getComment().getAccount().getAvatar().getPath() : null;
-            Helper.loadGiF(context, profileUrl, holder.peertube_notif_pp);
+            Helper.loadAvatar(context, notification.getComment().getAccount(), holder.peertube_notif_pp);
             accountAction = notification.getComment().getAccount();
             String message = context.getString(R.string.peertube_comment_on_video, accountAction.getDisplayName(), accountAction.getUsername());
 

app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java

@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube.drawer;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.viewmodel.PlaylistsVM.action.GET_LIST_VIDEOS;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -52,11 +54,11 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import app.fedilab.fedilabtube.AllPlaylistsActivity;
+import app.fedilab.fedilabtube.activities.AllPlaylistsActivity;
 import app.fedilab.fedilabtube.BuildConfig;
-import app.fedilab.fedilabtube.LocalPlaylistsActivity;
-import app.fedilab.fedilabtube.MainActivity;
-import app.fedilab.fedilabtube.PlaylistsActivity;
+import app.fedilab.fedilabtube.activities.LocalPlaylistsActivity;
+import app.fedilab.fedilabtube.activities.MainActivity;
+import app.fedilab.fedilabtube.activities.PlaylistsActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
@@ -72,8 +74,6 @@ import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.viewmodel.PlaylistsVM.action.GET_LIST_VIDEOS;
-
 
 public class PlaylistAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -205,7 +205,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private void doExport(Playlist playlist) {
         new Thread(() -> {
-            File file = null;
+            File file;
             RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(context);
             APIResponse apiResponse = retrofitPeertubeAPI.playlistAction(GET_LIST_VIDEOS, playlist.getId(), null, null, null);
             if (apiResponse != null) {
@@ -219,12 +219,14 @@ public class PlaylistAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 String data = PlaylistExportHelper.playlistToStringStorage(videoPlaylistExport);
 
 
-                File root = new File(Environment.getExternalStorageDirectory(), context.getString(R.string.app_name));
+                File root = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"");
+
                 if (!root.exists()) {
                     //noinspection ResultOfMethodCallIgnored
                     root.mkdirs();
                 }
-                file = new File(root, "playlist_" + playlist.getUuid() + ".tubelab");
+                String fileName = "playlist_" + playlist.getUuid() + ".tubelab";
+                file = new File(root, fileName);
                 FileWriter writer;
                 try {
                     writer = new FileWriter(file);
@@ -238,33 +240,29 @@ public class PlaylistAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     mainHandler.post(myRunnable);
                     return;
                 }
-
-
-            }
-            String urlAvatar = playlist.getThumbnailPath() != null ? HelperInstance.getLiveInstance(context) + playlist.getThumbnailPath() : null;
-            FutureTarget<Bitmap> futureBitmapChannel = Glide.with(context.getApplicationContext())
-                    .asBitmap()
-                    .load(urlAvatar != null ? urlAvatar : R.drawable.missing_peertube).submit();
-            Bitmap icon = null;
-            try {
-                icon = futureBitmapChannel.get();
-            } catch (ExecutionException | InterruptedException e) {
-                e.printStackTrace();
-            }
-            if (file != null) {
+                String urlAvatar = playlist.getThumbnailPath() != null ? HelperInstance.getLiveInstance(context) + playlist.getThumbnailPath() : null;
+                FutureTarget<Bitmap> futureBitmapChannel = Glide.with(context.getApplicationContext())
+                        .asBitmap()
+                        .load(urlAvatar != null ? urlAvatar : R.drawable.missing_peertube).submit();
+                Bitmap icon = null;
+                try {
+                    icon = futureBitmapChannel.get();
+                } catch (ExecutionException | InterruptedException e) {
+                    e.printStackTrace();
+                }
                 Intent mailIntent = new Intent(Intent.ACTION_SEND);
                 mailIntent.setType("message/rfc822");
-                Uri contentUri = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".fileProvider", file);
+                Uri contentUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileProvider", file);
                 mailIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.export_notification_subjet));
                 mailIntent.putExtra(Intent.EXTRA_TEXT, context.getString(R.string.export_notification_body));
                 mailIntent.putExtra(Intent.EXTRA_STREAM, contentUri);
+                mailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                 NotificationHelper.notify_user(context.getApplicationContext(),
                         playlist.getOwnerAccount(), mailIntent, icon,
                         context.getString(R.string.export_notification_title),
                         context.getString(R.string.export_notification_content));
             }
 
-
         }).start();
     }
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java

@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube.fragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
@@ -63,8 +65,6 @@ import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.SearchVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
-
 
 public class DisplayChannelsFragment extends Fragment implements ChannelListAdapter.AllChannelRemoved, ChannelListAdapter.EditAlertDialog {
 
@@ -277,15 +277,7 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
             intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
             startActivityForResult(intent, PICK_AVATAR);
         });
-        if (position >= 0) {
-            Helper.loadGiF(context, channels.get(position).getAvatar() != null ? channels.get(position).getAvatar().getPath() : null, bindingDialog.profilePicture);
-        } else {
-            Glide.with(context)
-                    .load(R.drawable.missing_peertube)
-                    .thumbnail(0.1f)
-                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
-                    .into(bindingDialog.profilePicture);
-        }
+        Helper.loadAvatar(context, channels.get(position), bindingDialog.profilePicture);
         int finalPosition = position;
         alertDialog.setOnShowListener(dialogInterface -> {
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayOverviewFragment.java

@@ -14,6 +14,10 @@ package app.fedilab.fedilabtube.fragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.data.VideoData.Video.titleType.CATEGORY;
+import static app.fedilab.fedilabtube.client.data.VideoData.Video.titleType.CHANNEL;
+import static app.fedilab.fedilabtube.client.data.VideoData.Video.titleType.TAG;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -52,10 +56,6 @@ import app.fedilab.fedilabtube.viewmodel.RelationshipVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.client.data.VideoData.Video.titleType.CATEGORY;
-import static app.fedilab.fedilabtube.client.data.VideoData.Video.titleType.CHANNEL;
-import static app.fedilab.fedilabtube.client.data.VideoData.Video.titleType.TAG;
-
 
 public class DisplayOverviewFragment extends Fragment implements PeertubeAdapter.RelationShipListener, PeertubeAdapter.PlaylistListener {
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java

@@ -14,6 +14,9 @@ package app.fedilab.fedilabtube.fragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -51,7 +54,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import app.fedilab.fedilabtube.PlaylistsActivity;
+import app.fedilab.fedilabtube.activities.PlaylistsActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
@@ -64,9 +67,6 @@ import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
-import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
-
 
 public class DisplayPlaylistsFragment extends Fragment {
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplaySepiaSearchFragment.java

@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube.fragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.SEPIA_SEARCH;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Rect;
@@ -49,8 +51,6 @@ import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.SepiaSearchVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.SEPIA_SEARCH;
-
 
 public class DisplaySepiaSearchFragment extends Fragment implements AccountsHorizontalListAdapter.EventListener {
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java

@@ -14,6 +14,8 @@ package app.fedilab.fedilabtube.fragment;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.VIDEOS_IN_LOCAL_PLAYLIST;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Rect;
@@ -42,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 import app.fedilab.fedilabtube.BuildConfig;
-import app.fedilab.fedilabtube.MainActivity;
+import app.fedilab.fedilabtube.activities.MainActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
@@ -62,8 +64,6 @@ import app.fedilab.fedilabtube.viewmodel.SearchVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.VIDEOS_IN_LOCAL_PLAYLIST;
-
 
 public class DisplayVideosFragment extends Fragment implements AccountsHorizontalListAdapter.EventListener, PeertubeAdapter.RelationShipListener, PeertubeAdapter.PlaylistListener {
 
@@ -259,11 +259,9 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
     @Override
     public void onPause() {
         super.onPause();
-        if (binding.swipeContainer != null) {
-            binding.swipeContainer.setEnabled(false);
-            binding.swipeContainer.setRefreshing(false);
-            binding.swipeContainer.clearAnimation();
-        }
+        binding.swipeContainer.setEnabled(false);
+        binding.swipeContainer.setRefreshing(false);
+        binding.swipeContainer.clearAnimation();
         if (getActivity() != null) {
             InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
             if (imm != null && getView() != null) {
@@ -431,7 +429,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
     }
 
     public void manageVIewRelationship(APIResponse apiResponse) {
-        if (apiResponse.getError() != null) {
+        if (apiResponse.getError() != null || apiResponse.getRelationships() == null) {
             return;
         }
         if (relationship == null) {

app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java

@@ -1,10 +1,13 @@
 package app.fedilab.fedilabtube.fragment;
 
+import static app.fedilab.fedilabtube.activities.MainActivity.userMe;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -22,6 +25,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.SeekBarPreference;
 import androidx.preference.SwitchPreference;
 
+import com.avatarfirst.avatargenlib.AvatarGenerator;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
@@ -34,8 +38,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import app.fedilab.fedilabtube.MainActivity;
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.activities.MainActivity;
 import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.activities.MyAccountActivity;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.entities.Error;
 import app.fedilab.fedilabtube.client.entities.UserSettings;
@@ -44,8 +50,6 @@ import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.ThemeHelper;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.MainActivity.userMe;
-
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -88,226 +92,240 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
 
-        if (getActivity() != null) {
-            SharedPreferences sharedpreferences = getActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = sharedpreferences.edit();
+        requireActivity();
+        SharedPreferences sharedpreferences = requireActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedpreferences.edit();
 
-            if (key.compareTo(getString(R.string.set_video_mode_choice)) == 0) {
-                ListPreference set_video_mode_choice = findPreference(getString(R.string.set_video_mode_choice));
-                if (set_video_mode_choice != null) {
-                    switch (set_video_mode_choice.getValue()) {
-                        case "0":
-                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL);
-                            break;
-                        case "1":
-                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_MAGNET);
-                            break;
-                        case "2":
-                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_WEBVIEW);
-                            break;
-                        case "3":
-                            editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_TORRENT);
-                            break;
-                    }
+        if (key.compareTo(getString(R.string.set_video_mode_choice)) == 0) {
+            ListPreference set_video_mode_choice = findPreference(getString(R.string.set_video_mode_choice));
+            if (set_video_mode_choice != null) {
+                switch (set_video_mode_choice.getValue()) {
+                    case "0":
+                        editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL);
+                        break;
+                    case "1":
+                        editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_MAGNET);
+                        break;
+                    case "2":
+                        editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_WEBVIEW);
+                        break;
+                    case "3":
+                        editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_TORRENT);
+                        break;
+                }
 
-                }
             }
-            if (key.compareTo(getString(R.string.set_theme_choice)) == 0) {
-                ListPreference set_theme_choice = findPreference(getString(R.string.set_theme_choice));
-                if (set_theme_choice != null) {
-                    int choice;
-                    switch (set_theme_choice.getValue()) {
-                        case "0":
-                            choice = Helper.LIGHT_MODE;
-                            break;
-                        case "1":
-                            choice = Helper.DARK_MODE;
-                            break;
-                        default:
-                            choice = Helper.DEFAULT_MODE;
-                    }
-                    editor.putInt(Helper.SET_THEME, choice);
-                    editor.apply();
-                    ThemeHelper.switchTo(choice);
-                }
-            }
-            if (key.compareTo(getString(R.string.set_video_sensitive_choice)) == 0) {
-                ListPreference set_video_sensitive_choice = findPreference(getString(R.string.set_video_sensitive_choice));
-                if (set_video_sensitive_choice != null) {
-                    editor.putString(getString(R.string.set_video_sensitive_choice), set_video_sensitive_choice.getValue());
-                    editor.apply();
-                    if (Helper.isLoggedIn(getActivity())) {
-                        new Thread(() -> {
-                            UserSettings userSettings = new UserSettings();
-                            userSettings.setNsfwPolicy(set_video_sensitive_choice.getValue());
-                            try {
-                                RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
-                                api.updateUser(userSettings);
-                                userMe.setNsfwPolicy(set_video_sensitive_choice.getValue());
-                            } catch (Exception | Error e) {
-                                e.printStackTrace();
-                            }
-                        }).start();
-                    }
-                }
-            }
-            if (key.compareTo(getString(R.string.set_video_quality_choice)) == 0) {
-                ListPreference set_video_quality_choice = findPreference(getString(R.string.set_video_quality_choice));
-                if (set_video_quality_choice != null) {
-                    switch (set_video_quality_choice.getValue()) {
-                        case "0":
-                            editor.putInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_HIGH);
-                            break;
-                        case "1":
-                            editor.putInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_MEDIUM);
-                            break;
-                        case "2":
-                            editor.putInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_LOW);
-                            break;
-                    }
-                }
-            }
-            if (key.compareTo(getString(R.string.set_video_cache_choice)) == 0) {
-                SeekBarPreference set_video_cache_choice = findPreference(getString(R.string.set_video_cache_choice));
-                assert set_video_cache_choice != null;
-                final int progress = set_video_cache_choice.getValue();
-                set_video_cache_choice.setSummary(getActivity().getString(R.string.video_cache_value, progress * 10));
-                editor.putInt(Helper.SET_VIDEO_CACHE, progress * 10);
-            }
-            if (key.compareTo(getString(R.string.set_video_minimize_choice)) == 0) {
-                SwitchPreference set_video_minimize_choice = findPreference(
-
-
-                        getString(R.string.set_video_minimize_choice));
-                assert set_video_minimize_choice != null;
-                editor.putBoolean(getString(R.string.set_video_minimize_choice), set_video_minimize_choice.isChecked());
-            }
-            if (key.compareTo(getString(R.string.set_autoplay_choice)) == 0) {
-                SwitchPreference set_autoplay_choice = findPreference(getString(R.string.set_autoplay_choice));
-                assert set_autoplay_choice != null;
-                editor.putBoolean(getString(R.string.set_autoplay_choice), set_autoplay_choice.isChecked());
-                if (Helper.isLoggedIn(getActivity())) {
-                    new Thread(() -> {
-                        UserSettings userSettings = new UserSettings();
-                        userSettings.setAutoPlayVideo(set_autoplay_choice.isChecked());
-                        try {
-                            RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
-                            api.updateUser(userSettings);
-                        } catch (Exception | Error e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
-                }
-            }
-            if (key.compareTo(getString(R.string.set_fullscreen_choice)) == 0) {
-                SwitchPreference set_fullscreen_choice = findPreference(getString(R.string.set_fullscreen_choice));
-                assert set_fullscreen_choice != null;
-                editor.putBoolean(getString(R.string.set_fullscreen_choice), set_fullscreen_choice.isChecked());
-            }
-            if (key.compareTo(getString(R.string.set_autoplay_next_video_choice)) == 0) {
-                SwitchPreference set_autoplay_next_video_choice = findPreference(getString(R.string.set_autoplay_next_video_choice));
-                assert set_autoplay_next_video_choice != null;
-                editor.putBoolean(getString(R.string.set_autoplay_next_video_choice), set_autoplay_next_video_choice.isChecked());
-                if (Helper.isLoggedIn(getActivity())) {
-                    new Thread(() -> {
-                        UserSettings userSettings = new UserSettings();
-                        userSettings.setAutoPlayNextVideo(set_autoplay_next_video_choice.isChecked());
-                        try {
-                            RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
-                            api.updateUser(userSettings);
-                        } catch (Exception | Error e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
-                }
-            }
-            if (key.compareTo(getString(R.string.set_play_screen_lock_choice)) == 0) {
-                SwitchPreference set_play_screen_lock_choice = findPreference(getString(R.string.set_play_screen_lock_choice));
-                assert set_play_screen_lock_choice != null;
-                editor.putBoolean(getString(R.string.set_play_screen_lock_choice), set_play_screen_lock_choice.isChecked());
-            }
-            if (key.compareTo(getString(R.string.set_video_in_list_choice)) == 0) {
-                SwitchPreference set_video_in_list_choice = findPreference(getString(R.string.set_video_in_list_choice));
-                assert set_video_in_list_choice != null;
-                editor.putBoolean(getString(R.string.set_video_in_list_choice), set_video_in_list_choice.isChecked());
-                Intent intent = new Intent(getActivity(), MainActivity.class);
-                startActivity(intent);
-            }
-            if (key.compareTo(getString(R.string.set_cast_choice)) == 0) {
-                SwitchPreference set_cast_choice = findPreference(getString(R.string.set_cast_choice));
-                assert set_cast_choice != null;
-                editor.putInt(getString(R.string.set_cast_choice), set_cast_choice.isChecked() ? 1 : 0);
-                Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
-                Bundle b = new Bundle();
-                b.putInt("state_asked", set_cast_choice.isChecked() ? 1 : 0);
-                intentBC.putExtras(b);
-                LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(intentBC);
-            }
-            if (key.compareTo(getString(R.string.set_video_language_choice)) == 0) {
-                MultiSelectListPreference set_video_language_choice = findPreference(getString(R.string.set_video_language_choice));
-                assert set_video_language_choice != null;
-                editor.putStringSet(getString(R.string.set_video_language_choice), set_video_language_choice.getValues());
-                if (Helper.isLoggedIn(getActivity())) {
-                    new Thread(() -> {
-                        UserSettings userSettings = new UserSettings();
-                        Set<String> language_choiceValues = set_video_language_choice.getValues();
-                        userSettings.setVideoLanguages(new ArrayList<>(language_choiceValues));
-                        try {
-                            RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
-                            api.updateUser(userSettings);
-                        } catch (Exception | Error e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
-                }
-            }
-            editor.apply();
         }
+        if (key.compareTo(getString(R.string.set_theme_choice)) == 0) {
+            ListPreference set_theme_choice = findPreference(getString(R.string.set_theme_choice));
+            if (set_theme_choice != null) {
+                int choice;
+                switch (set_theme_choice.getValue()) {
+                    case "0":
+                        choice = Helper.LIGHT_MODE;
+                        break;
+                    case "1":
+                        choice = Helper.DARK_MODE;
+                        break;
+                    default:
+                        choice = Helper.DEFAULT_MODE;
+                }
+                editor.putInt(Helper.SET_THEME, choice);
+                editor.apply();
+                ThemeHelper.switchTo(choice);
+            }
+        }
+        if (key.compareTo(getString(R.string.set_video_sensitive_choice)) == 0) {
+            ListPreference set_video_sensitive_choice = findPreference(getString(R.string.set_video_sensitive_choice));
+            if (set_video_sensitive_choice != null) {
+                editor.putString(getString(R.string.set_video_sensitive_choice), set_video_sensitive_choice.getValue());
+                editor.apply();
+                if (Helper.isLoggedIn(getActivity())) {
+                    new Thread(() -> {
+                        UserSettings userSettings = new UserSettings();
+                        userSettings.setNsfwPolicy(set_video_sensitive_choice.getValue());
+                        try {
+                            RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
+                            api.updateUser(userSettings);
+                            userMe.setNsfwPolicy(set_video_sensitive_choice.getValue());
+                        } catch (Exception | Error e) {
+                            e.printStackTrace();
+                        }
+                    }).start();
+                }
+            }
+        }
+        if (key.compareTo(getString(R.string.set_video_quality_choice)) == 0) {
+            ListPreference set_video_quality_choice = findPreference(getString(R.string.set_video_quality_choice));
+            if (set_video_quality_choice != null) {
+                switch (set_video_quality_choice.getValue()) {
+                    case "0":
+                        editor.putInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_HIGH);
+                        break;
+                    case "1":
+                        editor.putInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_MEDIUM);
+                        break;
+                    case "2":
+                        editor.putInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_LOW);
+                        break;
+                }
+            }
+        }
+        if (key.compareTo(getString(R.string.set_video_cache_choice)) == 0) {
+            SeekBarPreference set_video_cache_choice = findPreference(getString(R.string.set_video_cache_choice));
+            assert set_video_cache_choice != null;
+            final int progress = set_video_cache_choice.getValue();
+            set_video_cache_choice.setSummary(requireActivity().getString(R.string.video_cache_value, progress * 10));
+            editor.putInt(Helper.SET_VIDEO_CACHE, progress * 10);
+        }
+        if (key.compareTo(getString(R.string.set_video_minimize_choice)) == 0) {
+            SwitchPreference set_video_minimize_choice = findPreference(
+
+
+                    getString(R.string.set_video_minimize_choice));
+            assert set_video_minimize_choice != null;
+            editor.putBoolean(getString(R.string.set_video_minimize_choice), set_video_minimize_choice.isChecked());
+        }
+        if (key.compareTo(getString(R.string.set_autoplay_choice)) == 0) {
+            SwitchPreference set_autoplay_choice = findPreference(getString(R.string.set_autoplay_choice));
+            assert set_autoplay_choice != null;
+            editor.putBoolean(getString(R.string.set_autoplay_choice), set_autoplay_choice.isChecked());
+            if (Helper.isLoggedIn(getActivity())) {
+                new Thread(() -> {
+                    UserSettings userSettings = new UserSettings();
+                    userSettings.setAutoPlayVideo(set_autoplay_choice.isChecked());
+                    try {
+                        RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
+                        api.updateUser(userSettings);
+                    } catch (Exception | Error e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+            }
+        }
+        if (key.compareTo(getString(R.string.set_fullscreen_choice)) == 0) {
+            SwitchPreference set_fullscreen_choice = findPreference(getString(R.string.set_fullscreen_choice));
+            assert set_fullscreen_choice != null;
+            editor.putBoolean(getString(R.string.set_fullscreen_choice), set_fullscreen_choice.isChecked());
+        }
+        if (key.compareTo(getString(R.string.set_autoplay_next_video_choice)) == 0) {
+            SwitchPreference set_autoplay_next_video_choice = findPreference(getString(R.string.set_autoplay_next_video_choice));
+            assert set_autoplay_next_video_choice != null;
+            editor.putBoolean(getString(R.string.set_autoplay_next_video_choice), set_autoplay_next_video_choice.isChecked());
+            if (Helper.isLoggedIn(getActivity())) {
+                new Thread(() -> {
+                    UserSettings userSettings = new UserSettings();
+                    userSettings.setAutoPlayNextVideo(set_autoplay_next_video_choice.isChecked());
+                    try {
+                        RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
+                        api.updateUser(userSettings);
+                    } catch (Exception | Error e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+            }
+        }
+        if (key.compareTo(getString(R.string.set_play_screen_lock_choice)) == 0) {
+            SwitchPreference set_play_screen_lock_choice = findPreference(getString(R.string.set_play_screen_lock_choice));
+            assert set_play_screen_lock_choice != null;
+            editor.putBoolean(getString(R.string.set_play_screen_lock_choice), set_play_screen_lock_choice.isChecked());
+        }
+        if (key.compareTo(getString(R.string.set_video_in_list_choice)) == 0) {
+            SwitchPreference set_video_in_list_choice = findPreference(getString(R.string.set_video_in_list_choice));
+            assert set_video_in_list_choice != null;
+            editor.putBoolean(getString(R.string.set_video_in_list_choice), set_video_in_list_choice.isChecked());
+            Intent intent = new Intent(requireActivity(), MainActivity.class);
+            startActivity(intent);
+        }
+        if (key.compareTo(getString(R.string.set_cast_choice)) == 0) {
+            SwitchPreference set_cast_choice = findPreference(getString(R.string.set_cast_choice));
+            assert set_cast_choice != null;
+            editor.putInt(getString(R.string.set_cast_choice), set_cast_choice.isChecked() ? 1 : 0);
+            Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
+            Bundle b = new Bundle();
+            b.putInt("state_asked", set_cast_choice.isChecked() ? 1 : 0);
+            intentBC.putExtras(b);
+            LocalBroadcastManager.getInstance(requireActivity()).sendBroadcast(intentBC);
+        }
+        if (key.compareTo(getString(R.string.set_video_language_choice)) == 0) {
+            MultiSelectListPreference set_video_language_choice = findPreference(getString(R.string.set_video_language_choice));
+            assert set_video_language_choice != null;
+            editor.putStringSet(getString(R.string.set_video_language_choice), set_video_language_choice.getValues());
+            if (Helper.isLoggedIn(getActivity())) {
+                new Thread(() -> {
+                    UserSettings userSettings = new UserSettings();
+                    Set<String> language_choiceValues = set_video_language_choice.getValues();
+                    userSettings.setVideoLanguages(new ArrayList<>(language_choiceValues));
+                    try {
+                        RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(getActivity());
+                        api.updateUser(userSettings);
+                    } catch (Exception | Error e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+            }
+        }
+        editor.apply();
     }
 
     private void createPref() {
         getPreferenceScreen().removeAll();
         addPreferencesFromResource(R.xml.main_preferences);
         PreferenceScreen preferenceScreen = getPreferenceScreen();
-        FragmentActivity context = getActivity();
-        assert context != null;
+        FragmentActivity context = requireActivity();
         if (preferenceScreen == null) {
-            Toasty.error(getActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
+            Toasty.error(requireActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
             return;
         }
 
         //****** My Account ******
 
         Preference my_account = findPreference("my_account");
-        assert my_account != null;
-        if (!Helper.isLoggedIn(getActivity()) || userMe == null) {
-            my_account.setVisible(false);
-        } else {
-            my_account.setTitle(userMe.getUsername());
-            my_account.setSummary(userMe.getEmail());
-            Resources resources = getResources();
-            Drawable defaultAvatar = ResourcesCompat.getDrawable(resources, R.drawable.missing_peertube, null);
-            my_account.setIcon(defaultAvatar);
-            String avatarUrl = null;
-            if (userMe.getAccount().getAvatar() != null) {
-                avatarUrl = "https://" + HelperInstance.getLiveInstance(context) + userMe.getAccount().getAvatar().getPath();
+        if (my_account != null) {
+            my_account.setOnPreferenceClickListener(preference -> {
+                startActivity(new Intent(requireActivity(), MyAccountActivity.class));
+                return false;
+            });
+            if (!Helper.isLoggedIn(getActivity()) || userMe == null) {
+                my_account.setVisible(false);
+            } else {
+                my_account.setTitle(userMe.getUsername());
+                my_account.setSummary(userMe.getEmail());
+                Resources resources = getResources();
+                Drawable defaultAvatar = ResourcesCompat.getDrawable(resources, R.drawable.missing_peertube, null);
+                my_account.setIcon(defaultAvatar);
+                String avatarUrl = null;
+                BitmapDrawable avatar = null;
+                if (userMe.getAccount().getAvatar() != null) {
+                    avatarUrl = "https://" + HelperInstance.getLiveInstance(context) + userMe.getAccount().getAvatar().getPath();
+                } else {
+                    avatar = new AvatarGenerator.AvatarBuilder(context)
+                            .setLabel(userMe.getAccount().getAcct())
+                            .setAvatarSize(120)
+                            .setTextSize(30)
+                            .toSquare()
+                            .setBackgroundColor(Helper.fetchAccentColor(context))
+                            .build();
+                }
+
+                Glide.with(requireActivity())
+                        .asDrawable()
+                        .load(avatarUrl != null ? avatarUrl : avatar)
+                        .into(new CustomTarget<Drawable>() {
+                            @Override
+                            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                                my_account.setIcon(resource);
+                            }
+
+                            @Override
+                            public void onLoadCleared(@Nullable Drawable placeholder) {
+
+                            }
+                        });
+
             }
-            Glide.with(getActivity())
-                    .asDrawable()
-                    .load(avatarUrl != null ? avatarUrl : R.drawable.missing_peertube)
-                    .into(new CustomTarget<Drawable>() {
-                        @Override
-                        public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
-                            my_account.setIcon(resource);
-                        }
-
-                        @Override
-                        public void onLoadCleared(@Nullable Drawable placeholder) {
-
-                        }
-                    });
-
         }
+       
 
         //****** App theme *******
         ListPreference set_theme_choice = findPreference(getString(R.string.set_theme_choice));
@@ -315,7 +333,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
         CharSequence[] entriesTheme = arrayTheme.toArray(new CharSequence[0]);
         CharSequence[] entryValuesTheme = new CharSequence[3];
         final SharedPreferences sharedpref = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        int currentTheme = sharedpref.getInt(Helper.SET_THEME, Helper.DEFAULT_MODE);
+        int currentTheme = sharedpref.getInt(Helper.SET_THEME, BuildConfig.default_theme);
         entryValuesTheme[0] = String.valueOf(Helper.LIGHT_MODE);
         entryValuesTheme[1] = String.valueOf(Helper.DARK_MODE);
         entryValuesTheme[2] = String.valueOf(Helper.DEFAULT_MODE);
@@ -330,15 +348,16 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
         ListPreference set_video_mode_choice = findPreference(getString(R.string.set_video_mode_choice));
         List<String> array = Arrays.asList(getResources().getStringArray(R.array.settings_video_mode));
         CharSequence[] entries = array.toArray(new CharSequence[0]);
-        CharSequence[] entryValues = new CharSequence[4];
+        CharSequence[] entryValues = new CharSequence[2];
         int video_mode = sharedpref.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL);
         entryValues[0] = String.valueOf(Helper.VIDEO_MODE_NORMAL);
-        entryValues[1] = String.valueOf(Helper.VIDEO_MODE_MAGNET);
-        entryValues[2] = String.valueOf(Helper.VIDEO_MODE_WEBVIEW);
-        entryValues[3] = String.valueOf(Helper.VIDEO_MODE_TORRENT);
+        entryValues[1] = String.valueOf(Helper.VIDEO_MODE_WEBVIEW);
         if (set_video_mode_choice != null) {
             set_video_mode_choice.setEntries(entries);
             set_video_mode_choice.setEntryValues(entryValues);
+            if(video_mode > Helper.VIDEO_MODE_WEBVIEW) {
+                video_mode = Helper.VIDEO_MODE_NORMAL;
+            }
             set_video_mode_choice.setValueIndex(video_mode);
         }
 
@@ -368,7 +387,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
         assert set_video_minimize_choice != null;
         set_video_minimize_choice.setChecked(minimized);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O
-                || !getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+                || !requireActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
             set_video_minimize_choice.setVisible(false);
         }
 
@@ -407,7 +426,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
         set_video_in_list_choice.setChecked(videosInList);
 
         //****** Allow Chromecast *******
-        int cast = sharedpref.getInt(getString(R.string.set_cast_choice), 0);
+        int cast = sharedpref.getInt(getString(R.string.set_cast_choice), BuildConfig.cast_enabled);
         SwitchPreference set_cast_choice = findPreference(getString(R.string.set_cast_choice));
         assert set_cast_choice != null;
         set_cast_choice.setChecked(cast == 1);