Release notes

New Crowdin updates

See merge request tom79/fedilab-tube!61

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitlab-ci.yml

@@ -68,7 +68,7 @@ assembleDebug:
   cache:
     key: "${CI_COMMIT_TAG}"
     paths:
-      - app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk
+      - app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-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_acadDebug:
+lintfdroid_peertube_apps_educDebug:
   interruptible: true
   stage: build
   script:
-    - ./gradlew -Pci --console=plain :app:lintFdroid_acadDebug -PbuildDir=lint
+    - ./gradlew -Pci --console=plain :app:lintfdroid_peertube_apps_educDebug -PbuildDir=lint
   except:
     - tags
 
@@ -110,7 +110,7 @@ putApkOnTags:
   cache:
     key: "${CI_COMMIT_TAG}"
     paths:
-      - app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk
+      - app/build/outputs/apk/fdroid_peertube_apps_educ/debug/app-fdroid_peertube_apps_educ-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_acad-debug.apk"
+    - export acadUrl="${NC_DOWNLOAD_URL}app-fdroid_peertube_apps_educ-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_acad/debug/app-fdroid_acad-debug.apk "${NC_UPLOAD_URL}/app-fdroid_acad-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"'
     - 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

README.md

@@ -6,7 +6,7 @@ The other app is **[TubeLab](#TubeLab)** a Peertube Android app working for all
  
 ## <a name="TubeLab">TubeLab</a>
 
-Tubelab is an Android app for Peertube (GNU GPLv3).
+Tubelab is an Android app for Peertube (GNU GPLv3). <img src='https://img.shields.io/f-droid/v/app.fedilab.tubelab?include_prereleases' />
 
 [<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.tubelab)
 &nbsp;&nbsp;[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/packages/app.fedilab.tubelab/)

app/build.gradle

@@ -1,18 +1,16 @@
 apply plugin: 'com.android.application'
-
 apply plugin: "androidx.navigation.safeargs"
 
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.2"
 
-
     defaultConfig {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 25
-        versionName "1.7.0"
+        versionCode 34
+        versionName "1.11.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,45 +38,106 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    //boolean full_instances if set to false means TubeAcad
     productFlavors {
-        fdroid_acad {
+        fdroid_peertube_apps_educ {
             applicationId "app.fedilab.fedilabtube"
+            resValue "string", "app_name", "TubeAcad"
+            resValue "string", "app_id", "app.fedilab.fedilabtube"
             buildConfigField "String", "version", "\"fdroid_acad\""
             buildConfigField "boolean", "full_instances", "false"
             buildConfigField "boolean", "google_restriction", "false"
+            buildConfigField "boolean", "surfing_mode", "false"
+            buildConfigField "boolean", "sepia_search", "false"
+            buildConfigField "boolean", "instance_switcher", "true"
+            buildConfigField "boolean", "allow_remote_connections", "false"
         }
-        google_acad {
+        google_peertube_apps_educ {
             applicationId "app.fedilab.fedilabtube"
+            resValue "string", "app_name", "TubeAcad"
+            resValue "string", "app_id", "app.fedilab.fedilabtube"
             buildConfigField "String", "version", "\"google_acad\""
             buildConfigField "boolean", "full_instances", "false"
             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"
         }
         fdroid_full {
             applicationId "app.fedilab.tubelab"
+            resValue "string", "app_name", "TubeLab"
+            resValue "string", "app_id", "app.fedilab.tubelab"
             buildConfigField "String", "version", "\"fdroid_full\""
             buildConfigField "boolean", "full_instances", "true"
             buildConfigField "boolean", "google_restriction", "false"
+            buildConfigField "boolean", "surfing_mode", "true"
+            buildConfigField "boolean", "sepia_search", "true"
+            buildConfigField "boolean", "instance_switcher", "true"
+            buildConfigField "boolean", "allow_remote_connections", "true"
         }
         google_full {
             applicationId "app.fedilab.tubelab"
+            resValue "string", "app_name", "TubeLab"
+            resValue "string", "app_id", "app.fedilab.tubelab"
             buildConfigField "String", "version", "\"google_full\""
             buildConfigField "boolean", "full_instances", "true"
             buildConfigField "boolean", "google_restriction", "true"
+            buildConfigField "boolean", "surfing_mode", "true"
+            buildConfigField "boolean", "sepia_search", "true"
+            buildConfigField "boolean", "instance_switcher", "true"
+            buildConfigField "boolean", "allow_remote_connections", "true"
+        }
+        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_acad {
+        fdroid_peertube_apps_educ {
             res.srcDirs = ['src/main/res', 'src/acad/res']
+            java.srcDirs = ['src/main/java', 'src/acad/java']
         }
-        google_acad {
+        google_peertube_apps_educ {
             res.srcDirs = ['src/main/res', 'src/acad/res']
+            java.srcDirs = ['src/main/java', 'src/acad/java']
         }
         fdroid_full {
             res.srcDirs = ['src/main/res', 'src/full/res']
+            java.srcDirs = ['src/main/java', 'src/full/java']
         }
         google_full {
             res.srcDirs = ['src/main/res', 'src/full/res']
+            java.srcDirs = ['src/main/java', 'src/full/java']
+        }
+        queermotion {
+            res.srcDirs = ['src/main/res', 'src/queermotion/res']
+            java.srcDirs = ['src/main/java', 'src/full/java']
+        }
+        bittube {
+            res.srcDirs = ['src/main/res', 'src/bittube/res']
+            java.srcDirs = ['src/main/java', 'src/full/java']
         }
     }
 }
@@ -99,41 +158,51 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment:2.3.1'
+    implementation 'androidx.navigation:navigation-fragment:2.3.2'
     implementation "androidx.fragment:fragment:1.2.5"
-    implementation 'androidx.navigation:navigation-ui:2.3.1'
-    implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.1")
+    implementation 'androidx.navigation:navigation-ui:2.3.2'
+    implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.2")
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.browser:browser:1.3.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    testImplementation 'junit:junit:4.13'
+    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'
 
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'com.github.GrenderG:Toasty:1.4.2'
-    implementation 'com.google.android.exoplayer:exoplayer:2.12.1'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.12.1'
+    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 "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "net.gotev:uploadservice:3.5.2"
-    implementation "net.gotev:uploadservice-okhttp:3.5.2"
+    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.0'
+    implementation 'androidx.media:media:1.2.1'
     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'
     implementation 'com.github.mancj:MaterialSearchBar:0.8.5'
 
-    implementation "com.github.TorrentStream:TorrentStream-Android:2.7.0"
 
     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'
+
+
+    fdroid_peertube_apps_educImplementation 'org.matomo.sdk:tracker:4.1.2'
+    google_peertube_apps_educImplementation 'org.matomo.sdk:tracker:4.1.2'
+
 
 }

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

@@ -0,0 +1,35 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2020 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 org.matomo.sdk.Matomo;
+import org.matomo.sdk.Tracker;
+import org.matomo.sdk.TrackerBuilder;
+
+
+
+public class FedilabTube extends BaseFedilabTube {
+
+    private Tracker mMatomoTracker;
+
+    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));
+        return mMatomoTracker;
+    }
+}

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

@@ -0,0 +1,47 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2020 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.app.Activity;
+import android.content.Context;
+
+import org.matomo.sdk.Tracker;
+import org.matomo.sdk.extra.TrackHelper;
+
+public class Matomo {
+
+    public static void sendScreen(Context _mcontext, String path, String title) {
+        Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
+        TrackHelper.track().screen(path).title(title).with(tracker);
+    }
+
+    public static void sendEvent(Context _mcontext, String category, String action, String label, float value) {
+        Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
+        TrackHelper.track().event(category, action).name(label).value(value).with(tracker);
+    }
+
+
+    public static void sendValue(Context _mcontext, String path, int index, String dimensionValue) {
+        Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
+        TrackHelper.track().screen(path).dimension(index, dimensionValue).with(tracker);
+    }
+
+
+    public static void trackInstall(Context _mcontext) {
+        Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
+        TrackHelper.track().download().with(tracker);
+    }
+}

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

@@ -7,7 +7,10 @@
     <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/color/bottom_nav_color.xml

@@ -0,0 +1,5 @@
+<?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

@@ -0,0 +1,864 @@
+<?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

@@ -0,0 +1,862 @@
+<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

@@ -0,0 +1,856 @@
+<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

@@ -0,0 +1,5 @@
+<?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

@@ -0,0 +1,5 @@
+<?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

@@ -0,0 +1,16 @@
+<?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

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

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

@@ -0,0 +1,7 @@
+<?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/contact-website.txt

@@ -1 +0,0 @@
-https://fedilab.app

app/src/fdroid_acad/play/listings/en-US/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_acad/play/release-notes/en-US/default.txt

@@ -1,5 +0,0 @@
-- Nouvelles options :
- - Mode plein écran automatique
- - Désactiver la lecture automatique des vidéos
-
-- Quelques corrections de bugs

app/src/fdroid_full/contact-website.txt

@@ -1 +0,0 @@
-https://fedilab.app

app/src/fdroid_full/play/listings/af/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/ca/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/cs/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/da/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/en/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/fi/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/fi/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/he/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/he/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/hu/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/hu/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/ja/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/ko/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/no/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/no/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/ro/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/sr/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/sr/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/sv/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/tr/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/tr/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/uk/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/uk/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/vi/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/listings/vi/short-description.txt

@@ -1 +0,0 @@
-TubeLab est une application Peertube pour les instances académiques.

app/src/fdroid_full/play/listings/zh-rTW/full-description.txt

@@ -1,22 +0,0 @@
-*Not authenticated mode*
-
-It's a limited mode where you can do some actions:
-
-- Switch instance,
-- Share videos,
-- Download videos.
-
-
-*Authenticated mode*
-
-Many features are available with this mode:
-
-- Write/delete comments
-- Upload/remove/edit videos
-- Manage (create/edit/remove) channels and playlists
-- Follow/unfollow channels
-- Thumbs-up/down
-- Check notifications
-- Mute/unmute channels
-- Report videos/accounts
-- Check your history

app/src/fdroid_full/play/release-notes/en-US/default.txt

@@ -1,14 +0,0 @@
-Added:
-- Display follow button for Sepia Search
-- Reach owner from channels
-- Surfing mode (store instances in db with quick switch)
-- Allow to delete history
-
-Changed:
-- Quicker access to account settings
-- Improve landscape mode
-
-Fix:
-- Pull to refresh crashes
-- Settings crashes
-- Fix an issue with unlisted playlists

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

@@ -0,0 +1,20 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2020 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>. */
+
+
+
+public class FedilabTube extends BaseFedilabTube {
+}

app/src/full/java/app/fedilab/fedilabtube/Matomo.java

@@ -0,0 +1,41 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2020 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;
+
+
+@SuppressWarnings({"unused", "RedundantSuppression"})
+public class Matomo {
+
+    public static void sendScreen(Context _mcontext, String path, String title) {
+        //Do nothing
+    }
+
+    public static void sendEvent(Context _mcontext, String category, String action, String label, float value) {
+        //Do nothing
+    }
+
+
+    public static void sendValue(Context _mcontext, String path, int index, String dimensionValue) {
+        //Do nothing
+    }
+
+
+    public static void trackInstall(Context _mcontext) {
+        //Do nothing
+    }
+}

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

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="1.104"
+        android:scaleY="1.104"
+        android:translateX="-1.248"
+        android:translateY="-1.248">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+    </group>
+</vector>

app/src/full/res/values-fr/strings.xml

@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="set_video_in_list">Videos in list</string>
-    <string name="set_video_in_list_description">Change the layout for displaying videos in a list</string>
-    <string name="no_instances">No instances !</string>
-    <string name="show_more">Show more</string>
-    <string name="show_less">Show less</string>
-    <string name="set_play_screen_lock">Screen lock</string>
-    <string name="set_play_screen_lock_description">Keep playing videos when the screen is locked</string>
-    <string name="save">Save</string>
-    <string name="enable_history">Enable history</string>
-    <string name="change_profile_picture">Change profile picture</string>
-    <string name="set_autoplay">Automatic playback</string>
-    <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
-    <string name="set_fullscreen">Fullscreen</string>
-    <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
-    <string name="set_autoplay_next_video">Automatically start playing the next video</string>
-    <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
-    <string name="add_public_reply">Ajouter une réponse publique</string>
-    <string name="activity">Activity</string>
-    <string name="app">App</string>
-    <string name="notif_new_video">New video from your subscriptions</string>
-    <string name="notif_new_comment">New comment on your video</string>
-    <string name="notif_blocked">One of your video is blocked/unblocked</string>
-    <string name="notif_video_published">Video published (after transcoding/scheduled update)</string>
-    <string name="notif_video_imported">Video import finished</string>
-    <string name="notif_new_followers">You or your channel(s) has a new follower</string>
-    <string name="notif_video_mention">Someone mentioned you in video comments</string>
-    <string name="notif_abuse_received">An abuse report received a new message</string>
-    <string name="notif_abuse_accepted">One of your abuse reports has been accepted or rejected by moderators</string>
-    <plurals name="number_of_replies">
-        <item quantity="one">%d réponse</item>
-        <item quantity="other">%d réponses</item>
-    </plurals>
-    <string name="reply">Réponse</string>
-    <string name="set_theme">Thème</string>
-    <string name="set_theme_description">Permet de changer le thème de l\'application</string>
-    <string name="federation_issue">La vidéo ne peut pas être fédérée !</string>
-    <string name="title_home">Locale</string>
-    <string name="title_local">Locale</string>
-    <string name="title_discover">Découvrir</string>
-    <string name="title_notifications">Notifications</string>
-    <string name="title_recently_added">Nouveautés</string>
-    <string name="title_trending">Tendances</string>
-    <string name="title_most_liked">Plus aimées</string>
-    <string name="toast_error">Une erreur s\'est produite !</string>
-    <string name="title_muted">Sourdine</string>
-    <string name="title_channel">Chaînes</string>
-    <string name="do_not_list">Ne pas lister</string>
-    <string name="blur">Estomper</string>
-    <string name="display">Afficher</string>
-    <string name="no_opinion">Pas d\'opinion</string>
-    <string name="instance_choice">Choisissez une instance</string>
-    <string name="not_valide_instance">Cette instance ne semble pas être valide !</string>
-    <string name="no_videos">Aucune vidéo !</string>
-    <string name="no_notifications">Aucune notification !</string>
-    <string name="favicon">Favicon</string>
-    <string name="open_with">Ouvrir avec</string>
-    <string name="action_playlist_edit">Modifier une liste de lecture</string>
-    <string name="close">Fermer</string>
-    <string name="upload_video">Téléverser</string>
-    <string name="image_preview">Aperçu de l\'image</string>
-    <string name="file_to_upload">Sélectionnez un fichier à transférer</string>
-    <string name="new_video">New video</string>
-    <string name="new_blacklist">New blacklist info</string>
-    <string name="new_my_video_published">Your video is published</string>
-    <string name="new_my_video_error">Error when publishing your video</string>
-    <string name="new_comment">New comment</string>
-    <string name="new_follow">New follow</string>
-    <string name="channel">Chaîne</string>
-    <string name="videos">Vidéos</string>
-    <string name="channels">Chaînes</string>
-    <string name="refresh_every">Fetch every:</string>
-    <string-array name="refresh_time">
-        <item>Never</item>
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-    </string-array>
-    <string name="yes">Oui</string>
-    <string name="no">Non</string>
-    <string name="cancel">Annuler</string>
-    <string name="download">Télécharger</string>
-    <string name="profile_picture">Photo du profil</string>
-    <string name="update_video">Mettre à jour la vidéo</string>
-    <string name="remove_from_playlist">Supprimer de la liste de lecture</string>
-    <string name="date_seconds">%d s</string>
-    <string name="date_minutes">%d min</string>
-    <string name="date_hours">%d h</string>
-    <string name="date_day">%d j</string>
-    <string name="number_view_video">%s vues</string>
-    <string name="title_instance_login">Domaine de l\'instance</string>
-    <string name="uploading">Transfert en cours, veuillez patienter …</string>
-    <string name="upload_video_success">La vidéo a été transférée !</string>
-    <string name="toast_cancelled">Transfert annulé !</string>
-    <string name="video_uploaded_action">Cliquez ici pour éditer les données de la vidéo.</string>
-    <string name="toot_select_image_error">Une erreur s’est produite lors de la sélection du média !</string>
-    <string name="download_file">Télécharger %1$s</string>
-    <string name="account_updated">The account has been updated!</string>
-    <string name="action_privacy">Confidentialité</string>
-    <string name="action_logout">Déconnexion</string>
-    <string name="login">Connexion</string>
-    <string name="password">Mot de passe</string>
-    <string name="email">Courriel</string>
-    <string name="tags">Étiquettes</string>
-    <string name="validate">Valider</string>
-    <string name="share_with">Partager avec</string>
-    <string name="shared_via">Partagé via TubeLab</string>
-    <string name="username">Nom d’utilisateur</string>
-    <string name="settings">Paramètres</string>
-    <string name="logout_account_confirmation">Voulez-vous vraiment déconnecter le compte @%1$s@%2$s ?</string>
-    <string name="following">Suit</string>
-    <string name="followers">Abonné·e·s</string>
-    <string name="client_error">Impossible d’obtenir l’id du client !</string>
-    <string name="toast_error_loading_account">Une erreur s’est produite pendant le chargement du compte !</string>
-    <string name="toast_error_search">Une erreur s’est produite lors de la recherche !</string>
-    <string name="nothing_to_do">Aucune action ne peut être réalisée</string>
-    <string name="action_follow">S\'abonner</string>
-    <string name="action_mute">Mettre en sourdine</string>
-    <string name="search">Chercher</string>
-    <string name="delete">Supprimer</string>
-    <string name="action_lists_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette liste de lecture ?</string>
-    <string name="action_lists_delete">Supprimer la liste de lecture</string>
-    <string name="no_comments">Soyez le·a premier·ère à laisser un commentaire sur cette vidéo en utilisant le bouton supérieur droit !</string>
-    <string name="comment_no_allowed_peertube">Les commentaires sur cette vidéos ont été désactivés !</string>
-    <string name="pickup_resolution">Choisissez une résolution</string>
-    <string name="bookmark_add_peertube">La vidéo est rajoutée aux favoris !</string>
-    <string name="bookmark_remove_peertube">La vidéo a été retirée de vos favoris !</string>
-    <string name="information" tools:ignore="UnusedResources">Information</string>
-    <string name="app_logo">Logo de l’application</string>
-    <!-- languages not translated -->
-    <string name="subscriptions">Abonnements</string>
-    <string name="delete_instance">Delete an instance</string>
-    <string name="delete_instance_confirm">Are you sure to delete this instance?</string>
-    <string name="delete_comment">Supprimer le commentaire</string>
-    <string name="delete_comment_confirm">Etes-vous sûr de vouloir supprimer ce commentaire ?</string>
-    <string name="set_video_mode">Mode pour les vidéos</string>
-    <string name="filter">Filtrer</string>
-    <string name="sepia_search">Recherche sépia</string>
-    <string name="sepia_element_nsfw">Afficher le contenu sensible</string>
-    <string name="sepia_element_published_date">Date de publication</string>
-    <string name="any">Toutes</string>
-    <string name="today">Aujourd\'hui</string>
-    <string name="last_7_days">Les 7 derniers jours</string>
-    <string name="last_30_days">Les 30 derniers jours</string>
-    <string name="last_365_days">Les 365 derniers jours</string>
-    <string name="sepia_element_duration">Durée</string>
-    <string name="duration_short"><![CDATA[Courte (<4 min)]]></string>
-    <string name="duration_medium"><![CDATA[Moyenne (4-10 min)]]></string>
-    <string name="duration_long"><![CDATA[Longue (> 10 min)]]></string>
-    <string name="display_all_categories">Afficher toutes les catégories</string>
-    <string name="display_all_licenses">Afficher toutes les licences</string>
-    <string name="display_all_languages">Afficher toutes les langues</string>
-    <string name="all_of_these_tags">Tous ces labels</string>
-    <string name="one_of_these_tags">Un de ces labels</string>
-    <string name="apply_filter">Appliquer le filtre</string>
-    <string-array name="sort_by_array">
-        <item>Meilleurs résultats</item>
-        <item>Les plus récentes</item>
-        <item>Les moins récentes</item>
-    </string-array>
-    <string name="sort_by">Trier par</string>
-    <string name="sepia_search_hint">Mot-clé, chaîne, vidéo, etc.</string>
-    <string name="sepia_indication">La recherche Sepia affiche les vidéos et les chaînes qui correspondent à votre recherche mais qui n\'est pas l\'éditeur, ni le propriétaire. Si vous remarquez des problèmes avec une vidéo, signalez-la aux administrateurs sur le site Web de PeerTube où la vidéo est publiée.</string>
-    <string name="my_videos">Mes vidéos</string>
-    <string name="title">Titre</string>
-    <string name="license">Licence</string>
-    <string name="category">Catégorie</string>
-    <string name="language">Langue</string>
-    <string name="peertube_nsfw">Cette vidéo contient du contenu pour adultes</string>
-    <string name="peertube_enable_comments">Activer les commentaires</string>
-    <string name="description">Libellé</string>
-    <string name="toast_peertube_video_updated">La vidéo a été mise à jour !</string>
-    <string name="register_account">Créer un compte</string>
-    <string name="email_address">Adresse mèl</string>
-    <string name="preview">Aperçu</string>
-    <string name="change_preview">Modifier l\'aperçu</string>
-    <string name="name">Nom</string>
-    <string name="display_more">Afficher plus</string>
-    <string name="no_channels">Aucune chaîne !</string>
-    <string name="report_helper">Quelques explications concernant votre signalement…</string>
-    <string name="report_video">Signaler la vidéo</string>
-    <string name="report">Signaler</string>
-    <string name="change_instance">Changer d\'instance</string>
-    <string name="my_history">Historique</string>
-    <string name="edit">Modifier</string>
-    <string name="video_settings">Réglages des vidéos</string>
-    <string name="app_interface">Interface</string>
-    <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (par défaut 100Mo)</string>
-    <string name="set_video_quality_description">Définir une qualité par défaut pour les vidéos</string>
-    <string name="set_quality_mode">Résolution pour les vidéos</string>
-    <string name="video_cache_value">Cache vidéo : %d Mo</string>
-    <string name="captions">Légendes</string>
-    <string name="pickup_captions">Options d\'envoi</string>
-    <string name="none">Aucune</string>
-    <string name="set_video_mode_description">Permet de changer le mode de lecture pour les vidéos (normal, streaming ou via un navigateur).</string>
-    <string name="delete_account_comment">Supprimer les commentaires du compte</string>
-    <string name="delete_account_comment_confirm">Êtes-vous sûr de vouloir supprimer tous les commentaires de ce compte ?</string>
-    <string name="delete_video">Supprimer la vidéo</string>
-    <string name="delete_video_confirmation">Êtes-vous sûr de vouloir supprimer cette vidéo ?</string>
-    <string name="no_video_to_display">Aucune vidéo n’est disponible !</string>
-    <string name="share">Partager</string>
-    <string name="peertube_comment_on_video"><![CDATA[<b>%1$s</b> a commenté votre vidéo <b>%2$s</b>]]></string>
-    <string name="peertube_follow_channel"><![CDATA[<b>%1$s</b> suit votre chaîne <b>%2$s</b>]]></string>
-    <string name="peertube_follow_account"><![CDATA[<b>%1$s</b> suit votre compte]]></string>
-    <string name="peertube_video_published"><![CDATA[Votre vidéo <b>%1$s</b> a été publiée]]></string>
-    <string name="peertube_video_import_success"><![CDATA[L’importation de votre vidéo <b>%1$s</b> a réussi]]></string>
-    <string name="peertube_video_import_error"><![CDATA[Échec lors de l’importation de votre vidéo <b>%1$s</b>]]></string>
-    <string name="peertube_video_from_subscription"><![CDATA[<b>%1$s</b> a publié une nouvelle vidéo : <b>%2$s</b>]]></string>
-    <string name="peertube_video_blacklist"><![CDATA[Votre vidéo <b>%1$s</b> a été blacklisté]]></string>
-    <string name="peertube_video_unblacklist"><![CDATA[Votre vidéo <b>%1$s</b> n’est plus blacklisté]]></string>
-    <string name="peertube_video_report_success"><![CDATA[Your abuse report <b>%1$s</b> has been accepted]]></string>
-    <string name="peertube_video_abuse"><![CDATA[Nouveau signalement pour la vidéo : <b>%1$s</b>]]></string>
-    <string name="add_public_comment">Ajouter un commentaire public</string>
-    <string name="send_comment">Envoyer un commentaire</string>
-    <string name="all">Tout</string>
-    <!-- end languages -->
-    <string name="delete_history">Delete videos history</string>
-    <string name="delete_history_confirm">Are you sure you want to delete all your videos history?</string>
-    <string name="export_list">Export</string>
-    <string name="import_list">Import</string>
-    <string name="export_notification_title">Successful export!</string>
-    <string name="export_notification_content">Tap here to send the export by email</string>
-    <string name="export_notification_subjet">New Playlist</string>
-    <string name="export_notification_body">Open the attached file with TubeLab</string>
-    <string name="playlists">Listes de lecture</string>
-    <string name="no_playlist">No playlists</string>
-    <string name="display_name">Nom d\'affichage</string>
-    <string name="action_playlist_add">Vous n\'avez aucune liste de lecture. Cliquez sur l\'icône « + » pour en ajouter une</string>
-    <string name="error_display_name">Vous devez fournir un nom d\'affichage !</string>
-    <string name="error_channel_mandatory">Une chaîne est requise lorsque la liste de lecture est publique.</string>
-    <string name="action_playlist_create">Créer une liste de lecture</string>
-    <string name="action_playlist_empty_content">Cette liste de lecture est vide.</string>
-    <string name="password_confirm">Confirmer le mot de passe</string>
-    <string name="agreement_check">J\'accepte les %1$s et les %2$s</string>
-    <string name="server_rules">règles du serveur</string>
-    <string name="tos">conditions de service</string>
-    <string name="sign_up">S’inscrire</string>
-    <string name="all_field_filled">Veuillez remplir tous les champs !</string>
-    <string name="password_error">Les mots de passe ne sont pas identiques !</string>
-    <string name="email_error">L\'e-mail ne semble pas être valide !</string>
-    <string name="email_indicator">Vous recevrez un e-mail de confirmation</string>
-    <string name="password_indicator">Utilisez au moins 8 caractères</string>
-    <string name="password_too_short">Le mot de passe doit contenir au moins 8 caractères</string>
-    <string name="username_error">Le nom d\'utilisateur·rice doit être en minuscule, contenir uniquement des lettres, des chiffres, des points et des caractères de soulignement</string>
-    <string name="account_created">Compte créé !</string>
-    <string name="account_created_message">Votre compte est créé !\n\nVous allez recevoir un email de confirmation à l\'adresse <b>%1$s</b>.\n\nCliquez sur le lien présent dans le mail pour valider votre compte.</string>
-    <string name="account">Compte</string>
-    <string name="report_account">Signaler le compte</string>
-    <string-array name="settings_video_mode">
-        <item>Normal</item>
-        <item>Streaming</item>
-        <item>Magnet</item>
-        <item>Torrent</item>
-    </string-array>
-    <string-array name="settings_theme">
-        <item>Lumière</item>
-        <item>Foncé</item>
-        <item>Automatique</item>
-    </string-array>
-    <string-array name="settings_video_quality">
-        <item>Élevée</item>
-        <item>Moyenne</item>
-        <item>Faible</item>
-    </string-array>
-    <string name="unfollow_confirm">Voulez-vous vous désabonner de ce compte ?</string>
-    <string name="title_video_peertube">Titre de la vidéo</string>
-    <string name="join_peertube">Rejoignez Peertube</string>
-    <string name="agreement_check_peertube">J\'ai au moins 16 ans et je suis d\'accord avec les %1$s de cette instance</string>
-    <string name="edit_profile">Éditer le profil</string>
-    <string name="make_an_action">Faire une action</string>
-    <string name="action_unfollow">Se désabonner</string>
-    <string name="display_nsfw_videos">Afficher les vidéos sensibles</string>
-    <string name="fullscreen">Vidéo plein écran</string>
-    <string name="bookmark_peertube_empty">Il n’y a aucune vidéo Peertube dans vos favoris !</string>
-    <string name="delete_channel">Supprimer la chaîne</string>
-    <string name="action_channel_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette chaîne ?</string>
-    <string name="modify_playlists">Vidéo dans les listes de lecture</string>
-    <string name="no_muted">Aucun compte en sourdine !</string>
-    <string name="error_display_name_channel">Vous devez fournir un nom d\'affichage et un nom pour la chaîne!</string>
-    <string name="action_channel_create">Créer une chaîne</string>
-    <string name="action_channel_edit">Modifier une chaîne</string>
-    <string name="email_error_domain">Les adresses mails %1$s ne sont pas autorisées !</string>
-    <string name="report_comment_size">Veuillez préciser les raisons.</string>
-    <string name="not_logged_in">Vous devez être connecté.e pour effectuer cette action !</string>
-    <string name="successful_report">Le compte a été signalé !</string>
-    <string name="successful_report_comment">Le commentaire a été signalé !</string>
-    <string name="successful_video_report">La vidéo a été signalée !</string>
-    <string name="password_length_error">Le mot de passe doit contenir 6 caractères !</string>
-    <string name="muted_done">Le compte a été mis en sourdine !</string>
-    <string name="edit_video">Modifier une vidéo</string>
-    <string name="create_an_account">Créer un compte</string>
-    <string name="followers_count">%1$s Abonné·e·s</string>
-    <string name="developer">Développeur</string>
-    <string name="about_vesrion">Version %1$s</string>
-    <string name="about_the_app">À propos de l’application</string>
-    <string name="Donate">Faire un don</string>
-    <string name="source_code">Code source</string>
-    <string name="issue_tracker">Suivi des tickets</string>
-    <string name="action_instance_empty_content">Aucune instance ne correspond à ces critères</string>
-    <string name="instances_picker">Sélecteur d\'instances</string>
-    <string name="pickup_instance">Choisissez une instance</string>
-    <string name="sensitive_video"> Vidéos sensibles</string>
-    <string name="sensitive_content">Contenu sensible : %1$s</string>
-    <string name="followers_instance">%1$s instances suiveuses</string>
-    <string name="help">Aide</string>
-    <string name="pickup_categories">Sélection des catégories</string>
-    <string name="pickup_languages">Sélection des langues</string>
-    <string name="notification_channel_name">Mise à jour des informations</string>
-    <string name="fetch_notification_channel_name">Fetch notifications</string>
-    <string name="add_account">Ajouter un compte</string>
-    <string name="list_of_accounts">Liste des comptes</string>
-    <string name="pause">Pause</string>
-    <string name="play">Jouer</string>
-    <string name="minimize">Minimiser</string>
-    <string name="fast_rewind">Rembobinage rapide</string>
-    <string name="fast_forward">Avance rapide</string>
-    <string name="set_video_minimize">Minimiser la taille des vidéos</string>
-    <string name="set_video_minimize_description">Minimiser la taille des vidéos lorsque l\'application est en arrière-plan (Android N+)</string>
-    <string name="set_video_language">Filtre de langue</string>
-    <string name="set_video_language_description">Filtrer les vidéos avec différentes langues</string>
-</resources>

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

@@ -7,6 +7,9 @@
     <color name="tag_color_text">#FAFAFA</color>
     <color name="positive_thumbs">#2b90d9</color>
     <color name="negative_thumbs">#F44336</color>
-
+    <color name="favorite">#ca8f04</color>
+    <color name="bookmark">#795548</color>
+    <color name="backgroundDark">#DD000000</color>
     <color name="red_1">#F44336</color>
+    <color name="gray_light">#80808080</color>
 </resources>

app/src/main/AndroidManifest.xml

@@ -10,7 +10,9 @@
 
     -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -127,11 +129,26 @@
             android:name=".WebviewConnectActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name" />
+        <activity
+            android:name=".MastodonWebviewConnectActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name" />
         <activity
             android:name=".LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+            android:windowSoftInputMode="stateAlwaysHidden">
+            <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:host="backtotubelab"
+                    android:scheme="tubelab" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".SettingsActivity"
@@ -157,13 +174,6 @@
         <service
             android:name=".services.RetrieveInfoService"
             android:exported="false" />
-        <receiver
-            android:name=".services.PeertubeUploadReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="app.fedilab.fedilabtube.uploadservice.broadcast.status" />
-            </intent-filter>
-        </receiver>
 
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"

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

@@ -115,15 +115,27 @@ public class AboutActivity extends AppCompatActivity {
             donation_container.setVisibility(View.GONE);
         }
 
+
         //Developer donation
         Button donatePaypal = findViewById(R.id.donate_paypal);
         donatePaypal.setOnClickListener(v -> {
             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 = new Intent(Intent.ACTION_VIEW, Uri.parse("https://liberapay.com/tom79"));
+            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"));
+            }
+
             startActivity(browserIntent);
         });
 

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

