diff --git a/app/build.gradle b/app/build.gradle index 81d4385..9fc3d23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { minSdkVersion 24 //noinspection OldTargetApi targetSdkVersion 31 - versionCode 11 - versionName "3.1-beta2" + versionCode 12 + versionName "3.2-alpha.1" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -53,6 +53,7 @@ android { implementation platform('com.google.firebase:firebase-bom:29.0.3') implementation 'com.google.firebase:firebase-crashlytics' implementation 'com.google.firebase:firebase-analytics' + implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: []) } } diff --git a/app/libs/swipy.aar b/app/libs/swipy.aar new file mode 100644 index 0000000..ffa3730 Binary files /dev/null and b/app/libs/swipy.aar differ diff --git a/app/src/main/java/com/kfmdmsolutions/ivelt/MainActivity.java b/app/src/main/java/com/kfmdmsolutions/ivelt/MainActivity.java index 2b12b92..928ff90 100644 --- a/app/src/main/java/com/kfmdmsolutions/ivelt/MainActivity.java +++ b/app/src/main/java/com/kfmdmsolutions/ivelt/MainActivity.java @@ -60,6 +60,9 @@ import com.kfmdmsolutions.ivelt.Utilities.Logger; import com.kfmdmsolutions.ivelt.Utilities.Utils; import com.kfmdmsolutions.ivelt.Utilities.WebkitCookieManagerProxy; +import com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout; +import com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayoutDirection; + import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; @@ -72,11 +75,11 @@ import static android.webkit.WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity implements SwipyRefreshLayout.OnRefreshListener { private static Bundle webviewBundle; WebView mywebView; String sURL, sFileName, sUserAgent; - SwipeRefreshLayout swipeRefreshLayout; + private SwipyRefreshLayout mSwipyRefreshLayout; String currentUrl = "https://www.ivelt.com/"; String url = null; Logger logger; @@ -93,6 +96,8 @@ public class MainActivity extends AppCompatActivity { private String mCameraPhotoPath; +// private ActivityMainBinding mBinding; + public int getBundleSizeInBytes(Bundle bundle ) { Parcel parcel = Parcel.obtain(); parcel.writeValue(bundle); @@ -188,8 +193,9 @@ protected void onCreate(Bundle savedInstanceState) { } mywebView = findViewById(R.id.webview); - swipeRefreshLayout = findViewById(R.id.swipeContainer); - swipeRefreshLayout.setNestedScrollingEnabled(true); + mSwipyRefreshLayout = (SwipyRefreshLayout) findViewById(R.id.swipeContainer); +// SwipyRefreshLayoutDirection = findViewById(R.id.swipeContainer); +// SwipyRefreshLayoutDirection.setNestedScrollingEnabled(true); WebViewAssetLoader.AssetsPathHandler assetsHandler = new WebViewAssetLoader.AssetsPathHandler(this); WebViewAssetLoader loader = new WebViewAssetLoader.Builder() .setDomain("www.ivelt.com") @@ -280,7 +286,8 @@ protected void onCreate(Bundle savedInstanceState) { }); - swipeRefreshLayout.setOnRefreshListener(() -> mywebView.reload()); +// mywebView.swipe + mSwipyRefreshLayout.setOnRefreshListener(this); } @@ -359,6 +366,8 @@ public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGest android.util.Log.d("OCW", "is dialog " + isDialog); view.getOriginalUrl(); url = view.getHitTestResult().getExtra(); + + android.util.Log.d("OCW", "url " + view.getOriginalUrl()); if(url != null && href.getData() != null && shouldOverrideUrlLoading(mywebView, Uri.parse(url))){ return false; @@ -400,7 +409,7 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request @Override public void onPageFinished(WebView view, String url) { - swipeRefreshLayout.setRefreshing(false); + mSwipyRefreshLayout.setRefreshing(false); super.onPageFinished(view, url); } }); @@ -428,7 +437,7 @@ public boolean onConsoleMessage(ConsoleMessage consoleMessage) { resultMsg.sendToTarget(); - swipeRefreshLayout.setRefreshing(true); + mSwipyRefreshLayout.setRefreshing(true); alertDialog.show(); return true; } @@ -528,6 +537,7 @@ public void onActivityResult (int requestCode, int resultCode, Intent data) { } private void downloadFile(String fileName, String url, String userAgent) { try { + logger.log("mimatype = " +getMimeType(fileName)); String mimeType = getMimeType(fileName); DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url)); @@ -542,7 +552,7 @@ private void downloadFile(String fileName, String url, String userAgent) { .setAllowedOverRoaming(true) .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE | DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) .setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName); - + downloadManager.enqueue(request); sURL = ""; sFileName = ""; @@ -670,7 +680,7 @@ private boolean handleIvelt(String url, WebView view){ startActivity(intent); return true; } - swipeRefreshLayout.setRefreshing(true); +// swipeRefreshLayout.setRefreshing(true); return false; } @@ -767,6 +777,12 @@ public void like() { animatorSet.start(); } + @Override + public void onRefresh(SwipyRefreshLayoutDirection direction) { + mywebView.reload(); + + } + public class CustomWebViewClient extends WebViewClient { @@ -827,7 +843,7 @@ public void onScaleChanged(WebView view, float oldScale, @Override public void onPageFinished(WebView view, String url) { - swipeRefreshLayout.setRefreshing(false); + mSwipyRefreshLayout.setRefreshing(false); FirebaseCrashlytics.getInstance().log("current url " + currentUrl); logger.log("Page finished for url " + url); @@ -898,11 +914,11 @@ public void onReceivedHttpError(WebView view, WebResourceRequest request, WebRes } private void showProgress() { - swipeRefreshLayout.setRefreshing(true); + mSwipyRefreshLayout.setRefreshing(true); } private void hideProgress() { - swipeRefreshLayout.setRefreshing(false); + mSwipyRefreshLayout.setRefreshing(false); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4ef5b5a..53fd24a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,8 +1,11 @@ - - \ No newline at end of file +