1.9.4

KhunHtetzNaing · Aug 6, 2019 · 277560d · 277560d
1 parent 405950c
commit 277560d
Show file tree

Hide file tree

Showing 35 changed files with 1,279 additions and 668 deletions.
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/README.md b/README.md
@@ -16,24 +16,29 @@ Openload, Streamango တို႔လိုလင့္ေတြကေန
 ကိုယ္ပိုင္ Player နဲ႔တိုက္႐ိုက္ျပမလား
 အဆင္ေျပသလိုအသုံးခ်ႏိုင္ပါတယ္။
 ေလာလာဆယ္ပါဝင္တဲ့ Site ေတြကေတာ့
--  **Facebook**
--  **Google Drive**
--  **Google Photos**
--  **Openload**
--  **Streamango**
--  **MegaUp**
--  **Streamcherry**
--  **RapidVideo**
--  **Mp4Upload**
--  **VidCloud**
--  **SendVid** 
--  **Mediafire** 
--  **VK** 
--  **Ok.Ru**
--  **Youtube**
--  **Twitter**
--  **SolidFiles**
--  **Vidoza**
+
+**1. Openload**
+**2. VidCloud**
+**3. StreaMango**
+**4. RapidVideo**
+**5. StreamCherry**
+**6. Google Drive**
+**7. MegaUp**
+**8. Google Photos**
+**9. Mp4Upload**
+**10. Facebook**
+**11. Mediafire**
+**12. Ok.Ru**
+**13. VK**
+**14. Twitter**
+**15. Youtube**
+**16. SolidFiles**
+**17. Vidoza**
+**18. UptoStream**
+**19. SendVid**
+**20. FanSubs**
+**21. Uptobox**
+
 တို႔ပဲျဖစ္ပါတယ္။
 ဒီဆိုဒ္ေတြအားလုံးကေန ေၾကာ္ျငာၾကည့္စရာမလိုပဲတိုက္႐ိုက္လင့္ထုတ္ေပးမွာပါ။
 အျခားအခမဲ့ Video တင္လို႔ရတဲ့ Site ေတြကိုလည္းထပ္ျဖည့္ေပးသြားပါ့မယ္ :)
@@ -55,7 +60,7 @@ Openload, Streamango တို႔လိုလင့္ေတြကေန
 
     dependencies {
     ...............
-    implementation 'com.github.KhunHtetzNaing:xGetter:1.9.3'
+    implementation 'com.github.KhunHtetzNaing:xGetter:1.9.4'
     }
 
 **Android Studio** သမားေတြဆိုရင္ေတာ့ **Sync Now** လုပ္ေပးပါ။
@@ -119,24 +124,29 @@ Openload, Streamango တို့လိုလင့်တွေကနေ
 ကိုယ်ပိုင် Player နဲ့တိုက်ရိုက်ပြမလား
 အဆင်ပြေသလိုအသုံးချနိုင်ပါတယ်။
 လောလာဆယ်ပါဝင်တဲ့ Site တွေကတော့
--  **Facebook**
--  **Google Drive**
--  **Google Photos**
--  **Openload**
--  **Streamango**
--  **MegaUp**
--  **Streamcherry**
--  **RapidVideo**
--  **Mp4Upload**
--  **VidCloud**
--  **SendVid**
--  **Mediafire**
--  **VK**
--  **Ok.Ru**
--  **Youtube**
--  **Twitter**
--  **SolidFiles**
--  **Vidoza**
+
+**1. Openload**
+**2. VidCloud**
+**3. StreaMango**
+**4. RapidVideo**
+**5. StreamCherry**
+**6. Google Drive**
+**7. MegaUp**
+**8. Google Photos**
+**9. Mp4Upload**
+**10. Facebook**
+**11. Mediafire**
+**12. Ok.Ru**
+**13. VK**
+**14. Twitter**
+**15. Youtube**
+**16. SolidFiles**
+**17. Vidoza**
+**18. UptoStream**
+**19. SendVid**
+**20. FanSubs**
+**21. Uptobox**
+
 တို့ပဲဖြစ်ပါတယ်။
 ဒီဆိုဒ်တွေအားလုံးကနေ ကြော်ငြာကြည့်စရာမလိုပဲတိုက်ရိုက်လင့်ထုတ်ပေးမှာပါ။
 အခြားအခမဲ့ Video တင်လို့ရတဲ့ Site တွေကိုလည်းထပ်ဖြည့်ပေးသွားပါ့မယ် :)