@@ -17,16 +17,16 @@ package app.fedilab.fedilabtube;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.UnderlineSpan;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.view.View;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -37,13 +37,13 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
 import org.jetbrains.annotations.NotNull;
 
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData.Account;
+import app.fedilab.fedilabtube.databinding.ActivityAccountBinding;
 import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayNotificationsFragment;
@@ -56,15 +56,14 @@ import app.fedilab.fedilabtube.sqlite.Sqlite;
 public class AccountActivity extends AppCompatActivity {
 
 
-    private ViewPager mPager;
-    private TabLayout tabLayout;
-
+    private ActivityAccountBinding binding;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-
-        setContentView(R.layout.activity_account);
+        binding = ActivityAccountBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -75,34 +74,27 @@ public class AccountActivity extends AppCompatActivity {
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
 
-        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
 
-        TextView instanceView = findViewById(R.id.instance);
         Account account = new AccountDAO(AccountActivity.this, db).getAccountByToken(token);
-
         if (account == null) {
             Helper.logoutCurrentUser(AccountActivity.this, null);
             return;
         }
 
-        ImageView profile_picture = findViewById(R.id.profile_picture);
-        TextView username = findViewById(R.id.username);
-        TextView displayname = findViewById(R.id.displayname);
 
         setTitle(String.format("@%s", account.getUsername()));
 
-        Helper.loadGiF(AccountActivity.this, account.getAvatar().getPath(), profile_picture);
-        username.setText(String.format("@%s", account.getUsername()));
-        displayname.setText(account.getDisplayName());
+        Helper.loadGiF(AccountActivity.this, account.getAvatar().getPath(), binding.profilePicture);
+        binding.username.setText(String.format("@%s", account.getUsername()));
+        binding.displayname.setText(account.getDisplayName());
 
-        instanceView.setText(account.getHost());
-        FloatingActionButton edit_profile = findViewById(R.id.edit_profile);
-        edit_profile.setOnClickListener(v -> startActivity(new Intent(AccountActivity.this, MyAccountActivity.class)));
+        binding.instance.setText(account.getHost());
+        binding.editProfile.setOnClickListener(v -> startActivity(new Intent(AccountActivity.this, MyAccountActivity.class)));
 
-        Button logout_button = findViewById(R.id.logout_button);
-        logout_button.setOnClickListener(v -> {
+        binding.logoutButton.setOnClickListener(v -> {
             AlertDialog.Builder dialogBuilderLogoutAccount = new AlertDialog.Builder(AccountActivity.this);
             dialogBuilderLogoutAccount.setMessage(getString(R.string.logout_account_confirmation, account.getUsername(), account.getHost()));
             dialogBuilderLogoutAccount.setPositiveButton(R.string.action_logout, (dialog, id) -> {
@@ -114,84 +106,93 @@ public class AccountActivity extends AppCompatActivity {
             alertDialogLogoutAccount.show();
         });
 
-        Button settings = findViewById(R.id.settings);
-        settings.setOnClickListener(v -> {
+        binding.settings.setOnClickListener(v -> {
             Intent intent = new Intent(AccountActivity.this, SettingsActivity.class);
             startActivity(intent);
         });
 
-        tabLayout = findViewById(R.id.account_tabLayout);
-        mPager = findViewById(R.id.account_viewpager);
-        tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.title_notifications)));
-        tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.title_muted)));
-        tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.title_channel)));
 
 
-        mPager.setOffscreenPageLimit(3);
+        if (Helper.isLoggedIn(AccountActivity.this)) {
+            binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.title_notifications)));
+            binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.title_muted)));
+            binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.title_channel)));
+
+            binding.accountViewpager.setOffscreenPageLimit(3);
 
 
-        mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            binding.accountViewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+                @Override
+                public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                TabLayout.Tab tab = tabLayout.getTabAt(position);
-                if (tab != null)
-                    tab.select();
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-
-        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                mPager.setCurrentItem(tab.getPosition());
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-                Fragment fragment = null;
-                if (mPager.getAdapter() != null)
-                    fragment = (Fragment) mPager.getAdapter().instantiateItem(mPager, tab.getPosition());
-                switch (tab.getPosition()) {
-                    case 0:
-                        if (fragment != null) {
-                            DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment);
-                            displayNotificationsFragment.scrollToTop();
-                        }
-                        break;
-                    case 1:
-                        if (fragment != null) {
-                            DisplayAccountsFragment displayAccountsFragment = ((DisplayAccountsFragment) fragment);
-                            displayAccountsFragment.scrollToTop();
-                        }
-                        break;
-                    case 2:
-                        if (fragment != null) {
-                            DisplayChannelsFragment displayChannelsFragment = ((DisplayChannelsFragment) fragment);
-                            displayChannelsFragment.scrollToTop();
-                        }
-                        break;
                 }
