diff --git a/app/build.gradle b/app/build.gradle index d48433c..d525851 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,14 +5,14 @@ apply plugin: "androidx.navigation.safeargs" android { compileSdkVersion 30 - buildToolsVersion "30.0.2" + buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 21 targetSdkVersion 30 - versionCode 39 - versionName "1.13.1" + versionCode 43 + versionName "1.14.1" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -137,27 +137,27 @@ android { sourceSets { fdroid_acad { - res.srcDirs = ['src/main/res', 'src/acad/res', 'src/no_google_cast_lib/res'] + res.srcDirs = ['src/main/res', 'src/no_google_cast_lib/res', 'src/acad/res'] java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java'] } google_acad { - res.srcDirs = ['src/main/res', 'src/acad/res', 'src/google_cast_lib/res'] + res.srcDirs = ['src/main/res', 'src/google_cast_lib/res', 'src/acad/res'] java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java', 'src/google_cast_lib/java'] } fdroid_full { - res.srcDirs = ['src/main/res', 'src/full/res', 'src/no_google_cast_lib/res'] + res.srcDirs = ['src/main/res', 'src/no_google_cast_lib/res', 'src/full/res'] java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java'] } google_full { - res.srcDirs = ['src/main/res', 'src/full/res', 'src/google_donation/res', 'src/google_cast_lib/res'] + res.srcDirs = ['src/main/res', 'src/google_donation/res', 'src/google_cast_lib/res', 'src/full/res'] java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java', 'src/google_cast_lib/java'] } queermotion { - res.srcDirs = ['src/main/res', 'src/queermotion/res', 'src/no_google_cast_lib/res'] + res.srcDirs = ['src/main/res', 'src/no_google_cast_lib/res', 'src/queermotion/res'] java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java'] } bittube { - res.srcDirs = ['src/main/res', 'src/bittube/res', 'src/google_cast_lib/res'] + res.srcDirs = ['src/main/res', 'src/google_cast_lib/res', 'src/bittube/res'] java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/google_cast_lib/java'] } } @@ -176,13 +176,13 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.preference:preference:1.1.1' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' - implementation 'androidx.navigation:navigation-fragment:2.3.2' - implementation "androidx.fragment:fragment:1.2.5" - implementation 'androidx.navigation:navigation-ui:2.3.2' - implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.2") + implementation 'androidx.navigation:navigation-fragment:2.3.3' + implementation "androidx.fragment:fragment:1.3.0" + implementation 'androidx.navigation:navigation-ui:2.3.3' + implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.3") implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.browser:browser:1.3.0' implementation 'androidx.documentfile:documentfile:1.0.1' @@ -213,8 +213,8 @@ dependencies { implementation "io.github.kobakei:ratethisapp:1.2.0" implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0' - implementation "androidx.work:work-runtime:2.4.0" - implementation "androidx.work:work-runtime-ktx:2.4.0" + implementation "androidx.work:work-runtime:2.5.0" + implementation "androidx.work:work-runtime-ktx:2.5.0" //************ DONATION GOOGLE ONLY **************// @@ -228,11 +228,11 @@ dependencies { //************ CAST **************/// //---> Google libs (google_full + bittube) - google_acadImplementation "androidx.mediarouter:mediarouter:1.2.1" + google_acadImplementation "androidx.mediarouter:mediarouter:1.2.2" google_acadImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0' - google_fullImplementation "androidx.mediarouter:mediarouter:1.2.1" + google_fullImplementation "androidx.mediarouter:mediarouter:1.2.2" google_fullImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0' - bittubeImplementation "androidx.mediarouter:mediarouter:1.2.1" + bittubeImplementation "androidx.mediarouter:mediarouter:1.2.2" bittubeImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0' //----> Other flavors diff --git a/app/src/bittube/ic_launcher-playstore.png b/app/src/bittube/ic_launcher-playstore.png index 96e3d80..3dcbb45 100644 Binary files a/app/src/bittube/ic_launcher-playstore.png and b/app/src/bittube/ic_launcher-playstore.png differ diff --git a/app/src/bittube/res/drawable-anydpi-v24/ic_notification_tubelab.xml b/app/src/bittube/res/drawable-anydpi-v24/ic_notification_tubelab.xml index 26878af..a00c0ed 100644 --- a/app/src/bittube/res/drawable-anydpi-v24/ic_notification_tubelab.xml +++ b/app/src/bittube/res/drawable-anydpi-v24/ic_notification_tubelab.xml @@ -1,864 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="#FFFFFF"> + + + - diff --git a/app/src/bittube/res/drawable-hdpi/ic_notification_tubelab.png b/app/src/bittube/res/drawable-hdpi/ic_notification_tubelab.png index 064c676..82df2ff 100644 Binary files a/app/src/bittube/res/drawable-hdpi/ic_notification_tubelab.png and b/app/src/bittube/res/drawable-hdpi/ic_notification_tubelab.png differ diff --git a/app/src/bittube/res/drawable-mdpi/ic_notification_tubelab.png b/app/src/bittube/res/drawable-mdpi/ic_notification_tubelab.png index cd4f8bb..2ee1ba2 100644 Binary files a/app/src/bittube/res/drawable-mdpi/ic_notification_tubelab.png and b/app/src/bittube/res/drawable-mdpi/ic_notification_tubelab.png differ diff --git a/app/src/bittube/res/drawable-v24/ic_launcher_foreground.xml b/app/src/bittube/res/drawable-v24/ic_launcher_foreground.xml index 3494e3e..402ec31 100644 --- a/app/src/bittube/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/bittube/res/drawable-v24/ic_launcher_foreground.xml @@ -4,859 +4,460 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - - + + - - - - + + + + android:pathData="M9.454,97.392L39.9,139.479L90.718,12.135c-17.249,7.421 -33.106,18.122 -46.784,31.799C28.511,59.358 16.869,77.553 9.454,97.392z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M6.9,104.679c-4.5,14.4 -6.9,29.4 -6.9,45c0,8.4 0.6,16.5 2.1,24.6l23.4,30l110.633,-80.689L6.9,104.679z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M122.4,17.679l82.8,84.9l26.7,-78.6c-17.4,-11.4 -36.9,-18.9 -57.6,-22.2L122.4,17.679z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M128.37,139.04l77.4,1.8l-82.8,-84.9z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M290.641,202.353C296.784,185.824 300,168.161 300,150c0,-0.605 -0.015,-1.207 -0.022,-1.811l-93.561,-44.993L290.641,202.353z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M83.4,47.679l52.2,35.4l11.1,-63.3z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M293.928,107.545l-15.935,-3.766l11.1,72l9.988,-9.132C299.684,161.157 300,155.603 300,150C300,135.419 297.923,121.158 293.928,107.545z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M218.993,256.341l8.225,22.325c8.609,-5.188 16.738,-11.283 24.277,-18.225L218.993,256.341z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M262.306,249.428c7.047,-7.939 13.179,-16.5 18.323,-25.565l-85.071,8.327L262.306,249.428z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M218.7,255.579l-168.9,-33.3l21.6,55.2c4.8,3 9.9,5.7 15.3,8.1L218.7,255.579z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + + android:pathData="M237.27,176.69l-63,4.5l30.9,56.7z" + android:strokeAlpha="0.71" + android:fillAlpha="0.71"> - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:pathData="M93.912,67.767v2.1c0,0.3 0,0.3 -0.3,0.6l-5.7,2.4c0,0 0,0 -0.3,0s0,0 -0.3,0l-1.2,-0.6l59.1,81l7.2,-5.1L93.912,67.767z"> + + + + + + + + android:pathData="M196.226,60.015l-0.014,-3.348l-51,92.1l7.5,4.2l50.165,-90.078L196.226,60.015z"> + + + + + + + + android:pathData="M238.874,55.031l-0.063,-3.763l-93.9,96.3l6.3,6l93.6,-96L238.874,55.031z"> + + + + + + + + android:pathData="M270.312,106.167c-0.3,0 -0.3,-0.3 -0.3,-0.6v-6l-123.3,47.1l3,8.1l123.9,-47.4L270.312,106.167z"> + + + + + + + + android:pathData="M35.412,83.967v5.4c0,0.3 -0.3,0.6 -0.3,0.6l-3.6,1.5l115.5,62.7l4.2,-7.8L35.412,83.967z"> + + + + + + + + android:pathData="M51.794,150.267c0.3,0 0.3,0.6 0.3,0.6v7.5c0,0.3 -0.3,0.6 -0.3,0.6l97.317,-3.9l-0.3,-8.7L51.794,150.267z"> + + + + + + + + android:pathData="M23.004,182.026c0.108,0.042 0.701,0.167 0.708,0.642l0,0l0,0v5.7l126.3,-33.6l-2.7,-8.4l-128.4,34.2C18.912,180.567 22.896,181.984 23.004,182.026z"> + + + + + + + + android:pathData="M101.712,186.442v5.825l50.1,-35.85l-5.4,-6.9l-48.579,34.702L101.712,186.442z"> + + + + + + + + android:pathData="M107.412,107.367v3.6c0,0.3 -0.3,0.6 -0.3,0.6l-5.4,2.4l43.5,40.2l6,-6.3L107.412,107.367z"> + + + + + + + + android:pathData="M167.412,99.267C167.412,99.267 167.112,99.267 167.412,99.267c-0.3,0 -0.3,0 -0.6,0l-5.7,-2.4l0,0l-16.2,52.5l8.4,2.7l16.5,-53.7L167.412,99.267z"> + + + + + + + + android:pathData="M194.412,136.467l-41.4,9.6l2.1,8.4l41.4,-9.6L194.412,136.467z"> + + + + + + + + android:pathData="M245.712,237.267L245.712,237.267L245.712,237.267L245.712,237.267l6,-1.8c0,0 0,0 0.3,0l-101.1,-88.2l-5.7,6.6l99.9,87v-3C245.112,237.867 245.081,237.423 245.712,237.267z"> + + + + + + + + android:pathData="M163.212,239.067l6,-1.8h0.3l2.1,0.6l-18.6,-89.1l-8.4,1.8L163.212,239.067L163.212,239.067z"> + + + + + + + + android:pathData="M194.412,140.067l-46.8,6.3l1.2,8.7l90.6,-12.3l-1.2,-0.3c-0.3,0 -0.3,-0.3 -0.3,-0.6v-7.5l0,0l0,0l0,0L194.412,140.067"> + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:pathData="M222.322,190.608L222.322,190.608L222.322,190.608c0,-0.293 0,-0.293 0.293,-0.586l0,0l0,0l0,0l3.516,-1.172l-74.417,-41.017l-4.102,7.324l74.71,41.31C222.322,196.467 222.322,190.608 222.322,190.608z"> + + + + + + + + android:fillAlpha="0.6"/> + android:pathData="M245.405,46.256l-3.951,1.367l3.981,1.534l3.981,-1.534L245.405,46.256zM240.486,54.176l4.429,1.764v-5.759l-4.429,-1.764V54.176zM246.012,50.115v5.825l4.323,-1.751v-5.772L246.012,50.115z" + android:fillColor="#FFFFFF"/> + android:pathData="M202.33,51.098l-3.951,1.367l3.981,1.534l3.981,-1.534L202.33,51.098zM197.412,59.018l4.429,1.764v-5.759l-4.429,-1.764V59.018zM202.937,54.958v5.825l4.323,-1.751v-5.772L202.937,54.958z" + android:fillColor="#FFFFFF"/> + android:pathData="M167.212,87.632l-3.951,1.367l3.981,1.534l3.981,-1.534L167.212,87.632zM162.294,95.552l4.429,1.764v-5.759l-4.429,-1.764V95.552zM167.819,91.492v5.825l4.323,-1.751v-5.772L167.819,91.492z" + android:fillColor="#FFFFFF"/> + android:pathData="M87.752,61.57l-3.951,1.367l3.981,1.534l3.981,-1.534L87.752,61.57zM82.834,69.491l4.429,1.764v-5.759l-4.429,-1.764V69.491zM88.359,65.43v5.825l4.323,-1.751v-5.772L88.359,65.43z" + android:fillColor="#FFFFFF"/> + android:pathData="M45.681,149.325l-3.951,1.367l3.981,1.534l3.981,-1.534L45.681,149.325zM40.762,157.245l4.429,1.764v-5.759l-4.429,-1.764V157.245zM46.288,153.185v5.825l4.323,-1.751v-5.772L46.288,153.185z" + android:fillColor="#FFFFFF"/> + android:pathData="M28.804,80.849l-3.951,1.367l3.981,1.534l3.981,-1.534L28.804,80.849zM23.886,88.769l4.429,1.764v-5.759l-4.429,-1.764V88.769zM29.411,84.709v5.825l4.323,-1.751V83.01L29.411,84.709z" + android:fillColor="#FFFFFF"/> + android:pathData="M169.288,238.683l-3.951,1.367l3.981,1.534l3.981,-1.534L169.288,238.683zM164.37,246.603l4.429,1.764v-5.759l-4.429,-1.764V246.603zM169.895,242.542v5.825l4.323,-1.751v-5.772L169.895,242.542z" + android:fillColor="#FFFFFF"/> + android:pathData="M100.806,102.525l-3.951,1.367l3.981,1.534l3.981,-1.534L100.806,102.525zM95.888,110.445l4.429,1.764v-5.759l-4.429,-1.764V110.445zM101.413,106.385v5.825l4.323,-1.751v-5.772L101.413,106.385z" + android:fillColor="#FFFFFF"/> + android:pathData="M95.387,185.167l-3.951,1.367l3.981,1.534l3.981,-1.534L95.387,185.167zM90.468,193.087l4.429,1.764v-5.759l-4.429,-1.764V193.087zM95.994,189.027v5.825l4.323,-1.751v-5.772L95.994,189.027z" + android:fillColor="#FFFFFF"/> + android:pathData="M251.88,237.423l-3.951,1.367l3.981,1.534l3.981,-1.534L251.88,237.423zM246.962,245.344l4.429,1.764v-5.759l-4.429,-1.764V245.344zM252.487,241.283v5.825l4.323,-1.751v-5.772L252.487,241.283z" + android:fillColor="#FFFFFF"/> + android:pathData="M229.18,189.225l-3.951,1.367l3.981,1.534l3.981,-1.534L229.18,189.225zM224.262,197.145l4.429,1.764v-5.759l-4.429,-1.764V197.145zM229.787,193.085v5.825l4.323,-1.751v-5.772L229.787,193.085z" + android:fillColor="#FFFFFF"/> + android:pathData="M243.606,133.425l-3.951,1.367l3.981,1.534l3.981,-1.534L243.606,133.425zM238.688,141.345l4.429,1.764v-5.759l-4.429,-1.764V141.345zM244.213,137.285v5.825l4.323,-1.751v-5.772L244.213,137.285z" + android:fillColor="#FFFFFF"/> + android:pathData="M276.887,96.684l-3.951,1.367l3.981,1.534l3.981,-1.534L276.887,96.684zM271.968,104.604l4.429,1.764v-5.759l-4.429,-1.764V104.604zM277.494,100.544v5.825l4.323,-1.751v-5.772L277.494,100.544z" + android:fillColor="#FFFFFF"/> + android:pathData="M17.419,181.553l-3.951,1.367l3.981,1.534l3.981,-1.534L17.419,181.553zM12.501,189.473l4.429,1.764v-5.759l-4.429,-1.764V189.473zM18.026,185.413v5.825l4.323,-1.751v-5.772L18.026,185.413z" + android:fillColor="#FFFFFF"/> - + android:pathData="M239.151,61.349c-23.679,-23.678 -55.161,-36.721 -88.653,-36.721c-33.487,0 -64.97,13.039 -88.656,36.717c-23.678,23.682 -36.717,55.165 -36.717,88.656c0,33.491 13.039,64.974 36.717,88.656c23.686,23.679 55.169,36.717 88.656,36.717c33.488,0 64.971,-13.039 88.653,-36.717c23.678,-23.682 36.72,-55.169 36.72,-88.656C275.872,116.511 262.83,85.028 239.151,61.349zM231.281,230.784c-21.579,21.579 -50.269,33.462 -80.783,33.462c-30.517,0 -59.207,-11.883 -80.782,-33.462c-21.579,-21.583 -33.466,-50.269 -33.466,-80.782c0,-30.513 11.887,-59.2 33.466,-80.783c21.575,-21.579 50.266,-33.462 80.782,-33.462c30.513,0 59.204,11.883 80.783,33.462c21.579,21.579 33.462,50.269 33.462,80.783C264.743,180.515 252.861,209.205 231.281,230.784zM235.247,104.055c-16.899,-31.115 -49.373,-50.441 -84.749,-50.441c-3.069,0 -5.562,2.493 -5.562,5.563c0,3.069 2.493,5.566 5.562,5.566c31.29,0 60.017,17.099 74.973,44.623c0.973,1.793 2.847,2.909 4.892,2.909c0.922,0 1.84,-0.233 2.654,-0.678c1.305,-0.707 2.256,-1.884 2.679,-3.31C236.118,106.862 235.958,105.356 235.247,104.055zM213.716,142.278l-89.381,-54.596c-3.007,-1.629 -6.557,-1.564 -9.492,0.193c-2.938,1.75 -4.692,4.833 -4.692,8.253v108.697c0,3.423 1.753,6.51 4.692,8.253c1.494,0.893 3.193,1.363 4.91,1.363c1.578,0 3.164,-0.405 4.739,-1.261l89.188,-54.162c3.029,-1.699 4.91,-4.91 4.91,-8.38C218.589,147.177 216.723,143.976 213.716,142.278zM121.28,202.127V98.854l84.774,51.775L121.28,202.127z" + android:fillColor="#FFFFFF"/> diff --git a/app/src/bittube/res/drawable-xhdpi/ic_notification_tubelab.png b/app/src/bittube/res/drawable-xhdpi/ic_notification_tubelab.png index 4d6d6d2..216e5e7 100644 Binary files a/app/src/bittube/res/drawable-xhdpi/ic_notification_tubelab.png and b/app/src/bittube/res/drawable-xhdpi/ic_notification_tubelab.png differ diff --git a/app/src/bittube/res/drawable-xxhdpi/ic_notification_tubelab.png b/app/src/bittube/res/drawable-xxhdpi/ic_notification_tubelab.png index eaa5022..2e824a3 100644 Binary files a/app/src/bittube/res/drawable-xxhdpi/ic_notification_tubelab.png and b/app/src/bittube/res/drawable-xxhdpi/ic_notification_tubelab.png differ diff --git a/app/src/bittube/res/drawable-xxxhdpi/ic_notification_tubelab.png b/app/src/bittube/res/drawable-xxxhdpi/ic_notification_tubelab.png deleted file mode 100644 index 169866f..0000000 Binary files a/app/src/bittube/res/drawable-xxxhdpi/ic_notification_tubelab.png and /dev/null differ diff --git a/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher.xml index ac94b34..7353dbd 100644 --- a/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher_round.xml index ac94b34..7353dbd 100644 --- a/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/bittube/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/bittube/res/mipmap-hdpi/ic_launcher.png b/app/src/bittube/res/mipmap-hdpi/ic_launcher.png index 440ad47..54d20ba 100644 Binary files a/app/src/bittube/res/mipmap-hdpi/ic_launcher.png and b/app/src/bittube/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/bittube/res/mipmap-hdpi/ic_launcher_round.png b/app/src/bittube/res/mipmap-hdpi/ic_launcher_round.png index 98441c9..83fc248 100644 Binary files a/app/src/bittube/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/bittube/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/bittube/res/mipmap-mdpi/ic_launcher.png b/app/src/bittube/res/mipmap-mdpi/ic_launcher.png index 118b9e8..6b2dde7 100644 Binary files a/app/src/bittube/res/mipmap-mdpi/ic_launcher.png and b/app/src/bittube/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/bittube/res/mipmap-mdpi/ic_launcher_round.png b/app/src/bittube/res/mipmap-mdpi/ic_launcher_round.png index d0754f8..18d2556 100644 Binary files a/app/src/bittube/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/bittube/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/bittube/res/mipmap-xhdpi/ic_launcher.png b/app/src/bittube/res/mipmap-xhdpi/ic_launcher.png index 5621131..96b528c 100644 Binary files a/app/src/bittube/res/mipmap-xhdpi/ic_launcher.png and b/app/src/bittube/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/bittube/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/bittube/res/mipmap-xhdpi/ic_launcher_round.png index 4859fc7..553edb8 100644 Binary files a/app/src/bittube/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/bittube/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/bittube/res/mipmap-xxhdpi/ic_launcher.png b/app/src/bittube/res/mipmap-xxhdpi/ic_launcher.png index 55890cd..af491cf 100644 Binary files a/app/src/bittube/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/bittube/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/bittube/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/bittube/res/mipmap-xxhdpi/ic_launcher_round.png index 99059ce..51c8d70 100644 Binary files a/app/src/bittube/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/bittube/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher.png index 75a224b..062724b 100644 Binary files a/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher_round.png index 9b92291..8765bf3 100644 Binary files a/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/bittube/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/google_acad/AndroidManifest.xml b/app/src/google_acad/AndroidManifest.xml index 89d0750..3313fb5 100644 --- a/app/src/google_acad/AndroidManifest.xml +++ b/app/src/google_acad/AndroidManifest.xml @@ -32,6 +32,8 @@ - + \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java b/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java index c6183d3..3aaa372 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java @@ -102,8 +102,11 @@ public class LoginActivity extends AppCompatActivity { } if (BuildConfig.FLAVOR.compareTo("queermotion") == 0) { binding.loginInstance.setText("queermotion.org"); + }else if (BuildConfig.FLAVOR.compareTo("bittube") == 0) { + binding.loginInstance.setText("bittube.video"); } + if (Helper.isTablet(LoginActivity.this)) { ViewGroup.LayoutParams layoutParamsI = binding.loginInstanceContainer.getLayoutParams(); diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java index c3a5d62..ef18590 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeRegisterActivity.java @@ -73,6 +73,8 @@ public class PeertubeRegisterActivity extends AppCompatActivity { if (BuildConfig.FLAVOR.compareTo("queermotion") == 0) { binding.loginInstance.setText("queermotion.org"); + }else if (BuildConfig.FLAVOR.compareTo("bittube") == 0) { + binding.loginInstance.setText("bittube.video"); } binding.username.setOnFocusChangeListener((view, focused) -> { diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java b/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java index c46c1f5..d07e0b4 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java +++ b/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java @@ -76,7 +76,7 @@ public class HelperInstance { case "fr": return "video.liberta.vip"; case "de": - return "peertube.at"; + return "peertube.social"; case "ru": return "peertube.su"; case "gb":