@@ -158,7 +168,7 @@ Openload, Streamango တို့လိုလင့်တွေကနေ
 
     dependencies {
     ...............
-    implementation 'com.github.KhunHtetzNaing:xGetter:1.9.3'
+    implementation 'com.github.KhunHtetzNaing:xGetter:1.9.4'
     }
 
 **Android Studio** သမားတွေဆိုရင်တော့ **Sync Now** လုပ်ပေးပါ။

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.htetznaing.xgetterexample"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 17
-        versionName "1.9.3"
+        versionCode 18
+        versionName "1.9.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -34,7 +34,5 @@ dependencies {
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'com.github.javiersantos:MaterialStyledDialogs:2.1'
     implementation 'com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT'
-    implementation 'org.jsoup:jsoup:1.11.3'
-
-
+    implementation project(path: ':xplayer')
 }
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":17,"versionName":"1.9.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"1.9.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -26,8 +26,17 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".Player.XPlayer"
+            android:name=".Player.SimpleVideoPlayer"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+
+        <activity android:name="com.htetznaing.xplayer.XPlayer"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:resizeableActivity="true"
+            android:supportsPictureInPicture="true"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.FullScreen" />
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/htetznaing/xgetterexample/MainActivity.java b/app/src/main/java/com/htetznaing/xgetterexample/MainActivity.java
@@ -4,7 +4,6 @@
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
-import android.content.ClipboardManager;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -29,8 +28,9 @@
 import com.github.javiersantos.materialstyleddialogs.enums.Style;
 import com.htetznaing.xgetter.Model.XModel;
 import com.htetznaing.xgetter.XGetter;
-import com.htetznaing.xgetterexample.Player.XPlayer;
+import com.htetznaing.xgetterexample.Player.SimpleVideoPlayer;
 import com.htetznaing.xgetterexample.Utils.XDownloader;
