update android app fixed bugs

Android App/.idea/deploymentTargetSelector.xml

@@ -4,17 +4,6 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-06T18:12:39.367387Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=f542e44" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-      <SelectionState runConfigName="MainActivity">
-        <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>
   </component>

Android App/.idea/gradle.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

Android App/.idea/other.xml

@@ -262,7 +262,7 @@
           <option name="codename" value="q6q" />
           <option name="id" value="q6q" />
           <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-F956B" />
+          <option name="name" value="Galaxy Z Fold6" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1856" />
           <option name="screenY" value="2160" />

Android App/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

Android App/app/build.gradle

@@ -7,11 +7,11 @@ android {
     compileSdk 34
 
     defaultConfig {
-        applicationId "com.jatinmehra.pdfinsightpro"
+        applicationId 'com.jatinmehra.pdfinsightpro'
         minSdk 24
         targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName '1.2.0'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

Android App/app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 3,
+      "versionName": "1.2.0",
       "outputFile": "app-release.apk"
     }
   ],

Android App/app/src/androidTest/java/com/jatinmehra/pdfinsightpro/ExampleInstrumentedTest.java

@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.jatinmehra.pdfinsightpro", appContext.getPackageName());
+        assertEquals("com.jatinmehra.pdf_insight_pro", appContext.getPackageName());
     }
 }

Android App/app/src/main/AndroidManifest.xml

@@ -2,35 +2,33 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Internet Permission -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- Storage Permissions -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
-        android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/ic_launcher_background"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.PDFInsightPro"
+        android:theme="@style/Theme.PDFInsightPRO"
         tools:targetApi="31">
-
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="false" />
+        <activity
+            android:name=".SplashActivity"
+            android:exported="true"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
     </application>
 
 </manifest>

Android App/app/src/main/java/com/jatinmehra/pdfinsightpro/MainActivity.java

@@ -1,9 +1,20 @@
 package com.jatinmehra.pdfinsightpro;
 
-import android.annotation.SuppressLint;
+import android.Manifest;
+import android.app.AlertDialog;
+import android.app.DownloadManager;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.webkit.CookieManager;
+import android.webkit.URLUtil;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
@@ -16,73 +27,134 @@ import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 
-    private WebView myweb;
+    private static final int FILE_CHOOSER_REQUEST_CODE = 1;
+
+    String websiteURL = "https://jatinmehra-pdf-insight-pro.hf.space";
+    private WebView webview;
     private ValueCallback<Uri[]> filePathCallback;
 
-    // File chooser launcher
-    private final ActivityResultLauncher<Intent> fileChooserLauncher = registerForActivityResult(
-            new ActivityResultContracts.StartActivityForResult(), result -> {
-                if (filePathCallback != null) {
-                    Uri[] resultUris = null;
-                    if (result.getResultCode() == RESULT_OK && result.getData() != null) {
-                        resultUris = new Uri[]{result.getData().getData()};
-                    }
-                    filePathCallback.onReceiveValue(resultUris);
-                    filePathCallback = null;
+    private final ActivityResultLauncher<Intent> fileChooserLauncher =
+            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+                if (filePathCallback == null) return;
+
+                Uri[] results = null;
+                if (result.getResultCode() == RESULT_OK && result.getData() != null) {
+                    results = new Uri[]{result.getData().getData()};
                 }
-            }
-    );
+                filePathCallback.onReceiveValue(results);
+                filePathCallback = null;
+            });
 
-    @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        // Initialize WebView
-        myweb = findViewById(R.id.myweb);
-        myweb.getSettings().setJavaScriptEnabled(true);
-
-        // Set WebViewClient to handle all URL navigation
-        myweb.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                // Handle mailto links
-                if (url.startsWith("mailto:")) {
-                    Intent intent = new Intent(Intent.ACTION_SENDTO);
-                    intent.setData(Uri.parse(url)); // Open the default email app
-                    startActivity(intent);
-                    return true;
-                }
-                return super.shouldOverrideUrlLoading(view, url);
+        if (!CheckNetwork.isInternetAvailable(this)) {
+            setContentView(R.layout.activity_main);
+
+            new AlertDialog.Builder(this)
+                    .setTitle("No internet connection available")
+                    .setMessage("Please Check your Mobile data or Wi-Fi network.")
+                    .setPositiveButton("Ok", (dialog, which) -> finish())
+                    .show();
+        } else {
+            webview = findViewById(R.id.webView);
+            webview.getSettings().setJavaScriptEnabled(true);
+            webview.getSettings().setDomStorageEnabled(true);
+            webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER);
+            webview.loadUrl(websiteURL);
+            webview.setWebViewClient(new WebViewClientDemo());
+            webview.setWebChromeClient(new WebChromeClientDemo());
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
+                Log.d("permission", "permission denied to WRITE_EXTERNAL_STORAGE - requesting it");
+                String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
+                requestPermissions(permissions, 1);
             }
+        }
+
+        webview.setDownloadListener((url, userAgent, contentDisposition, mimeType, contentLength) -> {
+            DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+            request.setMimeType(mimeType);
+            String cookies = CookieManager.getInstance().getCookie(url);
+            request.addRequestHeader("cookie", cookies);
+            request.addRequestHeader("User-Agent", userAgent);
+            request.setDescription("Downloading file....");
+            request.setTitle(URLUtil.guessFileName(url, contentDisposition, mimeType));
+            request.allowScanningByMediaScanner();
+            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, URLUtil.guessFileName(url, contentDisposition, mimeType));
+            DownloadManager dm = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
+            dm.enqueue(request);
+            Toast.makeText(getApplicationContext(), "Downloading File", Toast.LENGTH_SHORT).show();
         });
+    }
 