-            }
-        });
 
-        PagerAdapter mPagerAdapter = new AccountsPagerAdapter(getSupportFragmentManager());
-        mPager.setAdapter(mPagerAdapter);
+                @Override
+                public void onPageSelected(int position) {
+                    TabLayout.Tab tab = binding.accountTabLayout.getTabAt(position);
+                    if (tab != null)
+                        tab.select();
+                }
 
+                @Override
+                public void onPageScrollStateChanged(int state) {
+
+                }
+            });
+
+
+            binding.accountTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+                @Override
+                public void onTabSelected(TabLayout.Tab tab) {
+                    binding.accountViewpager.setCurrentItem(tab.getPosition());
+                }
+
+                @Override
+                public void onTabUnselected(TabLayout.Tab tab) {
+
+                }
+
+                @Override
+                public void onTabReselected(TabLayout.Tab tab) {
+                    Fragment fragment = null;
+                    if (binding.accountViewpager.getAdapter() != null)
+                        fragment = (Fragment) binding.accountViewpager.getAdapter().instantiateItem(binding.accountViewpager, tab.getPosition());
+                    switch (tab.getPosition()) {
+                        case 0:
+                            if (fragment != null) {
+                                DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment);
+                                displayNotificationsFragment.scrollToTop();
+                            }
+                            break;
+                        case 1:
+                            if (fragment != null) {
+                                DisplayAccountsFragment displayAccountsFragment = ((DisplayAccountsFragment) fragment);
+                                displayAccountsFragment.scrollToTop();
+                            }
+                            break;
+                        case 2:
+                            if (fragment != null) {
+                                DisplayChannelsFragment displayChannelsFragment = ((DisplayChannelsFragment) fragment);
+                                displayChannelsFragment.scrollToTop();
+                            }
+                            break;
+                    }
+                }
+            });
+
+            PagerAdapter mPagerAdapter = new AccountsPagerAdapter(getSupportFragmentManager());
+            binding.accountViewpager.setAdapter(mPagerAdapter);
+        } 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)
+                binding.remoteAccount.setText(Html.fromHtml(getString(R.string.remote_account_from, account.getSoftware()), Html.FROM_HTML_MODE_LEGACY));
+            else
+                binding.remoteAccount.setText(Html.fromHtml(getString(R.string.remote_account_from, account.getSoftware())));
+        }
     }
 
     @Override

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

@@ -14,7 +14,12 @@ 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 android.Manifest;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -27,19 +32,19 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
 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;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,52 +59,53 @@ import app.fedilab.fedilabtube.client.data.ChannelData;
 import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
 import app.fedilab.fedilabtube.client.entities.Item;
 import app.fedilab.fedilabtube.client.entities.PlaylistParams;
+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.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
+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 {
 
 
+    private static final int PICK_AVATAR = 467;
     PlaylistAdapter playlistAdapter;
-    private RelativeLayout mainLoader;
-    private RelativeLayout textviewNoAction;
     private HashMap<Integer, String> privacyToSend;
-    private Spinner set_upload_channel;
-    private Spinner set_upload_privacy;
     private String idChannel;
     private List<Playlist> playlists;
     private Playlist playlistToEdit;
     private List<ChannelData.Channel> myChannels;
     private ChannelData.Channel selectedChannel;
+    private AddPlaylistBinding bindingDialog;
+    private Uri inputData;
+    private ActivityAllPlaylistBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_all_playlist);
+        binding = ActivityAllPlaylistBinding.inflate(getLayoutInflater());
+        View viewRoot = binding.getRoot();
+        setContentView(viewRoot);
 
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle(R.string.playlists);
 
 
-        textviewNoAction = findViewById(R.id.no_action);
-        mainLoader = findViewById(R.id.loader);
-        RelativeLayout nextElementLoader = findViewById(R.id.loading_next_items);
-        mainLoader.setVisibility(View.VISIBLE);
-        nextElementLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.VISIBLE);
+        binding.loadingNextItems.setVisibility(View.GONE);
         idChannel = null;
 
         PlaylistsVM viewModel = new ViewModelProvider(AllPlaylistsActivity.this).get(PlaylistsVM.class);
         viewModel.manage(PlaylistsVM.action.GET_PLAYLISTS, null, null).observe(AllPlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_PLAYLISTS, apiResponse));
 
-        FloatingActionButton add_new = findViewById(R.id.add_new);
-
 
         LinkedHashMap<Integer, String> privaciesInit = new LinkedHashMap<>(peertubeInformation.getPrivacies());
         if (privaciesInit.size() > 0) {
@@ -110,13 +116,12 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
 
         playlists = new ArrayList<>();
-        RecyclerView lv_playlist = findViewById(R.id.lv_playlist);
         playlistAdapter = new PlaylistAdapter(playlists, false);
         playlistAdapter.allPlaylistRemoved = this;
-        lv_playlist.setAdapter(playlistAdapter);
+        binding.lvPlaylist.setAdapter(playlistAdapter);
         LinearLayoutManager mLayoutManager = new LinearLayoutManager(AllPlaylistsActivity.this);
-        lv_playlist.setLayoutManager(mLayoutManager);
-        add_new.setOnClickListener(view -> manageAlert(null));
+        binding.lvPlaylist.setLayoutManager(mLayoutManager);
+        binding.addNew.setOnClickListener(view -> manageAlert(null));
     }
 
     @Override
@@ -135,7 +140,7 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
 
     public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
-        mainLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.GONE);
         if (apiResponse.getError() != null) {
             Toasty.error(AllPlaylistsActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
@@ -144,9 +149,9 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
             if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
                 playlists.addAll(apiResponse.getPlaylists());
                 playlistAdapter.notifyDataSetChanged();
-                textviewNoAction.setVisibility(View.GONE);
+                binding.noAction.setVisibility(View.GONE);
             } else {
-                textviewNoAction.setVisibility(View.VISIBLE);
+                binding.noAction.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -155,37 +160,53 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
         playlistToEdit = playlistParam;
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(AllPlaylistsActivity.this);
-        LayoutInflater inflater1 = getLayoutInflater();
-        View dialogView = inflater1.inflate(R.layout.add_playlist, new LinearLayout(AllPlaylistsActivity.this), false);
-        dialogBuilder.setView(dialogView);
-        EditText display_name = dialogView.findViewById(R.id.display_name);
-        EditText description = dialogView.findViewById(R.id.description);
-        set_upload_channel = dialogView.findViewById(R.id.set_upload_channel);
-        set_upload_privacy = dialogView.findViewById(R.id.set_upload_privacy);
+        bindingDialog = AddPlaylistBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false);
+        dialogBuilder.setView(bindingDialog.getRoot());
+
+        dialogBuilder.setView(bindingDialog.getRoot());
+
 
         ChannelsVM viewModelC = new ViewModelProvider(AllPlaylistsActivity.this).get(ChannelsVM.class);
         viewModelC.get(RetrofitPeertubeAPI.DataType.MY_CHANNELS, null).observe(AllPlaylistsActivity.this, this::manageVIewChannels);
 
-        display_name.setFilters(new InputFilter[]{new InputFilter.LengthFilter(120)});
-        description.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
+        bindingDialog.displayName.setFilters(new InputFilter[]{new InputFilter.LengthFilter(120)});
+        bindingDialog.description.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
 
         if (playlistToEdit != null) {
-            display_name.setText(playlistToEdit.getDisplayName());
-            description.setText(playlistToEdit.getDescription());
+            bindingDialog.displayName.setText(playlistToEdit.getDisplayName());
+            bindingDialog.description.setText(playlistToEdit.getDescription());
         }
         dialogBuilder.setPositiveButton(R.string.validate, null);
         dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
 
         AlertDialog alertDialog = dialogBuilder.create();
+
+        bindingDialog.selectFile.setOnClickListener(v -> {
+            if (ContextCompat.checkSelfPermission(AllPlaylistsActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) !=
+                    PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(AllPlaylistsActivity.this,
+                        new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                        MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE);
+                return;
+            }
+
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.addCategory(Intent.CATEGORY_OPENABLE);
+            intent.setType("*/*");
+            String[] mimetypes = {"image/*"};
+            intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
+            startActivityForResult(intent, PICK_AVATAR);
+        });
+        Helper.loadGiF(AllPlaylistsActivity.this, playlistParam != null ? playlistParam.getThumbnailPath() : null, bindingDialog.profilePicture);
         alertDialog.setOnShowListener(dialogInterface -> {
 
             Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
             button.setOnClickListener(view -> {
-                if (display_name.getText() != null && display_name.getText().toString().trim().length() > 0) {
+                if (bindingDialog.displayName.getText() != null && bindingDialog.displayName.getText().toString().trim().length() > 0) {
                     PlaylistParams playlistElement = new PlaylistParams();
-                    playlistElement.setDisplayName(display_name.getText().toString().trim());
-                    if (description.getText() != null && description.getText().toString().trim().length() > 0) {
-                        playlistElement.setDescription(description.getText().toString().trim());
+                    playlistElement.setDisplayName(bindingDialog.displayName.getText().toString().trim());
+                    if (bindingDialog.description.getText() != null && bindingDialog.description.getText().toString().trim().length() > 0) {
+                        playlistElement.setDescription(bindingDialog.description.getText().toString().trim());
                     }
                     playlistElement.setVideoChannelId(idChannel);
                     String label;
@@ -203,11 +224,11 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
                         new Thread(() -> {
                             String playlistId;
                             if (playlistToEdit == null) {
-                                APIResponse apiResponse = new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.CREATE_PLAYLIST, null, playlistElement, null);
+                                APIResponse apiResponse = new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.CREATE_PLAYLIST, null, playlistElement, inputData);
                                 playlistId = apiResponse.getActionReturn();
                             } else {
                                 playlistId = playlistToEdit.getId();
-                                new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.UPDATE_PLAYLIST, playlistId, playlistElement, null);
+                                new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.UPDATE_PLAYLIST, playlistId, playlistElement, inputData);
                             }
                             Handler mainHandler = new Handler(Looper.getMainLooper());
                             Runnable myRunnable = () -> {
@@ -247,7 +268,7 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
             //Hide keyboard
             InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
             assert imm != null;
-            imm.hideSoftInputFromWindow(display_name.getWindowToken(), 0);
+            imm.hideSoftInputFromWindow(bindingDialog.displayName.getWindowToken(), 0);
         });
         if (alertDialog.getWindow() != null)
             alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -255,6 +276,24 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
     }
 
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == PICK_AVATAR && resultCode == Activity.RESULT_OK) {
+            if (data == null || data.getData() == null) {
+                Toasty.error(AllPlaylistsActivity.this, getString(R.string.toot_select_image_error), Toast.LENGTH_LONG).show();
+                return;
+            }
+            inputData = data.getData();
+            Glide.with(AllPlaylistsActivity.this)
+                    .load(inputData)
+                    .thumbnail(0.1f)
+                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
+                    .into(bindingDialog.profilePicture);
+
+        }
+    }
+
     public void manageVIewChannels(APIResponse apiResponse) {
         if (apiResponse.getError() != null || apiResponse.getChannels() == null || apiResponse.getChannels().size() == 0) {
             if (apiResponse.getError() != null && apiResponse.getError().getError() != null)
@@ -280,7 +319,7 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
         ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(AllPlaylistsActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, channelName);
-        set_upload_channel.setAdapter(adapterChannel);
+        bindingDialog.setUploadChannel.setAdapter(adapterChannel);
 
 
         LinkedHashMap<String, String> translations = null;
@@ -308,19 +347,19 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
         ArrayAdapter<String> adapterPrivacies = new ArrayAdapter<>(AllPlaylistsActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, privaciesA);
-        set_upload_privacy.setAdapter(adapterPrivacies);
+        bindingDialog.setUploadPrivacy.setAdapter(adapterPrivacies);
 
         if (playlistToEdit != null) {
             Item privacy = playlistToEdit.getPrivacy();
             if (privacy.getId() > 0) {
-                set_upload_privacy.setSelection(privacy.getId() - 1);
+                bindingDialog.setUploadPrivacy.setSelection(privacy.getId() - 1);
             }
         } else {
-            set_upload_privacy.setSelection(2);
+            bindingDialog.setUploadPrivacy.setSelection(2);
         }
 
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        bindingDialog.setUploadPrivacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> privaciesCheck = new LinkedHashMap<>(peertubeInformation.getPrivacies());
@@ -348,12 +387,12 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
             Item privacy = playlistToEdit.getPrivacy();
 
             if (privacy.getId() > 0) {
-                set_upload_privacy.setSelection(privacy.getId() - 1);
+                bindingDialog.setUploadPrivacy.setSelection(privacy.getId() - 1);
             }
         }
 
         //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        bindingDialog.setUploadChannel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 idChannel = channelId[position];
@@ -378,12 +417,12 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
                 }
                 k++;
             }
-            set_upload_channel.setSelection(position);
+            bindingDialog.setUploadChannel.setSelection(position);
         }
     }
 
     @Override
     public void onAllPlaylistRemoved() {
-        textviewNoAction.setVisibility(View.VISIBLE);
+        binding.noAction.setVisibility(View.VISIBLE);
     }
 }

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

@@ -14,22 +14,30 @@ 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 android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 import androidx.work.Configuration;
 import androidx.work.WorkManager;
 
-import net.gotev.uploadservice.UploadService;
+import net.gotev.uploadservice.UploadServiceConfig;
+import net.gotev.uploadservice.observer.request.GlobalRequestObserver;
+
+import java.util.Objects;
 
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.ThemeHelper;
+import app.fedilab.fedilabtube.services.GlobalUploadObserver;
 import app.fedilab.fedilabtube.worker.WorkHelper;
 
-public class FedilabTube extends MultiDexApplication {
+public class BaseFedilabTube extends MultiDexApplication {
 
+    static String UPLOAD_CHANNEL_ID = "upload_info_peertube";
 
     @Override
     public void onCreate() {
@@ -40,10 +48,14 @@ public class FedilabTube extends MultiDexApplication {
         Configuration myConfig = new Configuration.Builder()
                 .setMinimumLoggingLevel(android.util.Log.INFO)
                 .build();
-        WorkManager.initialize(FedilabTube.this, myConfig);
+        WorkManager.initialize(BaseFedilabTube.this, myConfig);
         if (interval >= 15) {
             WorkHelper.fetchNotifications(this, interval);
         }
+        createNotificationChannel();
+        UploadServiceConfig.initialize(BaseFedilabTube.this, UPLOAD_CHANNEL_ID, true);
+
+        new GlobalRequestObserver(this, new GlobalUploadObserver());
     }
 
 
@@ -51,9 +63,7 @@ public class FedilabTube extends MultiDexApplication {
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
 
-        MultiDex.install(FedilabTube.this);
-
-        UploadService.NAMESPACE = BuildConfig.APPLICATION_ID;
+        MultiDex.install(BaseFedilabTube.this);
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         int themePref = sharedpreferences.getInt(Helper.SET_THEME, Helper.DEFAULT_MODE);
         ThemeHelper.switchTo(themePref);
@@ -61,5 +71,13 @@ public class FedilabTube extends MultiDexApplication {
 
     }
 
-
+    private void createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(UPLOAD_CHANNEL_ID,
+                    getString(R.string.notification_channel_name),
+                    NotificationManager.IMPORTANCE_LOW);
+            channel.setSound(null, null);
+            ((NotificationManager) Objects.requireNonNull(getSystemService(Context.NOTIFICATION_SERVICE))).createNotificationChannel(channel);
+        }
+    }
 }

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

@@ -48,7 +48,7 @@ import app.fedilab.fedilabtube.helper.RoundedBackgroundSpan;
 import app.fedilab.fedilabtube.viewmodel.InstancesVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
 
 public class InstancePickerActivity extends AppCompatActivity {

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

@@ -26,6 +26,8 @@ import android.util.Patterns;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -35,14 +37,21 @@ 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 app.fedilab.fedilabtube.client.mastodon.RetrofitMastodonAPI;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 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.databinding.ActivityLoginBinding;
 import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.HelperAcadInstance;
+import app.fedilab.fedilabtube.helper.HelperInstance;
 import es.dmoral.toasty.Toasty;
 
 import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.updateCredential;
@@ -54,7 +63,9 @@ public class LoginActivity extends AppCompatActivity {
     private static String client_id;
     private static String client_secret;
     private ActivityLoginBinding binding;
+    private String acadInstance;
 
+    @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -66,7 +77,13 @@ public class LoginActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 
-        SpannableString content_create = new SpannableString(getString(R.string.join_peertube));
+        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.setSpan(new UnderlineSpan(), 0, content_create.length(), 0);
         content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, Helper.getColorAccent())), 0, content_create.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
@@ -80,10 +97,12 @@ public class LoginActivity extends AppCompatActivity {
         });
 
 
-        if (BuildConfig.full_instances) {
+        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)) {
 
@@ -100,67 +119,84 @@ public class LoginActivity extends AppCompatActivity {
             binding.loginPasswdContainer.setLayoutParams(layoutParamsP);
         }
 
-
         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 && Arrays.asList(Helper.openid).contains(emailArray[1])) {
+                        if (emailArray.length > 1) {
                             binding.loginButton.callOnClick();
                         }
                     }
                 }
             });
+            binding.loginUidContainer.setVisibility(View.GONE);
+            binding.loginPasswdContainer.setVisibility(View.GONE);
+            binding.loginInstanceContainer.setVisibility(View.GONE);
+            binding.createAnAccountPeertube.setVisibility(View.GONE);
+            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()];
+            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) {
+                    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);
+            binding.instancePicker.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                    acadInstance = academiesValue[position];
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+
+                }
+            });
+        }
+        if (BuildConfig.allow_remote_connections) {
+            binding.loginInstance.setOnFocusChangeListener((v, hasFocus) -> {
+                if (!hasFocus) {
+                    if (binding.loginInstance.getText() != null) {
+                        new Thread(() -> {
+                            String testInstance = binding.loginInstance.getText().toString();
+                            WellKnownNodeinfo.NodeInfo instanceNodeInfo = null;
+                            if (BuildConfig.allow_remote_connections) {
+                                instanceNodeInfo = new RetrofitPeertubeAPI(LoginActivity.this, testInstance, null).getNodeInfo();
+                            }
+                            if (instanceNodeInfo != null &&
+                                    (instanceNodeInfo.getSoftware().getName().toUpperCase().trim().compareTo("MASTODON") == 0 ||
+                                            instanceNodeInfo.getSoftware().getName().toUpperCase().trim().compareTo("PLEROMA") == 0)
+                            ) {
+                                connectToFediverse(testInstance, instanceNodeInfo);
+                            }
+                        }).start();
+                    }
+                }
+            });
         }
 
