Skip to content

Commit

Permalink
1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
KhunHtetzNaing committed Mar 26, 2019
1 parent 200be0b commit febe7da
Show file tree
Hide file tree
Showing 10 changed files with 351 additions and 18 deletions.
Binary file modified .idea/caches/gradle_models.ser
Binary file not shown.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "com.htetznaing.xgetterexample"
minSdkVersion 17
targetSdkVersion 28
versionCode 4
versionName "1.4"
versionCode 5
versionName "1.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified app/release/app-release.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion app/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"1.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
32 changes: 30 additions & 2 deletions app/src/main/java/com/htetznaing/xgetterexample/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.ContextThemeWrapper;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand All @@ -16,6 +15,8 @@
import android.widget.TextView;
import android.widget.Toast;

import com.htetznaing.xgetter.OkRuLinks;
import com.htetznaing.xgetter.VkLinks;
import com.htetznaing.xgetter.XGetter;
import com.htetznaing.xgetterexample.Player.MyExoPlayer;

Expand Down Expand Up @@ -50,6 +51,22 @@ public void onFbTaskCompleted(String sd, String hd) {
} else done(null, null, null, false, true);
}

@Override
public void onOkRuTaskCompleted(OkRuLinks okRuLinks) {
progressDialog.dismiss();
if (okRuLinks.getHD()!=null){
done(okRuLinks.getHD(),null,null,false,false);
} else done(null, null, null, false, true);
}

@Override
public void onVkTaskComplete(VkLinks vkLinks) {
progressDialog.dismiss();
if (vkLinks.getUrl720()!=null){
done(vkLinks.getUrl720(),null,null,false,false);
} else done(null, null, null, false, true);
}

@Override
public void onError() {
progressDialog.dismiss();
Expand Down Expand Up @@ -93,7 +110,7 @@ public void vidcloud(View view) {
}

public void rapidvideo(View view) {
letGo("https://www.rapidvideo.com/v/FY1NF585GW");
letGo("https://www.rapidvideo.com/v/FW5M4CBTFF");
}

public void gdrive(View view) {
Expand All @@ -112,6 +129,14 @@ public void mediafire(View view) {
letGo("http://www.mediafire.com/file/dd00f818ybeu83x/");
}

public void okru(View view) {
letGo("https://ok.ru/video/1246547348046");
}

public void vk(View view) {
letGo("https://vk.com/video-94920838_456240508");
}

public boolean checkInternet() {
boolean what = false;
CheckInternet checkNet = new CheckInternet(this);
Expand Down Expand Up @@ -218,6 +243,9 @@ public void showAbout() {
"SendVid\n" +
"VidCloud\n" +
"MegaUp\n" +
"Mediafire\n" +
"VK\n" +
"Ok.Ru" +
"\n" +
"Github Repo => https://github.com/KhunHtetzNaing/xGetter";
View view = getLayoutInflater().inflate(R.layout.done, null);
Expand Down
17 changes: 15 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
android:layout_height="match_parent">

<Button
android:onClick="mediafire"
android:text="Mediafire"
android:onClick="vk"
android:text="VK"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

Expand Down Expand Up @@ -93,6 +93,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />


<Button
android:onClick="mediafire"
android:text="Mediafire"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -132,6 +139,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<Button
android:onClick="okru"
android:text="Ok.ru"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</LinearLayout>

</LinearLayout>
Expand Down
7 changes: 4 additions & 3 deletions xgetter/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group='com.htetznaing'
version='1.4'
version='1.5'

android {
compileSdkVersion 26
defaultConfig {
minSdkVersion 17
targetSdkVersion 26
versionCode 4
versionName "1.4"
versionCode 5
versionName "1.5"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand All @@ -30,4 +30,5 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.volley:volley:1.1.1'
implementation 'org.apache.commons:commons-lang3:3.8.1'
}
85 changes: 85 additions & 0 deletions xgetter/src/main/java/com/htetznaing/xgetter/OkRuLinks.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package com.htetznaing.xgetter;

public class OkRuLinks {
String url;
String mobile144px;
String lowest240px;
String low360px;
String sd480px;
String HD;
String FullHD;
String quad2K;
String ultra4K;

public String getUrl() {
return url;
}

public String getMobile144px() {
return mobile144px;
}

public String getLowest240px() {
return lowest240px;
}

public String getLow360px() {
return low360px;
}

public String getSd480px() {
return sd480px;
}

public String getHD() {
return HD;
}

public String getFullHD() {
return FullHD;
}

public String getQuad2K() {
return quad2K;
}

public String getUltra4K() {
return ultra4K;
}

public void setUrl(String url) {
this.url = url;
}

public void setMobile144px(String mobile144px) {
this.mobile144px = mobile144px;
}

public void setLowest240px(String lowest240px) {
this.lowest240px = lowest240px;
}

public void setLow360px(String low360px) {
this.low360px = low360px;
}

public void setSd480px(String sd480px) {
this.sd480px = sd480px;
}

public void setHD(String HD) {
this.HD = HD;
}

public void setFullHD(String fullHD) {
FullHD = fullHD;
}

public void setQuad2K(String quad2K) {
this.quad2K = quad2K;
}

public void setUltra4K(String ultra4K) {
this.ultra4K = ultra4K;
}
}
45 changes: 45 additions & 0 deletions xgetter/src/main/java/com/htetznaing/xgetter/VkLinks.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.htetznaing.xgetter;

public class VkLinks {
String url240,url360,url480,url720,url1080;

public String getUrl240() {
return url240;
}

public void setUrl240(String url240) {
this.url240 = url240;
}

public String getUrl360() {
return url360;
}

public void setUrl360(String url360) {
this.url360 = url360;
}

public String getUrl480() {
return url480;
}

public void setUrl480(String url480) {
this.url480 = url480;
}

public String getUrl720() {
return url720;
}

public void setUrl720(String url720) {
this.url720 = url720;
}

public String getUrl1080() {
return url1080;
}

public void setUrl1080(String url1080) {
this.url1080 = url1080;
}
}
Loading

0 comments on commit febe7da

Please sign in to comment.