-        // Set WebChromeClient to handle file chooser requests
-        myweb.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
-                // Store the callback and open the file picker
-                MainActivity.this.filePathCallback = filePathCallback;
-                Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-                intent.addCategory(Intent.CATEGORY_OPENABLE);
-                intent.setType("application/pdf"); // Ensure PDF files are picked
-                fileChooserLauncher.launch(intent);
-                return true;
+    private class WebViewClientDemo extends WebViewClient {
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            view.loadUrl(url);
+            return true;
+        }
+    }
+
+    private class WebChromeClientDemo extends WebChromeClient {
+        @Override
+        public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+            if (MainActivity.this.filePathCallback != null) {
+                MainActivity.this.filePathCallback.onReceiveValue(null);
             }
-        });
+            MainActivity.this.filePathCallback = filePathCallback;
 
-        // Load your Streamlit app URL
-        myweb.loadUrl("https://jatinmehra-pdf-insight-pro.hf.space");
+            Intent intent = fileChooserParams.createIntent();
+            try {
+                fileChooserLauncher.launch(intent);
+            } catch (Exception e) {
+                MainActivity.this.filePathCallback = null;
+                Toast.makeText(MainActivity.this, "File upload failed: " + e.getMessage(), Toast.LENGTH_SHORT).show();
+                return false;
+            }
+            return true;
+        }
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        // Clean up the filePathCallback to avoid memory leaks
-        if (filePathCallback != null) {
-            filePathCallback.onReceiveValue(null);
-            filePathCallback = null;
+    public void onBackPressed() {
+        if (webview.isFocused() && webview.canGoBack()) {
+            webview.goBack();
+        } else {
+            new AlertDialog.Builder(this)
+                    .setTitle("EXIT")
+                    .setMessage("You want to close this app?")
+                    .setPositiveButton("Yes", (dialog, which) -> finish())
+                    .setNegativeButton("No", null)
+                    .show();
         }
     }
 }
+
+class CheckNetwork {
+
+    private static final String TAG = CheckNetwork.class.getSimpleName();
+
+    public static boolean isInternetAvailable(Context context) {
+        NetworkInfo info = ((ConnectivityManager)
+                context.getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
+
+        if (info == null) {
+            Log.d(TAG, "no internet connection");
+            return false;
+        } else {
+            if (info.isConnected()) {
+                Log.d(TAG, " internet connection available...");
+                return true;
+            } else {
+                Log.d(TAG, " internet connection");
+                return true;
+            }
+        }
+    }
+}

Android App/app/src/main/java/com/jatinmehra/pdfinsightpro/SplashActivity.java

@@ -0,0 +1,73 @@
+package com.jatinmehra.pdfinsightpro;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+
+import android.content.Intent;
+
+import android.os.Bundle;
+
+import android.view.Window;
+
+import android.view.WindowManager;
+
+
+public class SplashActivity extends AppCompatActivity {
+
+
+    @Override
+
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+
+        Window window = getWindow() ;
+
+
+        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        setContentView(R.layout.activity_splash);
+
+
+
+
+        Thread splashTread = new Thread(){
+
+
+            @Override
+
+            public void run() {
+
+                try {
+
+                    sleep(3000);
+
+                    startActivity(new Intent(getApplicationContext(),MainActivity.class));
+
+                    finish();
+
+                } catch (InterruptedException e) {
+
+                    e.printStackTrace();
+
+                }
+
+
+                super.run();
+
+            }
+
+        };
+
+
+        splashTread.start();
+
+
+
+
+
+    }
+
+
+}

Android App/app/src/main/res/layout/activity_main.xml

@@ -8,11 +8,15 @@
     tools:context=".MainActivity">
 
     <WebView
-        android:id="@+id/myweb"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/webView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        tools:ignore="MissingConstraints" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

Android App/app/src/main/res/layout/activity_splash.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+
+    android:layout_height="match_parent"
+
+    android:orientation="vertical"
+
+    tools:context=".SplashActivity">
+
+
+    <ImageView
+
+        android:layout_width="match_parent"
+
+        android:layout_height="300dp"
+
+        android:src="@drawable/logo"
+
+        android:scaleType="centerCrop"
+
+        android:padding="100dp"
+
+        android:layout_marginTop="220dp"/>
+
+    <ProgressBar
+
+        android:layout_width="220dp"
+
+        android:layout_height="10dp"
+
+        android:layout_gravity="center_horizontal"
+
+        style="?android:attr/progressBarStyleHorizontal"
+
+        android:max="100"
+
+        android:indeterminate="true"
+
+        android:progress="0"
+
+        android:layout_marginTop="100dp"
+
+
+        />
+
+
+
+</LinearLayout>

Android App/app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.PDFInsightPro" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.PDFInsightPRO" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorOnPrimary</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>

Android App/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#8315C0</color>
+    <color name="ic_launcher_background">#8021B3</color>
 </resources>

Android App/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">PDFInsightPro</string>
+    <string name="app_name">PDF-Insight-PRO</string>
 </resources>

Android App/app/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.PDFInsightPro" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.PDFInsightPRO" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorOnPrimary</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>

Android App/gradle.properties

@@ -18,5 +18,4 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-org.gradle.configuration-cache=true
+android.nonTransitiveRClass=true

Android App/gradle/libs.versions.toml

@@ -6,7 +6,7 @@ espressoCore = "3.6.1"
 appcompat = "1.7.0"
 material = "1.12.0"
 activity = "1.9.3"
-constraintlayout = "2.1.4"
+constraintlayout = "2.2.0"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }

Android App/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Nov 06 23:19:05 IST 2024
+#Sun Nov 17 15:47:25 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip

Android App/settings.gradle

@@ -19,5 +19,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "PDFInsightPro"
+rootProject.name = "PDF-Insight-PRO"
 include ':app'