-
         binding.loginButton.setOnClickListener(v -> {
-
-            if (binding.loginUid.getText() != null && binding.loginUid.getText().toString().contains("@") && !android.util.Patterns.EMAIL_ADDRESS.matcher(binding.loginUid.getText().toString().trim()).matches()) {
-                Toasty.error(LoginActivity.this, getString(R.string.email_error)).show();
-                return;
-            }
-            binding.loginButton.setEnabled(false);
-            String instance, host;
             if (!BuildConfig.full_instances) {
-                String[] emailArray = binding.loginUid.getText().toString().split("@");
-                if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) {
-                    Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show();
-                    binding.loginButton.setEnabled(true);
-                    return;
-                }
-                host = emailArray[1];
-                instance = Helper.getPeertubeUrl(host);
-            } else {
-                if (binding.loginInstance.getText() == null || binding.loginInstance.getText().toString().trim().length() == 0) {
-                    Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
-                    binding.loginButton.setEnabled(true);
-                    return;
-                }
-                instance = host = binding.loginInstance.getText().toString().trim().toLowerCase();
-            }
-
-            if (instance.startsWith("http")) {
-                try {
-                    URL url = new URL(instance);
-                    instance = url.getHost();
-                    host = instance;
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (!Patterns.WEB_URL.matcher("https://" + instance).matches()) {
-                Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
-                binding.loginButton.setEnabled(true);
-                return;
-            }
-            String finalInstance = instance;
-            String finalHost = host;
-            if (Arrays.asList(Helper.openid).contains(host) && !BuildConfig.full_instances) {
                 new Thread(() -> {
                     try {
-                        Oauth oauth = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).oauthClient(null, null, null, null);
+                        Oauth oauth = new RetrofitPeertubeAPI(LoginActivity.this, acadInstance, null).oauthClient(null, null, null, null);
                         if (oauth == null) {
                             runOnUiThread(() -> {
                                 binding.loginButton.setEnabled(true);
@@ -177,7 +213,7 @@ public class LoginActivity extends AppCompatActivity {
                         editor.apply();
                         Intent intent = new Intent(LoginActivity.this, WebviewConnectActivity.class);
                         Bundle b = new Bundle();
-                        b.putString("url", "https://" + Helper.getPeertubeUrl(finalHost) + "/plugins/auth-openid-connect/0.0.1/auth/openid-connect");
+                        b.putString("url", "https://" + acadInstance + "/plugins/auth-openid-connect/0.0.1/auth/openid-connect");
                         intent.putExtras(b);
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         startActivity(intent);
@@ -191,64 +227,168 @@ public class LoginActivity extends AppCompatActivity {
 
                 }).start();
             } else {
-                new Thread(() -> {
-                    Oauth oauth = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).oauthClient(Helper.CLIENT_NAME_VALUE, Helper.WEBSITE_VALUE, Helper.OAUTH_SCOPES_PEERTUBE, Helper.WEBSITE_VALUE);
-                    if (oauth == null) {
-                        runOnUiThread(() -> {
-                            binding.loginButton.setEnabled(true);
-                            Toasty.error(LoginActivity.this, getString(R.string.client_error), Toast.LENGTH_LONG).show();
-                        });
+                if (binding.loginUid.getText() != null && binding.loginUid.getText().toString().contains("@") && !android.util.Patterns.EMAIL_ADDRESS.matcher(binding.loginUid.getText().toString().trim()).matches()) {
+                    Toasty.error(LoginActivity.this, getString(R.string.email_error)).show();
+                    return;
+                }
+                binding.loginButton.setEnabled(false);
+                String instance;
+                if (!BuildConfig.full_instances) {
+                    String[] emailArray = binding.loginUid.getText().toString().split("@");
+                    if (emailArray.length > 1 && !Arrays.asList(HelperAcadInstance.valideEmails).contains(emailArray[1])) {
+                        Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show();
+                        binding.loginButton.setEnabled(true);
                         return;
                     }
 
-                    client_id = oauth.getClient_id();
-                    client_secret = oauth.getClient_secret();
-
-                    SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
-                    SharedPreferences.Editor editor = sharedpreferences.edit();
-                    editor.putString(Helper.CLIENT_ID, client_id);
-                    editor.putString(Helper.CLIENT_SECRET, client_secret);
-                    editor.apply();
-                    OauthParams oauthParams = new OauthParams();
-                    oauthParams.setClient_id(client_id);
-                    oauthParams.setClient_secret(client_secret);
-                    oauthParams.setGrant_type("password");
-                    oauthParams.setScope("user");
-                    oauthParams.setUsername(binding.loginUid.getText().toString().trim());
-                    if (binding.loginPasswd.getText() != null) {
-                        oauthParams.setPassword(binding.loginPasswd.getText().toString());
+                    instance = HelperInstance.getLiveInstance(LoginActivity.this);
+                } else {
+                    if (binding.loginInstance.getText() == null || binding.loginInstance.getText().toString().trim().length() == 0) {
+                        Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
+                        binding.loginButton.setEnabled(true);
+                        return;
                     }
+                    instance = binding.loginInstance.getText().toString().trim().toLowerCase();
+                }
+
+                if (instance.startsWith("http")) {
                     try {
-                        Token token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);
-                        proceedLogin(token, finalHost);
-                    } catch (final Exception | Error e) {
-                        oauthParams.setUsername(binding.loginUid.getText().toString().toLowerCase().trim());
-                        try {
-                            Token token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);
-                            proceedLogin(token, finalHost);
-                        } catch (Error error) {
-                            Error.displayError(LoginActivity.this, error);
-                            error.printStackTrace();
-                            runOnUiThread(() -> binding.loginButton.setEnabled(true));
-                        }
+                        URL url = new URL(instance);
+                        instance = url.getHost();
+                    } catch (MalformedURLException e) {
+                        e.printStackTrace();
                     }
-                }).start();
+                } else if (instance.endsWith("/")) {
+                    try {
+                        URL url = new URL("https://" + instance);
+                        instance = url.getHost();
+                    } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                    }
+                }
+                if (!Patterns.WEB_URL.matcher("https://" + instance).matches()) {
+                    Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
+                    binding.loginButton.setEnabled(true);
+                    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();
+                }
             }
-
         });
     }
 
+    /**
+     * Oauth process for Peertube
+     *
+     * @param finalInstance String
+     */
+    private void connectToFediverse(String finalInstance, WellKnownNodeinfo.NodeInfo instanceNodeInfo) {
+        Oauth oauth = null;
+        String software;
+        if (instanceNodeInfo != null) {
+            software = instanceNodeInfo.getSoftware().getName().toUpperCase().trim();
+            switch (software) {
+                case "MASTODON":
+                case "PLEROMA":
+                    oauth = new RetrofitMastodonAPI(LoginActivity.this, finalInstance, null).oauthClient(Helper.CLIENT_NAME_VALUE, Helper.REDIRECT_CONTENT_WEB, Helper.OAUTH_SCOPES_MASTODON, Helper.WEBSITE_VALUE);
+                    break;
+
+                case "FRIENDICA":
+
+                    break;
+
+                default:
+                    oauth = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).oauthClient(Helper.CLIENT_NAME_VALUE, Helper.WEBSITE_VALUE, Helper.OAUTH_SCOPES_PEERTUBE, Helper.WEBSITE_VALUE);
+            }
+        } else {
+            oauth = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).oauthClient(Helper.CLIENT_NAME_VALUE, Helper.WEBSITE_VALUE, Helper.OAUTH_SCOPES_PEERTUBE, Helper.WEBSITE_VALUE);
+            software = "PEERTUBE";
+        }
+        if (oauth == null) {
+            runOnUiThread(() -> {
+                binding.loginButton.setEnabled(true);
+                Toasty.error(LoginActivity.this, getString(R.string.client_error), Toast.LENGTH_LONG).show();
+            });
+            return;
+        }
+        client_id = oauth.getClient_id();
+        client_secret = oauth.getClient_secret();
+
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedpreferences.edit();
+        editor.putString(Helper.CLIENT_ID, client_id);
+        editor.putString(Helper.CLIENT_SECRET, client_secret);
+        editor.apply();
+        OauthParams oauthParams = new OauthParams();
+        oauthParams.setClient_id(client_id);
+        oauthParams.setClient_secret(client_secret);
+        oauthParams.setGrant_type("password");
+        final boolean isMastodonAPI = software.compareTo("MASTODON") == 0 || software.compareTo("PLEROMA") == 0;
+        if (software.compareTo("PEERTUBE") == 0) {
+            oauthParams.setScope("user");
+        } else if (isMastodonAPI) {
+            oauthParams.setScope("read write follow");
+        }
+        if (binding.loginUid.getText() != null) {
+            oauthParams.setUsername(binding.loginUid.getText().toString().trim());
+        }
+        if (binding.loginPasswd.getText() != null) {
+            oauthParams.setPassword(binding.loginPasswd.getText().toString());
+        }
+        try {
+            Token token = null;
+            if (software.compareTo("PEERTUBE") == 0) {
+                token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);
+            } else if (isMastodonAPI) {
+                Intent i = new Intent(LoginActivity.this, MastodonWebviewConnectActivity.class);
+                i.putExtra("software", software);
+                i.putExtra("instance", finalInstance);
+                i.putExtra("client_id", client_id);
+                i.putExtra("client_secret", client_secret);
+                startActivity(i);
+                return;
+            }
+            proceedLogin(token, finalInstance, software.compareTo("PEERTUBE") == 0 ? null : software);
+        } catch (final Exception | Error e) {
+            oauthParams.setUsername(binding.loginUid.getText().toString().toLowerCase().trim());
+            try {
+                if (software.compareTo("PEERTUBE") == 0) {
+                    Token token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);
+                    proceedLogin(token, finalInstance, software.compareTo("PEERTUBE") == 0 ? null : software);
+                }
+            } catch (Error error) {
+                Error.displayError(LoginActivity.this, error);
+                error.printStackTrace();
+                runOnUiThread(() -> binding.loginButton.setEnabled(true));
+            }
+        }
+    }
+
+
     @SuppressLint("ApplySharedPref")
-    private void proceedLogin(Token token, String host) {
+    private void proceedLogin(Token token, String host, String software) {
         runOnUiThread(() -> {
             if (token != null) {
+                boolean remote_account = software != null && software.toUpperCase().trim().compareTo("PEERTUBE") != 0;
                 SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedpreferences.edit();
                 editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token.getAccess_token());
-                editor.putString(Helper.PREF_INSTANCE, host);
+                editor.putString(Helper.PREF_SOFTWARE, remote_account ? software : null);
+                editor.putString(Helper.PREF_REMOTE_INSTANCE, remote_account ? host : null);
+                if (!remote_account) {
+                    editor.putString(Helper.PREF_INSTANCE, host);
+                }
                 editor.commit();
                 //Update the account with the token;
-                updateCredential(LoginActivity.this, token.getAccess_token(), client_id, client_secret, token.getRefresh_token(), host);
+                updateCredential(LoginActivity.this, token.getAccess_token(), client_id, client_secret, token.getRefresh_token(), host, software);
             } else {
                 binding.loginButton.setEnabled(true);
             }

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

@@ -16,19 +16,21 @@ package app.fedilab.fedilabtube;
 
 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;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -39,14 +41,28 @@ import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 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;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 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;
@@ -55,6 +71,7 @@ import java.util.regex.Pattern;
 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.Error;
 import app.fedilab.fedilabtube.client.entities.OauthParams;
 import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
@@ -62,9 +79,12 @@ import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.client.entities.UserSettings;
 import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
+import app.fedilab.fedilabtube.databinding.ActivityMainBinding;
 import app.fedilab.fedilabtube.fragment.DisplayOverviewFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
+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.services.RetrieveInfoService;
@@ -73,63 +93,78 @@ 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.academies;
+import static app.fedilab.fedilabtube.helper.Helper.isLoggedInType;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
-public class MainActivity extends AppCompatActivity {
 
-    public static PeertubeInformation peertubeInformation;
+public class MainActivity extends AppCompatActivity implements ChromeCastsListener {
+
 
     public static int PICK_INSTANCE = 5641;
     public static int PICK_INSTANCE_SURF = 5642;
     public static UserMe userMe;
+    public static InstanceData.InstanceConfig instanceConfig;
     public static TypeOfConnection typeOfConnection;
-    final FragmentManager fm = getSupportFragmentManager();
-    Fragment active;
+    public static List<ChromeCast> chromeCasts;
+    public static ChromeCast chromeCast;
+    public static boolean chromecastActivated = false;
     private DisplayVideosFragment recentFragment, locaFragment, trendingFragment, subscriptionFragment, mostLikedFragment;
     private DisplayOverviewFragment overviewFragment;
+    private ActivityMainBinding binding;
     private final BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = item -> {
-        DisplayVideosFragment displayVideosFragment = null;
         int itemId = item.getItemId();
-        if (itemId == R.id.navigation_subscription) {
-            displayVideosFragment = subscriptionFragment;
+        String type = null;
+        if (itemId == R.id.navigation_discover) {
+            setTitleCustom(R.string.title_discover);
+            binding.viewpager.setCurrentItem(0);
+            type = HelperAcadInstance.DISCOVER;
+        } else if (itemId == R.id.navigation_subscription) {
+            binding.viewpager.setCurrentItem(1);
             setTitleCustom(R.string.subscriptions);
+            type = HelperAcadInstance.SUBSCRIPTIONS;
         } else if (itemId == R.id.navigation_trending) {
             setTitleCustom(R.string.title_trending);
-            displayVideosFragment = trendingFragment;
+            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);
-            displayVideosFragment = mostLikedFragment;
+            binding.viewpager.setCurrentItem(2);
+            type = HelperAcadInstance.MOSTLIKED;
         } else if (itemId == R.id.navigation_recently_added) {
             setTitleCustom(R.string.title_recently_added);
-            displayVideosFragment = recentFragment;
+            binding.viewpager.setCurrentItem(3);
+            type = HelperAcadInstance.RECENTLY_ADDED;
         } else if (itemId == R.id.navigation_local) {
             setTitleCustom(R.string.title_local);
-            displayVideosFragment = locaFragment;
-        } else if (itemId == R.id.navigation_discover) {
-            setTitleCustom(R.string.title_discover);
-            fm.beginTransaction().hide(active).show(overviewFragment).commit();
-            active = overviewFragment;
-            return true;
+            binding.viewpager.setCurrentItem(4);
+            type = HelperAcadInstance.LOCAL;
         }
-        if (displayVideosFragment != null) {
-            fm.beginTransaction().hide(active).show(displayVideosFragment).commit();
-            active = displayVideosFragment;
-            return true;
-        } else {
-            return false;
+        if (type != null) {
+            Matomo.sendScreen(MainActivity.this, "TIMELINE", type);
         }
+        return true;
     };
+    private BroadcastReceiver manage_chromecast;
+    private VideoData.Video castedTube;
 
     @SuppressLint("ApplySharedPref")
     public static void showRadioButtonDialogFullInstances(Activity activity, boolean storeInDb) {
         final SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         AlertDialog.Builder alt_bld = new AlertDialog.Builder(activity);
         alt_bld.setTitle(R.string.instance_choice);
-        String instance = Helper.getLiveInstance(activity);
+        String instance = HelperInstance.getLiveInstance(activity);
         final EditText input = new EditText(activity);
         LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
@@ -141,6 +176,12 @@ public class MainActivity extends AppCompatActivity {
                 (dialog, which) -> new Thread(() -> {
                     try {
                         String newInstance = input.getText().toString().trim();
+                        if (!newInstance.startsWith("http")) {
+                            newInstance = "http://" + newInstance;
+                        }
+                        URL url = new URL(newInstance);
+                        newInstance = url.getHost();
+
                         WellKnownNodeinfo.NodeInfo instanceNodeInfo = new RetrofitPeertubeAPI(activity, newInstance, null).getNodeInfo();
                         if (instanceNodeInfo.getSoftware() != null && instanceNodeInfo.getSoftware().getName().trim().toLowerCase().compareTo("peertube") == 0) {
                             SharedPreferences.Editor editor = sharedpreferences.edit();
@@ -186,44 +227,142 @@ public class MainActivity extends AppCompatActivity {
     private void setTitleCustom(int titleRId) {
         Toolbar toolbar = findViewById(R.id.toolbar);
         TextView mTitle = toolbar.findViewById(R.id.toolbar_title);
-        mTitle.setText(getString(titleRId));
+        if (mTitle != null) {
+            mTitle.setText(getString(titleRId));
+        }
     }
 
+    @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) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+        ChromeCastsListener chromeCastsListener = this;
+        ChromeCasts.registerListener(chromeCastsListener);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         typeOfConnection = TypeOfConnection.UNKNOWN;
 
-        BottomNavigationView navView = findViewById(R.id.nav_view);
 
-        navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
+        binding.navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayShowTitleEnabled(false);
         }
         checkIfConnectedUsers();
 
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag("5");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("4");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("3");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("2");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("1");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-
         recentFragment = new DisplayVideosFragment();
         Bundle bundle = new Bundle();
         bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.RECENT);
@@ -250,102 +389,53 @@ public class MainActivity extends AppCompatActivity {
         mostLikedFragment.setArguments(bundle);
 
         overviewFragment = new DisplayOverviewFragment();
-
-        if (active == null) {
-            active = overviewFragment;
-        }
-
-
         if (!Helper.isLoggedIn(MainActivity.this)) {
-            fm.beginTransaction().add(R.id.nav_host_fragment, locaFragment, "5").hide(locaFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, recentFragment, "4").hide(recentFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, mostLikedFragment, "3").hide(mostLikedFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, trendingFragment, "2").hide(trendingFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, overviewFragment, "1").commit();
+            PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+            binding.viewpager.setAdapter(mPagerAdapter);
         }
+        binding.viewpager.setOffscreenPageLimit(5);
+
+        Matomo.sendEvent(MainActivity.this, "UTILISATEUR", "DEMARRAGE", HelperInstance.getLiveInstance(MainActivity.this), Helper.isLoggedIn(MainActivity.this) ? 1 : 0);
+
+
+        binding.viewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                MenuItem item = binding.navView.getMenu().getItem(position);
+                binding.navView.setSelectedItemId(item.getItemId());
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+
+
         toolbar.setOnClickListener(v -> {
-            if (active instanceof DisplayVideosFragment) {
-                ((DisplayVideosFragment) active).scrollToTop();
-            } else if (active instanceof DisplayOverviewFragment) {
-                ((DisplayOverviewFragment) active).scrollToTop();
+            if (binding.viewpager.getAdapter() == null) {
+                return;
+            }
+            if (binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem()) instanceof DisplayVideosFragment) {
+                ((DisplayVideosFragment) binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem())).scrollToTop();
+            } else if (binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem()) instanceof DisplayOverviewFragment) {
+                ((DisplayOverviewFragment) binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem())).scrollToTop();
             }
         });
 
         setTitleCustom(R.string.title_discover);
 
         if (Helper.isLoggedIn(MainActivity.this)) {
-
-            navView.inflateMenu(R.menu.bottom_nav_menu_connected);
-            new Thread(() -> {
-                final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                String tokenStr = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-                String instance = Helper.getLiveInstance(MainActivity.this);
-                SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                String instanceShar = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
-                String userIdShar = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-                Account account = new AccountDAO(MainActivity.this, db).getAccountByToken(tokenStr);
-                if (account == null) {
-                    account = new AccountDAO(MainActivity.this, db).getAccountByIdInstance(userIdShar, instanceShar);
-                }
-                if (account != null) {
-                    Account finalAccount = account;
-                    OauthParams oauthParams = new OauthParams();
-                    oauthParams.setGrant_type("refresh_token");
-                    oauthParams.setClient_id(account.getClient_id());
-                    oauthParams.setClient_secret(account.getClient_secret());
-                    oauthParams.setRefresh_token(account.getRefresh_token());
-                    oauthParams.setAccess_token(account.getToken());
-                    try {
-                        Token token = new RetrofitPeertubeAPI(MainActivity.this).manageToken(oauthParams);
-                        if (token == null && Helper.instanceOnline(instance)) {
-                            runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, finalAccount));
-                            return;
-                        } else if (token == null) {
-                            return;
-                        }
-                        runOnUiThread(() -> {
-                            //To avoid a token issue with subscriptions, adding fragment is done when the token is refreshed.
-                            new Handler().post(() -> {
-                                fm.beginTransaction().add(R.id.nav_host_fragment, locaFragment, "5").hide(locaFragment).commit();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, recentFragment, "4").hide(recentFragment).commitAllowingStateLoss();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, trendingFragment, "3").hide(trendingFragment).commitAllowingStateLoss();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, subscriptionFragment, "2").hide(subscriptionFragment).commitAllowingStateLoss();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, overviewFragment, "1").commitAllowingStateLoss();
-                            });
-                        });
-
-                        userMe = new RetrofitPeertubeAPI(MainActivity.this, instance, token.getAccess_token()).verifyCredentials();
-                        if (userMe != null && userMe.getAccount() != null) {
-                            new AccountDAO(MainActivity.this, db).updateAccount(userMe.getAccount());
-                            SharedPreferences.Editor editor = sharedpreferences.edit();
-                            editor.putString(Helper.PREF_KEY_ID, account.getId());
-                            editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
-                            editor.putBoolean(getString(R.string.set_autoplay_choice), userMe.isAutoPlayVideo());
-                            editor.putBoolean(getString(R.string.set_store_in_history), userMe.isVideosHistoryEnabled());
-                            editor.putBoolean(getString(R.string.set_autoplay_next_video_choice), userMe.isAutoPlayNextVideo());
-                            editor.putString(getString(R.string.set_video_sensitive_choice), userMe.getNsfwPolicy());
-                            //Sync languages from server
-                            List<String> videoLanguageServer = userMe.getVideoLanguages();
-                            if (videoLanguageServer != null) {
-                                Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
-                                videoLanguageServerSet.addAll(videoLanguageServer);
-                                Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
-                                if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
-                                    videoLanguageServer.addAll(videoLanguageLocal);
-                                }
-                                editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
-                                editor.apply();
-                            }
-                        }
-                    } catch (Error error) {
-                        runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, finalAccount));
-                        error.printStackTrace();
-                    }
-                }
-            }).start();
+            binding.navView.inflateMenu(R.menu.bottom_nav_menu_connected);
+            refreshToken();
 
         } else {
-            navView.inflateMenu(R.menu.bottom_nav_menu);
+            binding.navView.inflateMenu(R.menu.bottom_nav_menu);
         }
         peertubeInformation = new PeertubeInformation();
         peertubeInformation.setCategories(new LinkedHashMap<>());
