From d6f7b4706b6acee64779aa7da23f5b792967d386 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Fri, 30 Mar 2018 11:09:07 +0200 Subject: [PATCH 1/6] remove beta build --- app/build.gradle | 8 --- app/src/beta/AndroidManifest.xml | 10 ---- app/src/beta/res/mipmap-hdpi/ic_launcher.png | Bin 5980 -> 0 bytes app/src/beta/res/mipmap-mdpi/ic_launcher.png | Bin 3098 -> 0 bytes app/src/beta/res/mipmap-xhdpi/ic_launcher.png | Bin 8250 -> 0 bytes .../beta/res/mipmap-xxhdpi/ic_launcher.png | Bin 13603 -> 0 bytes .../beta/res/mipmap-xxxhdpi/ic_launcher.png | Bin 19384 -> 0 bytes .../java/org/schabi/newpipe/MainActivity.java | 51 ++++++++---------- .../schabi/newpipe/util/ServiceHelper.java | 1 - 9 files changed, 23 insertions(+), 47 deletions(-) delete mode 100644 app/src/beta/AndroidManifest.xml delete mode 100644 app/src/beta/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/beta/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/beta/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/beta/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/build.gradle b/app/build.gradle index 865c807ac..54ec9a84e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,13 +26,6 @@ android { debuggable true applicationIdSuffix ".debug" } - beta { - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - - applicationIdSuffix ".beta" - } } lintOptions { @@ -98,7 +91,6 @@ dependencies { annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion" debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion" - betaImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion" implementation 'com.squareup.okhttp3:okhttp:3.9.1' diff --git a/app/src/beta/AndroidManifest.xml b/app/src/beta/AndroidManifest.xml deleted file mode 100644 index dd390a318..000000000 --- a/app/src/beta/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/beta/res/mipmap-hdpi/ic_launcher.png b/app/src/beta/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 73c65771dc6fef5769941fe911817560e21a9256..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5980 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 diff --git a/app/src/beta/res/mipmap-xhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index e871a3ea99b5420468d18adfafd3f94ab7d5a000..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8250 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%0D%<4N<@EqgVerpmPQ85LXyIVeQZsN;gtA; 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 diff --git a/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index e38901a86be424dc26bbbafb04c000c59d0c6956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13603 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 diff --git a/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1cf7e64be4ad8695b2015e55d8bb0940931ecf85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19384 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 a;Qs+RKIVhDS48Ll0000 Date: Fri, 30 Mar 2018 11:52:05 +0200 Subject: [PATCH 2/6] remove entry points in three dot menu in main screen --- .../java/org/schabi/newpipe/MainActivity.java | 3 --- app/src/main/res/menu/main_menu.xml | 19 +------------------ 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 725458816..4a02d66ed 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -307,9 +307,6 @@ public class MainActivity extends AppCompatActivity { case R.id.action_about: NavigationHelper.openAbout(this); return true; - case R.id.action_history: - NavigationHelper.openHistory(this); - return true; default: return super.onOptionsItemSelected(item); } diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 02402e2e8..df22b47c0 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -1,22 +1,5 @@ - - - - - - - - + Date: Fri, 30 Mar 2018 14:46:26 +0200 Subject: [PATCH 3/6] remove global ip range label --- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-bn-rBD/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 19 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d716f71cc..c13e92521 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -154,7 +154,7 @@ تقرير معلومات: ماذا حدث: - What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:\\nGlob. IP range: + What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version: تعليقك (باللغة الإنجليزية): تفاصيل: diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index f6dc3bcb8..1034e361c 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -108,7 +108,6 @@ প্রতিবেদন তথ্য: কি হয়েছিল: - তোমার মন্তব্য (ইংরেজিতে): বর্ণনা: diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index aa8736faf..9c268b4eb 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -129,7 +129,7 @@ Hlášení uživatele - Co:\\nŽádost:\\nJazyk obsahu:\\nSlužba:\\nČas GMT:\\nBalíček:\\nVerze:\\nVerze OS:\\nGlobální rozsah IP: + Co:\\nŽádost:\\nJazyk obsahu:\\nSlužba:\\nČas GMT:\\nBalíček:\\nVerze:\\nVerze OS: Vše Kanál Ano diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 4a1398b1b..c755f8e73 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -236,7 +236,7 @@ Haluatko poistaa tämän hakuhistoriasta? Jatka toistoa Info: - Mikä:\\nPyyntö:\\nSisällön kieli:\\nPalvelu:\\nGMT Aika:\\nPaketti:\\nVersio:\\nOS versio:\\nGlob. IP väli: + Mikä:\\nPyyntö:\\nSisällön kieli:\\nPalvelu:\\nGMT Aika:\\nPaketti:\\nVersio:\\nOS versio: © %1$s %2$s %3$s alla Pääsivun sisältö Tyhjä sivu diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ca49189c3..b070da6c5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -141,7 +141,7 @@ Plus tard Désactivé - Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure GMT :\\nPaquet :\\nVersion :\\nVersion du système :\\nGlob. Plage IP : + Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure GMT :\\nPaquet :\\nVersion :\\nVersion du système : Utiliser l\'ancien lecteur Ancienne version du lecteur Mediaframework K diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index fd4a7035d..059b4112e 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -165,7 +165,7 @@ रिपोर्ट जानकारी: क्या हुआ: - क्या:\\nमांग:\\nविषयवस्तु की भाषा:\\nसेवा:\\nजीएमटी समय:\\nपैकेज:\\nसंस्करण:\\nOS संस्करण:\\nGLOB. IP रेंज: + क्या:\\nमांग:\\nविषयवस्तु की भाषा:\\nसेवा:\\nजीएमटी समय:\\nपैकेज:\\nसंस्करण:\\nOS संस्करण: आपकी टिप्पणी: विवरण: diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 45be7324e..2b493d953 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -124,7 +124,7 @@ PRIJAVI Informacije: Što se dogodilo: - Što:\\nRequest:\\nContent Jezik:\\nService:\\nGMT Vrijeme:\\nPackage:\\nVersion:\\nOS version:\\nGlob. IP range: + Što:\\nRequest:\\nContent Jezik:\\nService:\\nGMT Vrijeme:\\nPackage:\\nVersion:\\nOS version: Vaš komentar (na engleskom): Detalji: diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 919edb3f1..965b19031 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -191,7 +191,7 @@ Nem található videó formátum Nem található hang csatorna - Mi:\\nKérés:\\nTartalom nyelve:\\nSzolgáltatás:\\nGMT Idő:\\nCsomag:\\nVerzió:\\nOperációs Rendszer verzió:\\nGlobális IP tartomány: + Mi:\\nKérés:\\nTartalom nyelve:\\nSzolgáltatás:\\nGMT Idő:\\nCsomag:\\nVerzió:\\nOperációs Rendszer verzió: Nincs találat Régi lejátszó használata diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index df6df710e..fa50cc5f3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -127,7 +127,7 @@ Impossibile caricare l\'immagine L\'app/UI si è interrotta - Cosa:\\nRichiesta:\\nLingua contenuto:\\nServizio:\\nOrario GMT:\\nPacchetto:\\nVersione:\\nVersione SO:\\nRange IP glob.: + Cosa:\\nRichiesta:\\nLingua contenuto:\\nServizio:\\nOrario GMT:\\nPacchetto:\\nVersione:\\nVersione SO: reCAPTCHA reCAPTCHA diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 00cca771f..3438a5ee9 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -128,7 +128,7 @@ 画像を読み込みできません アプリ/UI がクラッシュしました - 何:\\n提案:\\nｺﾝﾃﾝﾂ言語:\\nｻｰﾋﾞｽ:\\nGMT 時間:\\nﾊﾟｯｹｰｼﾞ:\\nﾊﾞｰｼﾞｮﾝ:\\nOS ﾊﾞｰｼﾞｮﾝ:\\nｸﾞﾛｰﾊﾞﾙ IP 範囲: + 何:\\n提案:\\nｺﾝﾃﾝﾂ言語:\\nｻｰﾋﾞｽ:\\nGMT 時間:\\nﾊﾟｯｹｰｼﾞ:\\nﾊﾞｰｼﾞｮﾝ:\\nOS ﾊﾞｰｼﾞｮﾝ: reCAPTCHA reCAPTCHA の要求 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index de6e122f0..1438b8721 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -102,7 +102,7 @@ ATASKAITA Informacija: Kas nutiko: - Kas:\\nUžklausa:\\nTurinys Kalba:\\nPaslauga:\\nGMT Time:\\nPaketas:\\nVersija:\\nOperacinė Sistema versija:\\nGlob. IP diapazonas: + Kas:\\nUžklausa:\\nTurinys Kalba:\\nPaslauga:\\nGMT Time:\\nPaketas:\\nVersija:\\nOperacinė Sistema versija: Jūsų komentaras (anglų kalba): Detalės: diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a7dce00ca..c864a1cf1 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -148,7 +148,7 @@ pentru a deschide în mod pop-up Nu s-a putut încărca imaginea App/UI eroare - What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:\\nGlob. IP clasa: + What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version: Folosește player vechi Player Mediaframework implicit diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e620d55ba..17fe26360 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -123,7 +123,7 @@ Nemožno načítať obrázok Aplikácia/UP zlyhalo - Čo:\\nPožiadavka:\\nJazyk obsahu:\\nSlužba:\\nČas v GMT:\\nBalík:\\nVerzia:\\nVerzia OS:\\nGlob. IP rozsah: + Čo:\\nPožiadavka:\\nJazyk obsahu:\\nSlužba:\\nČas v GMT:\\nBalík:\\nVerzia:\\nVerzia OS: reCAPTCHA Výzva reCAPTCHA diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 736bb12ae..e9fff8553 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -77,7 +77,7 @@ BİLDİR Bilgi: Ne oldu: - Ne:\\nİstek:\\nİçerik Dili:\\nHizmet:\\nGMT Zamanı:\\nPaket:\\nSürüm:\\nİşletim sistemi sürümü:\\nGlob. IP aralığı: + Ne:\\nİstek:\\nİçerik Dili:\\nHizmet:\\nGMT Zamanı:\\nPaket:\\nSürüm:\\nİşletim sistemi sürümü: Video ön izleme küçük resmi Yükleyenin küçük resmi Beğeni diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 352f274ea..6a4ddcfaf 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -252,7 +252,7 @@ Перемкнути орієнтацію Фатальна помилка програвача Зовнішні програвачі не підтримують такі види ланок - Що:\\nЗапит:\\nМова змісту:\\nСервіс:\\nЧас GMT:\\nПакунок:\\nВерсія:\\nВерсія ОС:\\nГлоб. діапазон IP : + Що:\\nЗапит:\\nМова змісту:\\nСервіс:\\nЧас GMT:\\nПакунок:\\nВерсія:\\nВерсія ОС: Ескіз аватару користувача Сподобалося Не сподобалося diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 0bc849996..1c3fe27a6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -102,7 +102,7 @@ BÁo CÁO Thông tin: Chuyện gì đã xảy ra: - Gì: \\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:\\nGlob. IP range: + Gì: \\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version: Nhận xét của bạn (bằng tiếng Anh): Chi tiết: diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 5c536a72a..e21f8f1ea 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -135,7 +135,7 @@ 稍候 無法取得圖片 應用程式或介面出現問題 - 事件：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\nPackage：\\n版本：\\n作業系統版本：\\n全球 IP 域： + 事件：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\nPackage：\\n版本：\\n作業系統版本： 使用舊播放器 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 17982f7cf..45af6b88c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -113,7 +113,7 @@ 回報 資訊： 發生了什麼事： - 發生了什麼：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\n套件：\\n版本：\\n系統版本：\\nGlob. IP 範圍： + 發生了什麼：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\n套件：\\n版本：\\n系統版本： 您的留言(請用英文)： 詳細資訊： diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index effdeaaba..3f1193b8d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -189,7 +189,7 @@ REPORT Info: What happened: - What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:\\nGlob. IP range: + What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version: Your comment (in English): Details: From fae777c14c7a29039beadb00ada813b24c71b9d6 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Fri, 30 Mar 2018 18:41:11 +0200 Subject: [PATCH 4/6] make service items in drawer be dynamicly generated --- .../main/java/org/schabi/newpipe/MainActivity.java | 14 ++++++++++---- .../org/schabi/newpipe/util/ServiceHelper.java | 7 +++++++ app/src/main/res/layout/drawer_layout.xml | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 4a02d66ed..8285a445e 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -44,7 +44,6 @@ import android.view.View; import android.widget.Button; import android.widget.ImageButton; import android.widget.TextView; -import android.widget.Toast; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.StreamingService; @@ -94,7 +93,15 @@ public class MainActivity extends AppCompatActivity { drawer = findViewById(R.id.drawer_layout); drawerItems = findViewById(R.id.navigation); - //drawerItems.setItemIconTintList(null); // Set null to use the original icon + for(StreamingService s : NewPipe.getServices()) { + String title = + s.getServiceInfo().getName() + + (ServiceHelper.isBeta(s) ? " (beta)" : ""); + MenuItem item = drawerItems.getMenu() + .add(R.id.menu_services_group, s.getServiceId(), 0, title); + item.setIcon(ServiceHelper.getIcon(s.getServiceId())); + } + drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true); toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close); @@ -126,9 +133,8 @@ public class MainActivity extends AppCompatActivity { private boolean changeService(MenuItem item) { if (item.getGroupId() == R.id.menu_services_group) { drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false); - ServiceHelper.setSelectedServiceId(this, item.getTitle().toString()); + ServiceHelper.setSelectedServiceId(this, item.getItemId()); drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true); - headerServiceView.setText("gurken"); } else { return false; } diff --git a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java index 3bf509d08..d86f27f2f 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java @@ -109,4 +109,11 @@ public class ServiceHelper { return TimeUnit.MILLISECONDS.convert(1, TimeUnit.HOURS); } } + + public static boolean isBeta(final StreamingService s) { + switch(s.getServiceInfo().getName()) { + case "YouTube": return false; + default: return true; + } + } } diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml index aba90430c..c0186a02c 100644 --- a/app/src/main/res/layout/drawer_layout.xml +++ b/app/src/main/res/layout/drawer_layout.xml @@ -75,8 +75,8 @@ android:layout_below="@id/drawer_header" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:menu="@menu/drawer_items" app:elevation="0dp"/> + Date: Fri, 30 Mar 2018 18:45:27 +0200 Subject: [PATCH 5/6] update build tools to 27.0.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcdfeb9b2..d5d3aed9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ android: components: # The BuildTools version used by NewPipe - tools - - build-tools-27.0.1 + - build-tools-27.0.3 # The SDK version used to compile NewPipe - android-27 From bcb26c5721c51922140b219c648e0c906a8242f5 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Sun, 1 Apr 2018 15:29:57 +0200 Subject: [PATCH 6/6] move on to version 0.13.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 54ec9a84e..3f099c4fe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.schabi.newpipe" minSdkVersion 15 targetSdkVersion 27 - versionCode 49 - versionName "0.13.0" + versionCode 60 + versionName "0.13.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true