+import com.htetznaing.xplayer.XPlayer;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -58,13 +58,15 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onTaskCompleted(ArrayList<XModel> vidURL, boolean multiple_quality) {
                 progressDialog.dismiss();
                 if (multiple_quality){
-                    //This video you can choose qualities
-                    for (XModel model : vidURL){
-                        String url = model.getUrl();
-                        //If google drive video you need to set cookie for play or download
-                        String cookie = model.getCookie();
-                    }
-                    multipleQualityDialog(vidURL);
+                    if (vidURL!=null) {
+                        //This video you can choose qualities
+                        for (XModel model : vidURL) {
+                            String url = model.getUrl();
+                            //If google drive video you need to set cookie for play or download
+                            String cookie = model.getCookie();
+                        }
+                        multipleQualityDialog(vidURL);
+                    }else done(null);
                 }else {
                    done(vidURL.get(0));
                 }
@@ -109,15 +111,15 @@ public void streamcherry(View view) {
     }
 
     public void megaup(View view) {
-        letGo("https://megaup.net/e8ni/Logan_(2017)_720p.MP4");
+        letGo("https://megaup.net/3tD1V?pt=ns7RGzoGCR%2F0dl9WG4J0b8FWzwcixEtyF1yia8JH6zM%3D");
     }
 
     public void mp4upload(View view) {
         letGo("https://www.mp4upload.com/ct5j6f6hn1fk");
     }
 
     public void vidcloud(View view) {
-        letGo("https://vidcloud.co/v/5cbb3eeeb8fe4/44974034_123890982029283_3431405518314696625_n.mp4");
+        letGo("https://vcstream.to/embed/5d4685b52d726/34147942_424434834686205_6312223197668311040_n.mp4");
     }
 
     public void rapidvideo(View view) {
@@ -141,7 +143,7 @@ public void mediafire(View view) {
     }
 
     public void okru(View view) {
-        letGo("https://ok.ru/video/1246547348046");
+        letGo("https://ok.ru/video/31800494765");
     }
 
     public void vk(View view) {
@@ -168,6 +170,13 @@ public void uptostreamfiles(View view) {
         letGo("https://uptostream.com/iframe/eyrasguzy8lk");
     }
 
+    public void fansubs(View view) {
+        letGo("http://fansubs.tv/v/qLS5z7");
+    }
+
+    public void sendvid(View view) {
+        letGo("http://sendvid.com/3bh9588j");
+    }
 
     public boolean checkInternet() {
         boolean what = false;
@@ -198,13 +207,14 @@ private void done(XModel xModel){
                     .onPositive(new MaterialDialog.SingleButtonCallback() {
                         @Override
                         public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                            Intent intent = new Intent(getApplicationContext(),XPlayer.class);
-                            intent.putExtra("url",finalUrl);
-                            //If google drive you need to put cookie
-                            if (xModel.getCookie()!=null){
-                                intent.putExtra("cookie",xModel.getCookie());
-                            }
-                            startActivity(intent);
+//                            Intent intent = new Intent(getApplicationContext(), SimpleVideoPlayer.class);
+//                            intent.putExtra("url",finalUrl);
+//                            //If google drive you need to put cookie
+//                            if (xModel.getCookie()!=null){
+//                                intent.putExtra("cookie",xModel.getCookie());
+//                            }
+//                            startActivity(intent);
+                            watchVideo(xModel);
                         }
                     })
                     .setNegativeText("Download")
@@ -233,6 +243,16 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which)
         dialog.show();
     }
 
+    private void watchVideo(XModel xModel){
+        Intent intent = new  Intent(this, XPlayer.class);
+        intent.putExtra(XPlayer.XPLAYER_URL, xModel.getUrl());
+        if (xModel.getCookie()!=null){
+            intent.putExtra(XPlayer.XPLAYER_COOKIE,xModel.getCookie());
+        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
+    }
+
 
     private void downloadFile(XModel xModel){
         current_Xmodel = xModel;
@@ -288,28 +308,31 @@ public void showAbout() {
                 "\n" +
                 "#Supported Sites\n" +
                 "\n" +
-                "Google GDrive\n" +
-                "Google Photos\n" +
-                "Facebook\n" +
                 "Openload\n" +
-                "Streamango\n" +
-                "StreamCherry\n" +
-                "Mp4Upload\n" +
-                "RapidVideo\n" +
-                "SendVid\n" +
                 "VidCloud\n" +
+                "StreaMango\n" +
+                "RapidVideo\n" +
+                "StreamCherry\n" +
+                "Google Drive\n" +
                 "MegaUp\n" +
+                "Google Photos\n" +
+                "Mp4Upload\n" +
+                "Facebook\n" +
                 "Mediafire\n" +
-                "VK\n" +
                 "Ok.Ru\n" +
-                "Youtube\n"+
-                "Twitter\n"+
-                "SolidFiles\n"+
-                "Vidoza\n"+
-                "UptoStream\n"+
+                "VK\n" +
+                "Twitter\n" +
+                "Youtube\n" +
+                "SolidFiles\n" +
+                "Vidoza\n" +
+                "UptoStream\n" +
+                "SendVid\n" +
+                "FanSubs\n"+
                 "Uptobox\n"+
                 "\n" +
-                "Github Repo => https://github.com/KhunHtetzNaing/xGetter";
+                "Github Repo => https://github.com/KhunHtetzNaing/xGetter" +
+                "\n" +
+                "Developer => https://facebook.com/KhunHtetzNaing0";
         View view = getLayoutInflater().inflate(R.layout.done, null);
         TextView textView = view.findViewById(R.id.message);
         textView.setText(message);
@@ -418,7 +441,7 @@ public void downloadWithADM(XModel xModel) {
     }
 
     //Example Open Google Drive Video with MX Player
-    private void openWithMXPlayer(XModel xModel){
+    private void openWithMXPlayer(XModel xModel) {
         boolean appInstalledOrNot = appInstalledOrNot("com.mxtech.videoplayer.ad");
         boolean appInstalledOrNot2 = appInstalledOrNot("com.mxtech.videoplayer.pro");
         String str2;
@@ -436,7 +459,7 @@ private void openWithMXPlayer(XModel xModel){
                 intent.setDataAndType(Uri.parse(xModel.getUrl()), "application/x-mpegURL");
                 intent.setPackage(str2);
                 intent.setClassName(str2, str3);
-                if (xModel.getCookie()!=null) {
+                if (xModel.getCookie() != null) {
                     intent.putExtra("headers", new String[]{"cookie", xModel.getCookie()});
                     intent.putExtra("secure_uri", true);
                 }