@@ -363,6 +453,100 @@ public class MainActivity extends AppCompatActivity {
         if (!BuildConfig.full_instances) {
             PlaylistExportHelper.manageIntentUrl(MainActivity.this, getIntent());
         }
+
+        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);
+        if (search_cast == 1) {
+            discoverCast();
+        }
+    }
+
+    public DisplayVideosFragment getSubscriptionFragment() {
+        return subscriptionFragment;
     }
 
     private void startInForeground() {
@@ -374,6 +558,88 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    private void refreshToken() {
+        new Thread(() -> {
+            final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+            String tokenStr = Helper.getToken(MainActivity.this);
+            String instance = HelperInstance.getLiveInstance(MainActivity.this);
+            SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+            String instanceShar = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
+            String userIdShar = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+            Account account = new AccountDAO(MainActivity.this, db).getAccountByToken(tokenStr);
+            if (account == null) {
+                account = new AccountDAO(MainActivity.this, db).getAccountByIdInstance(userIdShar, instanceShar);
+            }
+            if (account != null) {
+                Account finalAccount = account;
+                OauthParams oauthParams = new OauthParams();
+                oauthParams.setGrant_type("refresh_token");
+                oauthParams.setClient_id(account.getClient_id());
+                oauthParams.setClient_secret(account.getClient_secret());
+                oauthParams.setRefresh_token(account.getRefresh_token());
+                oauthParams.setAccess_token(account.getToken());
+                try {
+                    Token token = new RetrofitPeertubeAPI(MainActivity.this).manageToken(oauthParams);
+                    if (token == null) {
+                        return;
+                    }
+                    runOnUiThread(() -> {
+                        //To avoid a token issue with subscriptions, adding fragment is done when the token is refreshed.
+                        new Handler().post(() -> {
+                            if (Helper.isLoggedIn(MainActivity.this)) {
+                                PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+                                binding.viewpager.setAdapter(mPagerAdapter);
+                            }
+                        });
+                    });
+
+                    userMe = new RetrofitPeertubeAPI(MainActivity.this, instance, token.getAccess_token()).verifyCredentials();
+                    if (userMe != null && userMe.getAccount() != null) {
+                        new AccountDAO(MainActivity.this, db).updateAccount(userMe.getAccount());
+                        SharedPreferences.Editor editor = sharedpreferences.edit();
+                        editor.putString(Helper.PREF_KEY_ID, account.getId());
+                        editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
+                        editor.putBoolean(getString(R.string.set_autoplay_choice), userMe.isAutoPlayVideo());
+                        editor.putBoolean(getString(R.string.set_store_in_history), userMe.isVideosHistoryEnabled());
+                        editor.putBoolean(getString(R.string.set_autoplay_next_video_choice), userMe.isAutoPlayNextVideo());
+                        editor.putString(getString(R.string.set_video_sensitive_choice), userMe.getNsfwPolicy());
+                        //Sync languages from server
+                        List<String> videoLanguageServer = userMe.getVideoLanguages();
+                        if (videoLanguageServer != null) {
+                            Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
+                            videoLanguageServerSet.addAll(videoLanguageServer);
+                            Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
+                            if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
+                                videoLanguageServer.addAll(videoLanguageLocal);
+                            }
+                            editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
+                            editor.apply();
+                        }
+                    }
+                    instanceConfig = new RetrofitPeertubeAPI(MainActivity.this).getConfigInstance();
+                } catch (Error error) {
+                    runOnUiThread(() -> {
+                        AlertDialog.Builder alt_bld = new AlertDialog.Builder(this);
+                        alt_bld.setTitle(R.string.refresh_token_failed);
+                        alt_bld.setMessage(R.string.refresh_token_failed_message);
+                        alt_bld.setNegativeButton(R.string.action_logout, (dialog, id) -> {
+                            dialog.dismiss();
+                            Helper.logoutCurrentUser(MainActivity.this, finalAccount);
+                        });
+                        alt_bld.setPositiveButton(R.string._retry, (dialog, id) -> {
+                            dialog.dismiss();
+                            refreshToken();
+                        });
+                        AlertDialog alert = alt_bld.create();
+                        alert.show();
+
+                    });
+                    error.printStackTrace();
+                }
+            }
+        }).start();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(@NotNull Menu menu) {
         getMenuInflater().inflate(R.menu.main_menu, menu);
@@ -383,7 +649,7 @@ public class MainActivity extends AppCompatActivity {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-                Pattern link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
+                Pattern link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})(\\?start=(\\d+[hH])?(\\d+[mM])?(\\d+[sS])?)?$");
                 Matcher matcherLink = link.matcher(query.trim());
                 if (matcherLink.find()) {
                     Intent intent = new Intent(MainActivity.this, PeertubeActivity.class);
@@ -422,18 +688,17 @@ public class MainActivity extends AppCompatActivity {
         MenuItem instanceItem = menu.findItem(R.id.action_change_instance);
         MenuItem accountItem = menu.findItem(R.id.action_account);
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        ImageView instances = toolbar.findViewById(R.id.instances);
-        if (BuildConfig.full_instances && ((Helper.isLoggedIn(MainActivity.this) && typeOfConnection == NORMAL) || typeOfConnection == SURFING)) {
-            instances.setVisibility(View.VISIBLE);
-            instances.setOnClickListener(null);
-            instances.setOnClickListener(v -> {
+
+        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 {
-            instances.setVisibility(View.GONE);
+            binding.instances.setVisibility(View.GONE);
         }
         switch (typeOfConnection) {
             case UNKNOWN:
@@ -447,6 +712,7 @@ public class MainActivity extends AppCompatActivity {
                 mostLikedItem.setVisible(false);
                 incognitoItem.setVisible(false);
                 break;
+            case REMOTE_ACCOUNT:
             case NORMAL:
                 accountItem.setVisible(true);
                 if (Helper.isLoggedIn(MainActivity.this)) {
@@ -485,18 +751,22 @@ public class MainActivity extends AppCompatActivity {
                 break;
         }
 
+        if (!BuildConfig.instance_switcher) {
+            instanceItem.setVisible(false);
+        }
 
-        if (!BuildConfig.full_instances) {
+        if (!BuildConfig.sepia_search) {
             sepiaSearchItem.setVisible(false);
         }
         return true;
     }
 
+
     private void checkIfConnectedUsers() {
         new Thread(() -> {
             try {
                 typeOfConnection = NORMAL;
-                if (!Helper.isLoggedIn(MainActivity.this)) {
+                if (!Helper.canMakeAction(MainActivity.this)) {
                     SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                     List<Account> accounts = new AccountDAO(MainActivity.this, db).getAllAccount();
                     if (accounts != null && accounts.size() > 0) {
@@ -514,13 +784,16 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        String type = null;
+        String action = "TIMELINE";
         if (item.getItemId() == R.id.action_change_instance) {
             if (BuildConfig.full_instances) {
                 showRadioButtonDialogFullInstances(MainActivity.this, false);
             } else {
                 showRadioButtonDialog();
             }
-            return true;
+            action = "CHANGE_INSTANCE";
+            type = "";
         } else if (item.getItemId() == R.id.action_settings) {
             Intent intent = new Intent(MainActivity.this, SettingsActivity.class);
             startActivity(intent);
@@ -529,39 +802,37 @@ public class MainActivity extends AppCompatActivity {
             if (typeOfConnection == SURFING) {
                 SwitchAccountHelper.switchDialog(MainActivity.this, false);
             } else {
-                if (Helper.isLoggedIn(MainActivity.this)) {
+                if (Helper.canMakeAction(MainActivity.this)) {
                     intent = new Intent(MainActivity.this, AccountActivity.class);
                 } else {
                     intent = new Intent(MainActivity.this, LoginActivity.class);
                 }
                 startActivity(intent);
             }
-            return true;
         } else if (item.getItemId() == R.id.action_upload) {
             Intent intent = new Intent(MainActivity.this, PeertubeUploadActivity.class);
             startActivity(intent);
-            return true;
         } else if (item.getItemId() == R.id.action_myvideos) {
             Intent intent = new Intent(MainActivity.this, VideosTimelineActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", TimelineVM.TimelineType.MY_VIDEOS);
             intent.putExtras(bundle);
             startActivity(intent);
-            return true;
+            type = HelperAcadInstance.MYVIDEOS;
         } else if (item.getItemId() == R.id.action_history) {
             Intent intent = new Intent(MainActivity.this, VideosTimelineActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", TimelineVM.TimelineType.HISTORY);
             intent.putExtras(bundle);
             startActivity(intent);
-            return true;
+            type = HelperAcadInstance.HISTORY;
         } else if (item.getItemId() == R.id.action_most_liked) {
             Intent intent = new Intent(MainActivity.this, VideosTimelineActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", TimelineVM.TimelineType.MOST_LIKED);
             intent.putExtras(bundle);
             startActivity(intent);
-            return true;
+            type = HelperAcadInstance.MOSTLIKED;
         } else if (item.getItemId() == R.id.action_playlist) {
             Intent intent;
             if (Helper.isLoggedIn(MainActivity.this)) {
@@ -570,15 +841,12 @@ public class MainActivity extends AppCompatActivity {
                 intent = new Intent(MainActivity.this, AllLocalPlaylistsActivity.class);
             }
             startActivity(intent);
-            return true;
         } else if (item.getItemId() == R.id.action_sepia_search) {
             Intent intent = new Intent(MainActivity.this, SepiaSearchActivity.class);
             startActivity(intent);
-            return true;
         } else if (item.getItemId() == R.id.action_about) {
             Intent intent = new Intent(MainActivity.this, AboutActivity.class);
             startActivity(intent);
-            return true;
         } else if (item.getItemId() == R.id.action_incognito) {
             item.setChecked(!item.isChecked());
             final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -597,17 +865,12 @@ public class MainActivity extends AppCompatActivity {
             }).start();
             return false;
         }
-
-        return super.onOptionsItemSelected(item);
+        if (type != null) {
+            Matomo.sendScreen(MainActivity.this, action, type);
+        }
+        return true;
     }
 
-    public void setActive(DisplayVideosFragment displayVideosFragment) {
-        this.active = displayVideosFragment;
-    }
-
-    public void setSubscriptionFragment(DisplayVideosFragment displayVideosFragment) {
-        this.subscriptionFragment = displayVideosFragment;
-    }
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -631,16 +894,25 @@ public class MainActivity extends AppCompatActivity {
         AlertDialog.Builder alt_bld = new AlertDialog.Builder(this);
         alt_bld.setTitle(R.string.instance_choice);
         final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        String acad = Helper.getLiveInstance(MainActivity.this);
+        String acad = HelperInstance.getLiveInstance(MainActivity.this);
         int i = 0;
-        for (String item : academies) {
-            if (Helper.getPeertubeUrl(item).compareTo(acad) == 0) {
-                break;
+        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()];
+        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) {
+                position = i;
             }
+            it.remove();
             i++;
         }
-        alt_bld.setSingleChoiceItems(academies, i, (dialog, item) -> {
-            String newInstance = academies[item];
+        alt_bld.setSingleChoiceItems(academiesKey, position, (dialog, item) -> {
+            String newInstance = academiesValue[item];
             SharedPreferences.Editor editor = sharedpreferences.edit();
             editor.putString(Helper.PREF_INSTANCE, newInstance);
             editor.commit();
@@ -662,15 +934,60 @@ public class MainActivity extends AppCompatActivity {
                 SharedPreferences.Editor editor = sharedpreferences.edit();
                 editor.putString(Helper.PREF_INSTANCE, String.valueOf(data.getData()));
                 editor.commit();
-                finish();
+                recreate();
             }
         }
     }
 
-
     public enum TypeOfConnection {
         UNKNOWN,
         NORMAL,
-        SURFING
+        SURFING,
+        REMOTE_ACCOUNT,
+    }
+
+    private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+
+        ScreenSlidePagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NotNull
+        @Override
+        public Fragment getItem(final int position) {
+            if (Helper.isLoggedIn(MainActivity.this)) {
+                switch (position) {
+                    case 0:
+                        return overviewFragment;
+                    case 1:
+                        return subscriptionFragment;
+                    case 2:
+                        return trendingFragment;
+                    case 3:
+                        return recentFragment;
+                    case 4:
+                        return locaFragment;
+                }
+            } else {
+                switch (position) {
+                    case 0:
+                        return overviewFragment;
+                    case 1:
+                        return trendingFragment;
+                    case 2:
+                        return mostLikedFragment;
+                    case 3:
+                        return recentFragment;
+                    case 4:
+                        return locaFragment;
+                }
+            }
+            return overviewFragment;
+        }
+
+        @Override
+        public int getCount() {
+            return 5;
+        }
     }
 }

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

@@ -0,0 +1,194 @@
+/* Copyright 2020 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>. */
+
+package app.fedilab.fedilabtube;
+
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+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.WebView;
+import android.webkit.WebViewClient;
+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.client.entities.Error;
+import app.fedilab.fedilabtube.client.entities.OauthParams;
+import app.fedilab.fedilabtube.client.entities.Token;
+import app.fedilab.fedilabtube.helper.Helper;
+import es.dmoral.toasty.Toasty;
+
+
+public class MastodonWebviewConnectActivity extends AppCompatActivity {
+
+
+    private WebView webView;
+    private AlertDialog alert;
+    private String clientId, clientSecret;
+    private String instance, software;
+
+    @SuppressWarnings("deprecation")
+    public static void clearCookies(Context context) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            CookieManager.getInstance().removeAllCookies(null);
+            CookieManager.getInstance().flush();
+        } else {
+            CookieSyncManager cookieSyncMngr = CookieSyncManager.createInstance(context);
+            cookieSyncMngr.startSync();
+            CookieManager cookieManager = CookieManager.getInstance();
+            cookieManager.removeAllCookie();
+            cookieManager.removeSessionCookie();
+            cookieSyncMngr.stopSync();
+            cookieSyncMngr.sync();
+        }
+    }
+
+    private static String redirectUserToAuthorizeAndLogin(String clientId, String instance) {
+        String queryString = Helper.CLIENT_ID + "=" + clientId;
+        queryString += "&" + Helper.REDIRECT_URI + "=" + Uri.encode(Helper.REDIRECT_CONTENT_WEB);
+        queryString += "&response_type=code";
+        queryString += "&scope=read write follow";
+        return "https://" + instance + "/oauth/authorize?" + queryString;
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_webview_connect);
+        Bundle b = getIntent().getExtras();
+        if (b != null) {
+            instance = b.getString("instance");
+            clientId = b.getString("client_id");
+            clientSecret = b.getString("client_secret");
+            software = b.getString("software");
+        }
+        if (instance == null)
+            finish();
+        if (getSupportActionBar() != null)
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        setTitle(R.string.login);
+        webView = findViewById(R.id.webviewConnect);
+        clearCookies(MastodonWebviewConnectActivity.this);
+        webView.getSettings().setJavaScriptEnabled(true);
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
+        } else {
+            CookieManager.getInstance().setAcceptCookie(true);
+        }
+
+        final ProgressBar pbar = findViewById(R.id.progress_bar);
+        webView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int progress) {
+                if (progress < 100 && pbar.getVisibility() == ProgressBar.GONE) {
+                    pbar.setVisibility(ProgressBar.VISIBLE);
+                }
+                pbar.setProgress(progress);
+                if (progress == 100) {
+                    pbar.setVisibility(ProgressBar.GONE);
+                }
+            }
+        });
+
+        if (instance == null) {
+            finish();
+        }
+        webView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                super.shouldOverrideUrlLoading(view, url);
+                if (url.contains(Helper.REDIRECT_CONTENT_WEB)) {
+                    String[] val = url.split("code=");
+                    if (val.length < 2) {
+                        Toasty.error(MastodonWebviewConnectActivity.this, getString(R.string.toast_code_error), Toast.LENGTH_LONG).show();
+                        Intent myIntent = new Intent(MastodonWebviewConnectActivity.this, LoginActivity.class);
+                        startActivity(myIntent);
+                        finish();
+                        return false;
+                    }
+                    String code = val[1];
+                    OauthParams oauthParams = new OauthParams();
+                    oauthParams.setClient_id(clientId);
+                    oauthParams.setClient_secret(clientSecret);
+                    oauthParams.setGrant_type("authorization_code");
+                    oauthParams.setCode(code);
+                    oauthParams.setRedirect_uri(Helper.REDIRECT_CONTENT_WEB);
+
+                    new Thread(() -> {
+                        try {
+                            Token token = new RetrofitMastodonAPI(MastodonWebviewConnectActivity.this, instance, null).manageToken(oauthParams);
+                            SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+                            SharedPreferences.Editor editor = sharedpreferences.edit();
+                            editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token.getAccess_token());
+                            editor.apply();
+                            new RetrofitMastodonAPI(MastodonWebviewConnectActivity.this, instance, token.getAccess_token()).updateCredential(MastodonWebviewConnectActivity.this, clientId, clientSecret, token.getRefresh_token(), software);
+                        } catch (Exception | Error ignored) {
+                        }
+                    }).start();
+                    return true;
+                }
+                return false;
+            }
+
+        });
+        webView.loadUrl(redirectUserToAuthorizeAndLogin(clientId, instance));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (webView != null && webView.canGoBack()) {
+            webView.goBack();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (alert != null) {
+            alert.dismiss();
+            alert = null;
+        }
+        if (webView != null) {
+            webView.destroy();
+        }
+    }
+}

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

@@ -16,21 +16,17 @@ package app.fedilab.fedilabtube;
 
 import android.Manifest;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Spinner;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
@@ -40,39 +36,34 @@ import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
 
-import net.gotev.uploadservice.MultipartUploadRequest;
-import net.gotev.uploadservice.ServerResponse;
-import net.gotev.uploadservice.UploadInfo;
-import net.gotev.uploadservice.UploadNotificationConfig;
-import net.gotev.uploadservice.UploadStatusDelegate;
-
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
+import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.data.VideoData.Video;
 import app.fedilab.fedilabtube.client.entities.Item;
 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.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 mabbas007.tagsedittext.TagsEditText;
 
-import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
 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 {
@@ -82,23 +73,21 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
     private final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 724;
     Item licenseToSend, privacyToSend, categoryToSend;
     ItemStr languageToSend;
-    private Button set_upload_submit;
-    private Spinner set_upload_privacy, set_upload_categories, set_upload_licenses, set_upload_languages, set_upload_channel;
-    private EditText p_video_title, p_video_description;
-    private TagsEditText p_video_tags;
-    private CheckBox set_upload_nsfw, set_upload_enable_comments;
     private LinkedHashMap<String, String> channels;
     private String videoId;
     private Channel channel;
-    private ImageView p_video_preview;
-    private Button set_preview;
     private VideoParams videoParams;
     private Video video;
     private String channelToSendId;
+    private ActivityPeertubeEditBinding binding;
+    private Uri inputData;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        binding = ActivityPeertubeEditBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
 
@@ -113,23 +102,8 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         }
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        setContentView(R.layout.activity_peertube_edit);
-        set_upload_submit = findViewById(R.id.set_upload_submit);
-        Button set_upload_delete = findViewById(R.id.set_upload_delete);
-        set_upload_privacy = findViewById(R.id.set_upload_privacy);
-        set_upload_channel = findViewById(R.id.set_upload_channel);
-        set_upload_categories = findViewById(R.id.set_upload_categories);
-        set_upload_licenses = findViewById(R.id.set_upload_licenses);
-        set_upload_languages = findViewById(R.id.set_upload_languages);
-        p_video_title = findViewById(R.id.p_video_title);
-        p_video_description = findViewById(R.id.p_video_description);
-        p_video_tags = findViewById(R.id.p_video_tags);
-        p_video_preview = findViewById(R.id.p_video_preview);
-        set_upload_nsfw = findViewById(R.id.set_upload_nsfw);
-        set_upload_enable_comments = findViewById(R.id.set_upload_enable_comments);
-        set_preview = findViewById(R.id.set_preview);
 
-        set_upload_delete.setOnClickListener(v -> {
+        binding.setUploadDelete.setOnClickListener(v -> {
             AlertDialog.Builder builderInner;
             builderInner = new AlertDialog.Builder(PeertubeEditUploadActivity.this);
             builderInner.setMessage(getString(R.string.delete_video_confirmation));
@@ -165,7 +139,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterCatgories = new ArrayAdapter<>(PeertubeEditUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, categoriesA);
-        set_upload_categories.setAdapter(adapterCatgories);
+        binding.setUploadCategories.setAdapter(adapterCatgories);
 
 
         //Populate licenses
@@ -183,7 +157,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterLicenses = new ArrayAdapter<>(PeertubeEditUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, licensesA);
-        set_upload_licenses.setAdapter(adapterLicenses);
+        binding.setUploadLicenses.setAdapter(adapterLicenses);
 
 
         //Populate languages
@@ -201,7 +175,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterLanguages = new ArrayAdapter<>(PeertubeEditUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, languagesA);
-        set_upload_languages.setAdapter(adapterLanguages);
+        binding.setUploadLanguages.setAdapter(adapterLanguages);
 
 
         //Populate languages
@@ -220,18 +194,19 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
 
         ArrayAdapter<String> adapterPrivacies = new ArrayAdapter<>(PeertubeEditUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, privaciesA);
-        set_upload_privacy.setAdapter(adapterPrivacies);
+        binding.setUploadPrivacy.setAdapter(adapterPrivacies);
 
 
         TimelineVM feedsViewModel = new ViewModelProvider(PeertubeEditUploadActivity.this).get(TimelineVM.class);
         feedsViewModel.getMyVideo(null, videoId).observe(PeertubeEditUploadActivity.this, this::manageVIewVideo);
+
         channels = new LinkedHashMap<>();
 
         setTitle(R.string.edit_video);
     }
 
     public void manageUpdate(APIResponse apiResponse) {
-        set_upload_submit.setEnabled(true);
+        binding.setUploadSubmit.setEnabled(true);
         if (apiResponse.getError() != null) {
             if (apiResponse.getError() != null && apiResponse.getError().getError() != null)
                 Toasty.error(PeertubeEditUploadActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
@@ -247,7 +222,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
                 Toasty.error(PeertubeEditUploadActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             else
                 Toasty.error(PeertubeEditUploadActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-            set_upload_submit.setEnabled(true);
+            binding.setUploadSubmit.setEnabled(true);
             return;
         }
 
@@ -263,11 +238,11 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         categoryToSend = video.getCategory();
 
         if (video.getThumbnailPath() != null) {
-            Helper.loadGiF(PeertubeEditUploadActivity.this, video.getThumbnailPath(), p_video_preview);
+            Helper.loadGiF(PeertubeEditUploadActivity.this, video.getThumbnailPath(), binding.pVideoPreview);
         }
 
 
-        set_preview.setOnClickListener(v -> {
+        binding.setPreview.setOnClickListener(v -> {
             if (ContextCompat.checkSelfPermission(PeertubeEditUploadActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) !=
                     PackageManager.PERMISSION_GRANTED) {
                 ActivityCompat.requestPermissions(PeertubeEditUploadActivity.this,
@@ -324,11 +299,28 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         boolean commentEnabled = video.isCommentsEnabled();
         boolean isNSFW = video.isNsfw();
 
-        set_upload_enable_comments.setChecked(commentEnabled);
-        set_upload_nsfw.setChecked(isNSFW);
+        binding.setUploadEnableComments.setChecked(commentEnabled);
+        binding.setUploadNsfw.setChecked(isNSFW);
 
-        p_video_title.setText(title);
-        p_video_description.setText(video.getDescription());
+        binding.pVideoTitle.setText(title);
+        binding.pVideoDescription.setText(video.getDescription());
+
+        new Thread(() -> {
+            try {
+                RetrofitPeertubeAPI api;
+                api = new RetrofitPeertubeAPI(PeertubeEditUploadActivity.this);
+                VideoData.Description description = api.getVideoDescription(video.getUuid());
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = () -> {
+                    if (description != null) {
+                        binding.pVideoDescription.setText(description.getDescription());
+                    }
+                };
+                mainHandler.post(myRunnable);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
 
         LinkedHashMap<Integer, String> categories = new LinkedHashMap<>(peertubeInformation.getCategories());
         LinkedHashMap<Integer, String> licences = new LinkedHashMap<>(peertubeInformation.getLicences());
@@ -382,7 +374,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
             }
         }
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadPrivacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updatePrivacyPosition(position);
@@ -393,7 +385,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
 
             }
         });
-        set_upload_licenses.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadLicenses.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateLicensePosition(position);
@@ -405,7 +397,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
             }
         });
         //Manage categories
-        set_upload_categories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadCategories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateCategoryPosition(position);
@@ -418,7 +410,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         });
 
         //Manage languages
-        set_upload_languages.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadLanguages.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateLanguagesPosition(position);
@@ -430,7 +422,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
             }
         });
         //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadChannel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
@@ -447,11 +439,11 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         Item finalLicenseToSend = licenseToSend;
         ItemStr finalLanguageToSend = languageToSend;
         Item finalPrivacyToSend = privacyToSend;
-        set_upload_submit.setOnClickListener(v -> {
-            String title1 = p_video_title.getText().toString().trim();
-            String description = p_video_description.getText().toString().trim();
-            boolean isNSFW1 = set_upload_nsfw.isChecked();
-            boolean commentEnabled1 = set_upload_enable_comments.isChecked();
+        binding.setUploadSubmit.setOnClickListener(v -> {
+            String title1 = binding.pVideoTitle.getText() != null ? binding.pVideoTitle.getText().toString().trim() : "";
+            String description = binding.pVideoDescription.getText() != null ? binding.pVideoDescription.getText().toString().trim() : "";
+            boolean isNSFW1 = binding.setUploadNsfw.isChecked();
+            boolean commentEnabled1 = binding.setUploadEnableComments.isChecked();
             videoParams = new VideoParams();
             videoParams.setName(title1);
             videoParams.setDescription(description);
@@ -460,28 +452,31 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
             videoParams.setCategory(finalCategoryToSend.getId());
             videoParams.setLicence(String.valueOf(finalLicenseToSend.getId()));
             videoParams.setLanguage(finalLanguageToSend.getId());
-
             videoParams.setChannelId(channelToSendId);
             videoParams.setPrivacy(finalPrivacyToSend.getId());
-            List<String> tags = p_video_tags.getTags();
+            List<String> tags = binding.pVideoTags.getTags();
+            if (tags.size() > 5) {
+                Toasty.error(PeertubeEditUploadActivity.this, getString(R.string.max_tag_size), Toast.LENGTH_LONG).show();
+                return;
+            }
             videoParams.setTags(tags);
-            set_upload_submit.setEnabled(false);
+            binding.setUploadSubmit.setEnabled(false);
             MyVideoVM myVideoVM = new ViewModelProvider(PeertubeEditUploadActivity.this).get(MyVideoVM.class);
-            myVideoVM.updateVideo(videoId, videoParams, null, null).observe(PeertubeEditUploadActivity.this, this::manageUpdate);
+            myVideoVM.updateVideo(videoId, videoParams, inputData, inputData).observe(PeertubeEditUploadActivity.this, this::manageUpdate);
         });
 
-        set_upload_privacy.setSelection(privacyPosition, false);
+        binding.setUploadPrivacy.setSelection(privacyPosition, false);
         updatePrivacyPosition(privacyPosition);
-        set_upload_languages.setSelection(languagePosition, false);
+        binding.setUploadLanguages.setSelection(languagePosition, false);
         updateLanguagesPosition(languagePosition);
-        set_upload_licenses.setSelection(licensePosition, false);
+        binding.setUploadLicenses.setSelection(licensePosition, false);
         updateLicensePosition(licensePosition);
-        set_upload_categories.setSelection(categoryPosition, false);
+        binding.setUploadCategories.setSelection(categoryPosition, false);
         updateCategoryPosition(categoryPosition);
 
         List<String> tags = video.getTags();
         if (tags != null && tags.size() > 0) {
-            p_video_tags.setTags(tags.toArray(new String[0]));
+            binding.pVideoTags.setTags(tags.toArray(new String[0]));
         }
     }
 
@@ -572,53 +567,12 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
                 Toasty.error(PeertubeEditUploadActivity.this, getString(R.string.toot_select_image_error), Toast.LENGTH_LONG).show();
                 return;
             }
-            UploadNotificationConfig uploadConfig = new UploadNotificationConfig();
-            uploadConfig.getCompleted().autoClear = true;
-            try {
-                SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-                Uri uri = data.getData();
-                try {
-                    String uploadId = UUID.randomUUID().toString();
-                    new MultipartUploadRequest(PeertubeEditUploadActivity.this, uploadId, "https://" + Helper.getLiveInstance(PeertubeEditUploadActivity.this) + "/api/v1/" + String.format("/videos/%s", video.getId()))
-                            .addFileToUpload(uri.toString().replace("file://", ""), "thumbnailfile")
-                            .setMethod("PUT")
-                            .addHeader("Authorization", "Bearer " + token)
-                            .setNotificationConfig(uploadConfig)
-                            .setMaxRetries(2)
-                            .setDelegate(new UploadStatusDelegate() {
-                                @Override
-                                public void onProgress(Context context, UploadInfo uploadInfo) {
-                                    // your code here
-                                }
-
-                                @Override
-                                public void onError(Context context, UploadInfo uploadInfo, ServerResponse serverResponse,
-                                                    Exception exception) {
-                                    Toasty.error(PeertubeEditUploadActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                }
-
-                                @Override
-                                public void onCompleted(Context context, UploadInfo uploadInfo, ServerResponse serverResponse) {
-                                    Glide.with(PeertubeEditUploadActivity.this)
-                                            .load(uri)
-                                            .into(p_video_preview);
-                                }
-
-                                @Override
-                                public void onCancelled(Context context, UploadInfo uploadInfo) {
-                                    // your code here
-                                }
-                            })
-                            .startUpload();
-                } catch (FileNotFoundException e) {
-                    Toasty.error(PeertubeEditUploadActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-            } catch (MalformedURLException e) {
-                Toasty.error(PeertubeEditUploadActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                e.printStackTrace();
-            }
+            inputData = data.getData();
+            Glide.with(PeertubeEditUploadActivity.this)
+                    .load(data.getData())
+                    .thumbnail(0.1f)
+                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
+                    .into(binding.pVideoPreview);
         }
     }
 
@@ -651,7 +605,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(PeertubeEditUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, channelName);
-        set_upload_channel.setAdapter(adapterChannel);
+        binding.setUploadChannel.setAdapter(adapterChannel);
         int channelPosition = 0;
         if (channels.containsKey(channel.getName())) {
             LinkedHashMap<String, String> channelsIterator = new LinkedHashMap<>(channels);
@@ -666,9 +620,15 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
                 channelPosition++;
             }
         }
-        set_upload_channel.setSelection(channelPosition, false);
+        binding.setUploadChannel.setSelection(channelPosition, false);
         updateUploadChannel(channelPosition);
-        set_upload_submit.setEnabled(true);
+        binding.setUploadSubmit.setEnabled(true);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
     }
 
     @SuppressWarnings({"unused", "RedundantSuppression"})

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

@@ -38,7 +38,8 @@ 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.Helper;
+import app.fedilab.fedilabtube.helper.HelperAcadInstance;
+import app.fedilab.fedilabtube.helper.HelperInstance;
 import es.dmoral.toasty.Toasty;
 
 import static app.fedilab.fedilabtube.MainActivity.PICK_INSTANCE;
@@ -49,6 +50,7 @@ public class PeertubeRegisterActivity extends AppCompatActivity {
     private String instance;
     private ActivityRegisterPeertubeBinding binding;
 
+    @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -61,7 +63,7 @@ public class PeertubeRegisterActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 
-        if (BuildConfig.full_instances) {
+        if (BuildConfig.full_instances && BuildConfig.instance_switcher) {
             binding.loginInstanceContainer.setVisibility(View.VISIBLE);
             binding.titleLoginInstance.setVisibility(View.VISIBLE);
         } else {
@@ -69,6 +71,10 @@ 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) {
                 Pattern patternUsername = Pattern.compile("^[a-z0-9._]{1,50}$");
@@ -129,7 +135,7 @@ public class PeertubeRegisterActivity extends AppCompatActivity {
             }
             String[] emailArray = binding.email.getText().toString().split("@");
             if (!BuildConfig.full_instances) {
-                if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) {
+                if (emailArray.length > 1 && !Arrays.asList(HelperAcadInstance.valideEmails).contains(emailArray[1])) {
                     Toasty.error(PeertubeRegisterActivity.this, getString(R.string.email_error_domain, emailArray[1])).show();
                     return;
                 }
@@ -157,8 +163,7 @@ public class PeertubeRegisterActivity extends AppCompatActivity {
                     }
                 });
             } else {
-                String host = emailArray[1];
-                instance = Helper.getPeertubeUrl(host);
+                instance = HelperInstance.getLiveInstance(PeertubeRegisterActivity.this);
             }
             if (instance != null) {
                 instance = instance.toLowerCase().trim();

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

@@ -21,46 +21,50 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.database.Cursor;
+import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.provider.OpenableColumns;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.documentfile.provider.DocumentFile;
 import androidx.lifecycle.ViewModelProvider;
 
-import net.gotev.uploadservice.MultipartUploadRequest;
-import net.gotev.uploadservice.UploadNotificationAction;
-import net.gotev.uploadservice.UploadNotificationConfig;
+import net.gotev.uploadservice.data.UploadNotificationAction;
+import net.gotev.uploadservice.data.UploadNotificationConfig;
+import net.gotev.uploadservice.data.UploadNotificationStatusConfig;
+import net.gotev.uploadservice.extensions.ContextExtensionsKt;
+import net.gotev.uploadservice.protocols.multipart.MultipartUploadRequest;
 
-import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
-import java.util.UUID;
 
 import app.fedilab.fedilabtube.client.APIResponse;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData;
+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.viewmodel.ChannelsVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
+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 {
@@ -68,16 +72,12 @@ public class PeertubeUploadActivity extends AppCompatActivity {
 
     public static final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 724;
     private final int PICK_IVDEO = 52378;
-    private Button set_upload_file, set_upload_submit;
-    private Spinner set_upload_privacy, set_upload_channel;
-    private TextView set_upload_file_name;
-    private EditText video_title;
     private HashMap<String, String> channels;
     private Uri uri;
     private String filename;
     private HashMap<Integer, String> privacyToSend;
     private HashMap<String, String> channelToSend;
-
+    private ActivityPeertubeUploadBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -86,14 +86,60 @@ public class PeertubeUploadActivity extends AppCompatActivity {
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        setContentView(R.layout.activity_peertube_upload);
+        binding = ActivityPeertubeUploadBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+
+
+        new Thread(() -> {
+            UserMe.VideoQuota videoQuotaReply = new RetrofitPeertubeAPI(PeertubeUploadActivity.this).getVideoQuota();
+            runOnUiThread(() -> {
+                if (videoQuotaReply != null) {
+                    long videoQuota = videoQuotaReply.getVideoQuotaUsed();
+                    long dailyQuota = videoQuotaReply.getVideoQuotaUsedDaily();
+                    long instanceVideoQuota = userMe.getVideoQuota();
+                    long instanceDailyQuota = userMe.getVideoQuotaDaily();
+
+                    if (instanceVideoQuota != -1 && instanceVideoQuota != 0) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.totalQuota.setProgress((int) (videoQuota * 100 / instanceVideoQuota), true);
+                        } else {
+                            binding.totalQuota.setProgress((int) (videoQuota * 100 / instanceVideoQuota));
+                        }
+                    } else {
+                        int progress = videoQuota > 0 ? 30 : 0;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.totalQuota.setProgress(progress, true);
+                        } else {
+                            binding.totalQuota.setProgress(progress);
+                        }
+                    }
+                    if (instanceDailyQuota != -1 && instanceDailyQuota != 0) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.dailyQuota.setProgress((int) (dailyQuota * 100 / instanceDailyQuota), true);
+                        } else {
+                            binding.dailyQuota.setProgress((int) (dailyQuota * 100 / instanceDailyQuota));
+                        }
+                    } else {
+                        int progress = dailyQuota > 0 ? 30 : 0;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.dailyQuota.setProgress(progress, true);
+                        } else {
+                            binding.dailyQuota.setProgress(progress);
+                        }
+                    }
+                    binding.totalQuotaValue.setText(
+                            String.format(Locale.getDefault(), "%s/%s",
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, videoQuota),
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, instanceVideoQuota)));
+                    binding.dailyQuotaValue.setText(
+                            String.format(Locale.getDefault(), "%s/%s",
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, dailyQuota),
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, instanceDailyQuota)));
+                }
+            });
+        }).start();
 
-        set_upload_file = findViewById(R.id.set_upload_file);
-        set_upload_file_name = findViewById(R.id.set_upload_file_name);
-        set_upload_channel = findViewById(R.id.set_upload_channel);
-        set_upload_privacy = findViewById(R.id.set_upload_privacy);
-        set_upload_submit = findViewById(R.id.set_upload_submit);
-        video_title = findViewById(R.id.video_title);
 
         ChannelsVM viewModelC = new ViewModelProvider(PeertubeUploadActivity.this).get(ChannelsVM.class);
         viewModelC.get(MY_CHANNELS, null).observe(PeertubeUploadActivity.this, this::manageVIewChannels);
@@ -109,33 +155,18 @@ public class PeertubeUploadActivity extends AppCompatActivity {
                 Toasty.error(PeertubeUploadActivity.this, getString(R.string.toot_select_image_error), Toast.LENGTH_LONG).show();
                 return;
             }
-            set_upload_submit.setEnabled(true);
-
+            binding.setUploadSubmit.setEnabled(true);
             uri = data.getData();
-
-            String uriString = uri.toString();
-            File myFile = new File(uriString);
             filename = null;
-            if (uriString.startsWith("content://")) {
-                Cursor cursor = null;
-                try {
-                    cursor = getContentResolver().query(uri, null, null, null, null);
-                    if (cursor != null && cursor.moveToFirst()) {
-                        filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
-                    }
-                } finally {
-                    assert cursor != null;
-                    cursor.close();
-                }
-            } else if (uriString.startsWith("file://")) {
-                filename = myFile.getName();
+            DocumentFile documentFile = DocumentFile.fromSingleUri(this, uri);
+            if (documentFile != null) {
+                filename = documentFile.getName();
             }
             if (filename == null) {
                 filename = new Date().toString();
             }
-            set_upload_file_name.setVisibility(View.VISIBLE);
-            set_upload_file_name.setText(filename);
-
+            binding.setUploadFileName.setVisibility(View.VISIBLE);
+            binding.setUploadFileName.setText(filename);
         }
     }
 
@@ -179,7 +210,7 @@ public class PeertubeUploadActivity extends AppCompatActivity {
         channelToSend.put(channelName[0], channelId[0]);
         ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(PeertubeUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, channelName);
-        set_upload_channel.setAdapter(adapterChannel);
+        binding.setUploadChannel.setAdapter(adapterChannel);
 
         if (peertubeInformation == null) {
             return;
@@ -209,10 +240,10 @@ public class PeertubeUploadActivity extends AppCompatActivity {
 
         ArrayAdapter<String> adapterPrivacies = new ArrayAdapter<>(PeertubeUploadActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, privaciesA);
-        set_upload_privacy.setAdapter(adapterPrivacies);
+        binding.setUploadPrivacy.setAdapter(adapterPrivacies);
 
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadPrivacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> privaciesCheck = new LinkedHashMap<>(peertubeInformation.getPrivacies());
@@ -235,9 +266,9 @@ public class PeertubeUploadActivity extends AppCompatActivity {
 
             }
         });
-        set_upload_file.setEnabled(true);
+        binding.setUploadFile.setEnabled(true);
 
-        set_upload_file.setOnClickListener(v -> {
+        binding.setUploadFile.setOnClickListener(v -> {
             if (ContextCompat.checkSelfPermission(PeertubeUploadActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) !=
                     PackageManager.PERMISSION_GRANTED) {
                 ActivityCompat.requestPermissions(PeertubeUploadActivity.this,
@@ -245,7 +276,7 @@ public class PeertubeUploadActivity extends AppCompatActivity {
                         MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE);
                 return;
             }
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
             intent.addCategory(Intent.CATEGORY_OPENABLE);
             intent.setType("*/*");
             String[] mimetypes = {"video/*"};
@@ -255,7 +286,7 @@ public class PeertubeUploadActivity extends AppCompatActivity {
         });
 
         //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.setUploadChannel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<String, String> channelsCheck = new LinkedHashMap<>(channels);
@@ -279,44 +310,33 @@ public class PeertubeUploadActivity extends AppCompatActivity {
 
             }
         });
-        set_upload_submit.setOnClickListener(v -> {
+        binding.setUploadSubmit.setOnClickListener(v -> {
             if (uri != null) {
                 Map.Entry<String, String> channelM = channelToSend.entrySet().iterator().next();
                 String idChannel = channelM.getValue();
                 Map.Entry<Integer, String> privacyM = privacyToSend.entrySet().iterator().next();
                 Integer idPrivacy = privacyM.getKey();
-
+                if (binding.videoTitle.getText() != null && binding.videoTitle.getText().toString().trim().length() > 0) {
+                    filename = binding.videoTitle.getText().toString().trim();
+                }
                 try {
                     SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                    String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-                    UploadNotificationConfig uploadConfig = new UploadNotificationConfig();
-                    Intent in = new Intent(PeertubeUploadActivity.this, PeertubeEditUploadActivity.class);
-                    PendingIntent clickIntent = PendingIntent.getActivity(PeertubeUploadActivity.this, 1, in, PendingIntent.FLAG_UPDATE_CURRENT);
-                    uploadConfig
-                            .setClearOnActionForAllStatuses(true);
+                    String token = Helper.getToken(PeertubeUploadActivity.this);
 
-
-                    uploadConfig.getProgress().message = getString(R.string.uploading);
-                    uploadConfig.getCompleted().message = getString(R.string.upload_video_success);
-                    uploadConfig.getError().message = getString(R.string.toast_error);
-                    uploadConfig.getCancelled().message = getString(R.string.toast_cancelled);
-                    uploadConfig.getCompleted().actions.add(new UploadNotificationAction(R.drawable.ic_baseline_check_24, getString(R.string.video_uploaded_action), clickIntent));
-
-                    if (video_title != null && video_title.getText() != null && video_title.getText().toString().trim().length() > 0) {
-                        filename = video_title.getText().toString().trim();
-                    }
-                    String uploadId = UUID.randomUUID().toString();
-                    new MultipartUploadRequest(PeertubeUploadActivity.this, uploadId, "https://" + Helper.getLiveInstance(PeertubeUploadActivity.this) + "/api/v1/videos/upload")
-                            .addFileToUpload(uri.toString().replace("file://", ""), "videofile")
-                            .addHeader("Authorization", "Bearer " + token)
-                            .setNotificationConfig(uploadConfig)
-                            .addParameter("name", filename)
-                            .addParameter("channelId", idChannel)
+                    new MultipartUploadRequest(PeertubeUploadActivity.this, "https://" + HelperInstance.getLiveInstance(PeertubeUploadActivity.this) + "/api/v1/videos/upload")
+                            .setMethod("POST")
+                            .setBearerAuth(token)
+                            .addHeader("User-Agent", getString(R.string.app_name) + "/" + BuildConfig.VERSION_NAME)
                             .addParameter("privacy", String.valueOf(idPrivacy))
                             .addParameter("nsfw", "false")
+                            .addParameter("name", filename)
                             .addParameter("commentsEnabled", "true")
+                            .addParameter("downloadEnabled", "true")
                             .addParameter("waitTranscoding", "true")
-                            .setMaxRetries(3)
+                            .addParameter("channelId", idChannel)
+                            .addFileToUpload(uri.toString(), "videofile")
+                            .setNotificationConfig((context, uploadId) -> getNotificationConfig(uploadId))
+                            .setMaxRetries(2)
                             .startUpload();
                     finish();
                 } catch (Exception exc) {
@@ -325,4 +345,74 @@ public class PeertubeUploadActivity extends AppCompatActivity {
             }
         });
     }
+
+    UploadNotificationConfig getNotificationConfig(String uploadId) {
+        PendingIntent clickIntent = PendingIntent.getActivity(
+                PeertubeUploadActivity.this, 1, new Intent(this, PeertubeEditUploadActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+
+        final boolean autoClear = false;
+        final boolean clearOnAction = true;
+        final boolean ringToneEnabled = true;
+        final ArrayList<UploadNotificationAction> noActions = new ArrayList<>(1);
+
+        final UploadNotificationAction cancelAction = new UploadNotificationAction(
+                R.drawable.ic_baseline_cancel_24,
+                getString(R.string.cancel),
+                ContextExtensionsKt.getCancelUploadIntent(this, uploadId)
+        );
+
+
+        final ArrayList<UploadNotificationAction> progressActions = new ArrayList<>(1);
+        progressActions.add(cancelAction);
+
+        UploadNotificationStatusConfig progress = new UploadNotificationStatusConfig(
+                getString(R.string.app_name),
+                getString(R.string.uploading),
+                R.drawable.ic_baseline_cloud_upload_24,
+                Color.BLUE,
+                null,
+                clickIntent,
+                progressActions,
+                clearOnAction,
+                autoClear
+        );
+
+        UploadNotificationStatusConfig success = new UploadNotificationStatusConfig(
+                getString(R.string.app_name),
+                getString(R.string.upload_video_success),
+                R.drawable.ic_baseline_check_24,
+                Color.GREEN,
+                null,
+                clickIntent,
+                noActions,
+                clearOnAction,
+                autoClear
+        );
+
+
+        UploadNotificationStatusConfig error = new UploadNotificationStatusConfig(
+                getString(R.string.app_name),
+                getString(R.string.toast_error),
+                R.drawable.ic_baseline_error_24,
+                Color.RED,
+                null,
+                clickIntent,
+                noActions,
+                clearOnAction,
+                autoClear
+        );
+
+        UploadNotificationStatusConfig cancelled = new UploadNotificationStatusConfig(
+                getString(R.string.app_name),
+                getString(R.string.toast_cancelled),
+                R.drawable.ic_baseline_cancel_24,
+                Color.YELLOW,
+                null,
+                clickIntent,
+                noActions,
+                clearOnAction
+        );
+
+        return new UploadNotificationConfig(FedilabTube.UPLOAD_CHANNEL_ID, ringToneEnabled, progress, success, error, cancelled);
+    }
 }

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

@@ -16,11 +16,22 @@ package app.fedilab.fedilabtube;
 
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.tabs.TabLayout;
+
+import org.jetbrains.annotations.NotNull;
+
+import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
+import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import es.dmoral.toasty.Toasty;
 
@@ -29,12 +40,15 @@ public class SearchActivity extends AppCompatActivity {
 
 
     private String search;
+    private ActivitySearchResultBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
-        setContentView(R.layout.activity_search_result);
         Bundle b = getIntent().getExtras();
         if (b != null) {
             search = b.getString("search");
@@ -46,15 +60,64 @@ public class SearchActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle(search);
 
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.videos)));
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.channels)));
+        binding.searchPager.setOffscreenPageLimit(2);
+
+        PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+        binding.searchPager.setAdapter(mPagerAdapter);
+        binding.searchPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                TabLayout.Tab tab = binding.searchTabLayout.getTabAt(position);
+                if (tab != null)
+                    tab.select();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+
+        binding.searchTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.searchPager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                Fragment fragment = null;
+                if (binding.searchPager.getAdapter() != null)
+                    fragment = (Fragment) binding.searchPager.getAdapter().instantiateItem(binding.searchPager, tab.getPosition());
+                switch (tab.getPosition()) {
+                    case 0:
+                        if (fragment != null) {
+                            DisplayVideosFragment displayVideosFragment = ((DisplayVideosFragment) fragment);
+                            displayVideosFragment.scrollToTop();
+                        }
+                        break;
+                    case 1:
+                        if (fragment != null) {
+                            DisplayChannelsFragment displayChannelsFragment = ((DisplayChannelsFragment) fragment);
+                            displayChannelsFragment.scrollToTop();
+                        }
+                        break;
+                }
+            }
+        });
 
-        if (savedInstanceState == null) {
-            DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
-            Bundle bundle = new Bundle();
-            bundle.putString("search_peertube", search);
-            displayVideosFragment.setArguments(bundle);
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.container, displayVideosFragment).commit();
-        }
     }
 
 
@@ -67,4 +130,37 @@ public class SearchActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+
+    /**
+     * Pager adapter for the 2 fragments
+     */
+    private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+
+        ScreenSlidePagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NotNull
+        @Override
+        public Fragment getItem(int position) {
+            Bundle bundle = new Bundle();
+            if (position == 0) {
+                DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
+                bundle.putString("search_peertube", search);
+                displayVideosFragment.setArguments(bundle);
+                return displayVideosFragment;
+            }
+            DisplayChannelsFragment displayChannelsFragment = new DisplayChannelsFragment();
+            bundle.putString("search_peertube", search);
+            displayChannelsFragment.setArguments(bundle);
+            return displayChannelsFragment;
+        }
+
+
+        @Override
+        public int getCount() {
+            return 2;
+        }
+    }
+
 }

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

@@ -21,12 +21,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.RadioGroup;
-import android.widget.Spinner;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -42,27 +38,29 @@ import java.util.List;
 import java.util.Map;
 
 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 mabbas007.tagsedittext.TagsEditText;
 
-import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
 import static app.fedilab.fedilabtube.PeertubeActivity.hideKeyboard;
+import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
 
 public class SepiaSearchActivity extends AppCompatActivity {
 
 
     private SepiaSearch sepiaSearchVideo, sepiaSearchChannel;
-    private TagsEditText sepia_element_all_of_tags, sepia_element_one_of_tags;
-    private MaterialSearchBar searchBar;
-    private ConstraintLayout filter_elements;
+
+    private ActivitySepiaSearchBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_sepia_search);
+        binding = ActivitySepiaSearchBinding.inflate(getLayoutInflater());
+        View rootView = binding.getRoot();
+        setContentView(rootView);
+
 
         sepiaSearchVideo = new SepiaSearch();
         sepiaSearchChannel = new SepiaSearch();
@@ -76,21 +74,18 @@ public class SepiaSearchActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 
-        Button filter = findViewById(R.id.filter);
-        filter_elements = findViewById(R.id.filter_elements);
-        filter.setOnClickListener(view -> {
-            if (filter_elements.getVisibility() == View.VISIBLE) {
-                filter_elements.setVisibility(View.GONE);
+        binding.filter.setOnClickListener(view -> {
+            if (binding.filterElements.getVisibility() == View.VISIBLE) {
+                binding.filterElements.setVisibility(View.GONE);
             } else {
-                filter_elements.setVisibility(View.VISIBLE);
+                binding.filterElements.setVisibility(View.VISIBLE);
             }
         });
 
-        RadioGroup sepia_element_nsfw = findViewById(R.id.sepia_element_nsfw);
-        sepia_element_nsfw.setOnCheckedChangeListener((group, checkedId) -> sepiaSearchVideo.setNsfw(checkedId != R.id.sepia_element_nsfw_no));
 
-        RadioGroup radio_date = findViewById(R.id.radio_date);
-        radio_date.setOnCheckedChangeListener((group, checkedId) -> {
+        binding.sepiaElementNsfw.setOnCheckedChangeListener((group, checkedId) -> sepiaSearchVideo.setNsfw(checkedId != R.id.sepia_element_nsfw_no));
+
+        binding.radioDate.setOnCheckedChangeListener((group, checkedId) -> {
             if (checkedId == R.id.sepia_element_published_date_today) {
                 Calendar cal = GregorianCalendar.getInstance();
                 cal.set(Calendar.HOUR_OF_DAY, 0);
@@ -122,8 +117,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
 
-        RadioGroup duration = findViewById(R.id.duration);
-        duration.setOnCheckedChangeListener((group, checkedId) -> {
+        binding.duration.setOnCheckedChangeListener((group, checkedId) -> {
             if (checkedId == R.id.sepia_element_duration_short) {
                 sepiaSearchVideo.setDurationMin(0);
                 sepiaSearchVideo.setDurationMax(240);
@@ -140,11 +134,10 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
 
-        Spinner sort_by = findViewById(R.id.sort_by);
         ArrayAdapter<String> adapterSortBy = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, getResources().getStringArray(R.array.sort_by_array));
-        sort_by.setAdapter(adapterSortBy);
-        sort_by.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sortBy.setAdapter(adapterSortBy);
+        binding.sortBy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 String orderby, channelOrderBy;
@@ -171,12 +164,6 @@ public class SepiaSearchActivity extends AppCompatActivity {
             }
         });
 
-        Spinner sepia_element_category = findViewById(R.id.sepia_element_category);
-        Spinner sepia_element_license = findViewById(R.id.sepia_element_license);
-        Spinner sepia_element_language = findViewById(R.id.sepia_element_language);
-
-        sepia_element_all_of_tags = findViewById(R.id.sepia_element_all_of_tags);
-        sepia_element_one_of_tags = findViewById(R.id.sepia_element_one_of_tags);
 
         LinkedHashMap<Integer, String> categories = new LinkedHashMap<>(peertubeInformation.getCategories());
         LinkedHashMap<Integer, String> licences = new LinkedHashMap<>(peertubeInformation.getLicences());
@@ -203,7 +190,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterCatgories = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, categoriesA);
-        sepia_element_category.setAdapter(adapterCatgories);
+        binding.sepiaElementCategory.setAdapter(adapterCatgories);
 
 
         //Populate licenses
@@ -222,7 +209,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterLicenses = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, licensesA);
-        sepia_element_license.setAdapter(adapterLicenses);
+        binding.sepiaElementLicense.setAdapter(adapterLicenses);
 
         //Populate languages
         String[] languagesA = new String[languages.size() + 1];
@@ -240,10 +227,10 @@ public class SepiaSearchActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterLanguages = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, languagesA);
-        sepia_element_language.setAdapter(adapterLanguages);
+        binding.sepiaElementLanguage.setAdapter(adapterLanguages);
 
 
-        sepia_element_license.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sepiaElementLicense.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateLicensePosition(position);
@@ -255,7 +242,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
             }
         });
         //Manage categories
-        sepia_element_category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sepiaElementCategory.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateCategoryPosition(position);
@@ -268,7 +255,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
         //Manage languages
-        sepia_element_language.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sepiaElementLanguage.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateLanguagesPosition(position);
@@ -281,9 +268,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
 
-        searchBar = findViewById(R.id.searchBar);
-
-        searchBar.setOnSearchActionListener(new MaterialSearchBar.OnSearchActionListener() {
+        binding.searchBar.setOnSearchActionListener(new MaterialSearchBar.OnSearchActionListener() {
             @Override
             public void onSearchStateChanged(boolean enabled) {
 
@@ -299,22 +284,21 @@ public class SepiaSearchActivity extends AppCompatActivity {
                 makeSearch();
             }
         });
-        Button apply_filter = findViewById(R.id.apply_filter);
-        apply_filter.setOnClickListener(v -> makeSearch());
+        binding.applyFilter.setOnClickListener(v -> makeSearch());
 
-        searchBar.openSearch();
+        binding.searchBar.openSearch();
     }
 
     private void makeSearch() {
         hideKeyboard(SepiaSearchActivity.this);
         sepiaSearchVideo.setStart("0");
-        if (sepia_element_one_of_tags.getTags().size() > 0) {
-            sepiaSearchVideo.setTagsOneOf(sepia_element_one_of_tags.getTags());
+        if (binding.sepiaElementOneOfTags.getTags().size() > 0) {
+            sepiaSearchVideo.setTagsOneOf(binding.sepiaElementOneOfTags.getTags());
         } else {
             sepiaSearchVideo.setTagsOneOf(null);
         }
-        if (sepia_element_all_of_tags.getTags().size() > 0) {
-            sepiaSearchVideo.setTagsAllOf(sepia_element_all_of_tags.getTags());
+        if (binding.sepiaElementAllOfTags.getTags().size() > 0) {
+            sepiaSearchVideo.setTagsAllOf(binding.sepiaElementAllOfTags.getTags());
         } else {
             sepiaSearchVideo.setTagsAllOf(null);
         }
@@ -322,8 +306,8 @@ public class SepiaSearchActivity extends AppCompatActivity {
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("SEPIA_SEARCH");
         if (fragment != null)
             getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        filter_elements.setVisibility(View.GONE);
-        sepiaSearchVideo.setSearch(searchBar.getText());
+        binding.filterElements.setVisibility(View.GONE);
+        sepiaSearchVideo.setSearch(binding.searchBar.getText());
         DisplaySepiaSearchFragment displaySepiaSearchFragment = new DisplaySepiaSearchFragment();
         Bundle bundle = new Bundle();
         bundle.putParcelable("sepiaSearchVideo", sepiaSearchVideo);

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

@@ -288,13 +288,12 @@ public class ShowAccountActivity extends AppCompatActivity {
             if (position == 0) {
                 DisplayChannelsFragment displayChannelsFragment = new DisplayChannelsFragment();
                 bundle.putString("name", account.getAcct());
-                bundle.putBoolean("myChannels", false);
                 displayChannelsFragment.setArguments(bundle);
                 return displayChannelsFragment;
             }
             DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.ACCOUNT_VIDEOS);
-            bundle.putString("channelId", account.getAcct());
+            bundle.putParcelable("account", account);
             bundle.putString("peertube_instance", account.getHost());
             displayVideosFragment.setArguments(bundle);
             return displayVideosFragment;

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

@@ -157,18 +157,21 @@ public class ShowChannelActivity extends AppCompatActivity {
                         account_follow.setOnClickListener(v -> {
                             AlertDialog.Builder builderSingle = new AlertDialog.Builder(ShowChannelActivity.this);
                             builderSingle.setTitle(getString(R.string.list_of_accounts));
-                            if (accounts != null) {
-                                final OwnAccountsAdapter accountsListAdapter = new OwnAccountsAdapter(ShowChannelActivity.this, accounts);
-                                builderSingle.setAdapter(accountsListAdapter, (dialog, which) -> {
-                                    new Thread(() -> {
+                            if (accounts != null && accounts.size() > 0) {
+                                if (accounts.size() > 1) {
+                                    final OwnAccountsAdapter accountsListAdapter = new OwnAccountsAdapter(ShowChannelActivity.this, accounts);
+                                    builderSingle.setAdapter(accountsListAdapter, (dialog, which) -> new Thread(() -> {
                                         try {
                                             RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(ShowChannelActivity.this, accounts.get(which).getHost(), accounts.get(which).getToken());
                                             peertubeAPI.post(FOLLOW, channel.getAcct(), null);
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
-                                    }).start();
-                                });
+                                    }).start());
+                                } else {
+                                    RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(ShowChannelActivity.this, accounts.get(0).getHost(), accounts.get(0).getToken());
+                                    peertubeAPI.post(FOLLOW, channel.getAcct(), null);
+                                }
                             }
                             builderSingle.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
                             builderSingle.show();
@@ -357,7 +360,11 @@ public class ShowChannelActivity extends AppCompatActivity {
     public void manageVIewRelationship(APIResponse apiResponse) {
 
         if (apiResponse.getError() != null) {
-            Toasty.error(ShowChannelActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
+            if (apiResponse.getError().getError().length() > 500) {
+                Toasty.info(ShowChannelActivity.this, getString(R.string.remote_account), Toast.LENGTH_LONG).show();
+            } else {
+                Toasty.error(ShowChannelActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
+            }
             return;
         }
         this.relationship = apiResponse.getRelationships();
@@ -493,7 +500,7 @@ public class ShowChannelActivity extends AppCompatActivity {
             DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             Bundle bundle = new Bundle();
             bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.CHANNEL_VIDEOS);
-            bundle.putString("channelId", channel.getAcct());
+            bundle.putParcelable("channel", channel);
             bundle.putString("peertube_instance", channel.getHost());
             bundle.putBoolean("sepia_search", sepiaSearch);
             displayVideosFragment.setArguments(bundle);

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

@@ -33,7 +33,7 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
+import app.fedilab.fedilabtube.databinding.ActivityVideosTimelineBinding;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
@@ -50,7 +50,7 @@ public class VideosTimelineActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivitySearchResultBinding binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
+        ActivityVideosTimelineBinding binding = ActivityVideosTimelineBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
         setContentView(mainView);
 
@@ -131,6 +131,11 @@ public class VideosTimelineActivity extends AppCompatActivity {
 
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {

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

@@ -19,6 +19,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebChromeClient;
@@ -91,7 +92,9 @@ public class WebviewConnectActivity extends AppCompatActivity {
         } else {
             CookieManager.getInstance().setAcceptCookie(true);
         }
-
+        if (getSupportActionBar() != null)
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        setTitle(R.string.login);
 
         final ProgressBar pbar = findViewById(R.id.progress_bar);
         webView.setWebChromeClient(new WebChromeClient() {
@@ -122,8 +125,11 @@ public class WebviewConnectActivity extends AppCompatActivity {
                             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 {
@@ -134,9 +140,11 @@ public class WebviewConnectActivity extends AppCompatActivity {
                             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());
+                                updateCredential(WebviewConnectActivity.this, token.getAccess_token(), clientId, clientSecret, token.getRefresh_token(), new URL(url).getHost(), null);
                                 finish();
                             }
                         } catch (Exception e) {
@@ -151,6 +159,17 @@ public class WebviewConnectActivity extends AppCompatActivity {
 
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
     @Override
     public void onBackPressed() {
         if (webView != null && webView.canGoBack()) {

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

@@ -0,0 +1,53 @@
+package app.fedilab.fedilabtube.client;
+/* Copyright 2020 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>. */
+
+public class MenuItemVideo {
+
+    int icon;
+    String title;
+    actionType action;
+
+    public int getIcon() {
+        return icon;
+    }
+
+    public void setIcon(int icon) {
+        this.icon = icon;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public actionType getAction() {
+        return action;
+    }
+
+    public void setAction(actionType action) {
+        this.action = action;
+    }
+
+    public enum actionType {
+        RESOLUTION,
+        SPEED,
+        CAPTION,
+        AUTONEXT
+    }
+}

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

@@ -25,6 +25,7 @@ import app.fedilab.fedilabtube.client.data.CommentData;
 import app.fedilab.fedilabtube.client.data.InstanceData;
 import app.fedilab.fedilabtube.client.data.NotificationData;
 import app.fedilab.fedilabtube.client.data.PlaylistData;
+import app.fedilab.fedilabtube.client.data.PluginData;
 import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.data.VideoPlaylistData;
 import app.fedilab.fedilabtube.client.entities.CaptionsParams;
@@ -60,16 +61,27 @@ import retrofit2.http.QueryMap;
 public interface PeertubeService {
 
     @GET("instances")
-    Call<InstanceData> getInstances(@QueryMap Map<String, String> params, @Query("nsfwPolicy[]") String nsfwPolicy, @Query("categoriesOr[]") List<Integer> categories, @Query("languagesOr[]") List<String> languages);
+    Call<InstanceData> getInstances(
+            @QueryMap Map<String, String> params,
+            @Query("nsfwPolicy[]") String nsfwPolicy,
+            @Query("categoriesOr[]") List<Integer> categories,
+            @Query("languagesOr[]") List<String> languages);
 
     //Server settings
     @GET(".well-known/nodeinfo")
     Call<WellKnownNodeinfo> getWellKnownNodeinfo();
 
+    @GET("plugins/peertube-plugin-player-watermark/public-settings")
+    Call<PluginData.WaterMark> waterMark();
+
     //Instance info
     @GET("config/about")
     Call<InstanceData.InstanceInfo> configAbout();
 
+    //Instance config
+    @GET("config")
+    Call<InstanceData.InstanceConfig> config();
+
     @GET("{nodeInfoPath}")
     Call<WellKnownNodeinfo.NodeInfo> getNodeinfo(@Path(value = "nodeInfoPath", encoded = true) String nodeInfoPath);
 
@@ -95,6 +107,21 @@ public interface PeertubeService {
     @GET("client/locales/{local}/server.json")
     Call<Map<String, String>> getTranslations(@Path("local") String local);
 
+
+    //TOKEN
+    //Refresh
+    @FormUrlEncoded
+    @POST("users/token")
+    Call<Token> createOpenIdToken(
+            @Field("client_id") String client_id,
+            @Field("client_secret") String client_secret,
+            @Field("response_type") String response_type,
+            @Field("grant_type") String grant_type,
+            @Field("scope") String scope,
+            @Field("username") String username,
+            @Field("password") String password,
+            @Field("externalAuthToken") String externalAuthToken);
+
     //TOKEN
     //Refresh
     @FormUrlEncoded
@@ -120,6 +147,9 @@ public interface PeertubeService {
     Call<UserMe> verifyCredentials(@Header("Authorization") String credentials);
 
 
+    @GET("users/me/video-quota-used")
+    Call<UserMe.VideoQuota> getVideoQuota(@Header("Authorization") String credentials);
+
     @FormUrlEncoded
     @PUT("videos/{id}/watching")
     Call<String> addToHistory(
@@ -142,6 +172,13 @@ public interface PeertubeService {
             @Field("nsfwPolicy") String nsfwPolicy
     );
 
+    @Multipart
+    @POST("video-channels/{channelHandle}/avatar/pick")
+    Call<UserMe.AvatarResponse> updateChannelProfilePicture(
+            @Header("Authorization") String credentials,
+            @Path("channelHandle") String channelHandle,
+            @Part MultipartBody.Part avatarfile);
+
     @Multipart
     @POST("users/me/avatar/pick")
     Call<UserMe.AvatarResponse> updateProfilePicture(
@@ -151,27 +188,55 @@ public interface PeertubeService {
     //Timelines Authenticated
     //Subscriber timeline
     @GET("users/me/subscriptions/videos?sort=-publishedAt")
-    Call<VideoData> getSubscriptionVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getSubscriptionVideos(
+            @Header("Authorization") String credentials,
+            @Query("start") String maxId,
+            @Query("count") String coun,
+            @Query("languageOneOf") List<String> languageOneOf);
 
     //Overview videos
     @GET("overviews/videos")
-    Call<OverviewVideo> getOverviewVideos(@Header("Authorization") String credentials, @Query("page") String page, @Query("languageOneOf") List<String> languageOneOf);
+    Call<OverviewVideo> getOverviewVideos(
+            @Header("Authorization") String credentials,
+            @Query("page") String page,
+            @Query("nsfw") String nsfw,
+            @Query("languageOneOf") List<String> languageOneOf);
 
     //Most liked videos
     @GET("videos?sort=-likes")
-    Call<VideoData> getMostLikedVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getMostLikedVideos(
+            @Header("Authorization") String credentials,
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("nsfw") String nsfw,
+            @Query("languageOneOf") List<String> languageOneOf);
 
     //Trending videos
     @GET("videos?sort=-trending")
-    Call<VideoData> getTrendingVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getTrendingVideos(
+            @Header("Authorization") String credentials,
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("nsfw") String nsfw,
+            @Query("languageOneOf") List<String> languageOneOf);
 
     //Recently added videos
     @GET("videos?sort=-publishedAt")
-    Call<VideoData> getRecentlyAddedVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getRecentlyAddedVideos(
+            @Header("Authorization") String credentials,
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("nsfw") String nsfw,
+            @Query("languageOneOf") List<String> languageOneOf);
 
     //Local videos
     @GET("videos?sort=-publishedAt&filter=local")
-    Call<VideoData> getLocalVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getLocalVideos(
+            @Header("Authorization") String credentials,
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("nsfw") String nsfw,
+            @Query("languageOneOf") List<String> languageOneOf);
 
     //History
     @GET("users/me/history/videos")
@@ -179,6 +244,7 @@ public interface PeertubeService {
             @Header("Authorization") String credentials,
             @Query("start") String maxId,
             @Query("count") String count,
+            @Query("nsfw") String nsfw,
             @Query("startDate") String startDate,
             @Query("endDate") String endDate
     );
@@ -187,14 +253,23 @@ public interface PeertubeService {
     Call<String> deleteHistory(
             @Header("Authorization") String credentials);
 
-    //Search
+    //Search videos
     @GET("search/videos")
     Call<VideoData> searchVideos(
             @Header("Authorization") String credentials,
             @Query("search") String search,
             @Query("start") String maxId,
-            @Query("count") String count);
+            @Query("count") String count,
+            @Query("nsfw") String nsfw);
 
+    //Search channels
+    @GET("search/video-channels")
+    Call<ChannelData> searchChannels(
+            @Header("Authorization") String credentials,
+            @Query("search") String search,
+            @Query("searcharget") String searchTarget,
+            @Query("start") String maxId,
+            @Query("count") String count);
 
     //Search
     @GET("search/videos")
@@ -202,7 +277,8 @@ public interface PeertubeService {
             @Header("Authorization") String credentials,
             @Query("tagsOneOf") List<String> tagsOneOf,
             @Query("start") String maxId,
-            @Query("count") String count);
+            @Query("count") String count,
+            @Query("nsfw") String nsfw);
 
     //Get notifications
     @GET("users/me/notifications")
@@ -228,9 +304,17 @@ public interface PeertubeService {
     @GET("users/me/videos?sort=-publishedAt")
     Call<VideoData> getMyVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count);
 
-    //Get my video
+    //Get user videos
     @GET("accounts/{name}/videos?sort=-publishedAt")
-    Call<VideoData> getVideosForAccount(@Path("name") String name, @Query("start") String maxId, @Query("count") String count);
+    Call<VideoData> getVideosForAccount(
+            @Path("name") String name,
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("nsfw") String nsfw
+    );
+
+    @POST("videos/{id}/views")
+    Call<String> postView(@Path("id") String id);
 
     @Multipart
     @PUT("videos/{id}")
@@ -277,7 +361,11 @@ public interface PeertubeService {
     Call<ChannelData> getAllChannels();
 
     @GET("video-channels/{channelHandle}/videos")
-    Call<VideoData> getChannelVideos(@Path("channelHandle") String channelHandle, @Query("start") String maxId, @Query("count") String count);
+    Call<VideoData> getChannelVideos(
+            @Path("channelHandle") String channelHandle,
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("nsfw") String nsfw);
 
     @POST("video-channels")
     Call<ChannelData.ChannelCreation> addChannel(@Header("Authorization") String credentials, @Body ChannelParams channelParams);