Fix #164: Enhance and fix WebActivity as default to display webpages

app/src/main/java/com/cswala/cswala/Activities/WebActivity.java

@@ -1,8 +1,14 @@
 package com.cswala.cswala.Activities;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -12,17 +18,59 @@
 public class WebActivity extends AppCompatActivity {
 
     private WebView myWebView;
+    private Toolbar toolbar;
+    private static final String DESKTOP_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_web);
         myWebView=findViewById(R.id.webView);
+
+        toolbar = findViewById(R.id.webViewToolbar);
+        setSupportActionBar(toolbar);
+
         WebSettings webSettings=myWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         String WebUrl=getIntent().getStringExtra("URL");
         myWebView.loadUrl(WebUrl);
         myWebView.setWebViewClient(new WebViewClient());
+
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.webview_menu,menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+
+        int id = item.getItemId();
+
+        switch (id) {
+
+            case R.id.desktopView:
+                myWebView.getSettings().setUserAgentString(DESKTOP_USER_AGENT);
+                myWebView.reload();
+                break;
+
+            case R.id.zoomControls:
+                myWebView.getSettings().setBuiltInZoomControls(true);
+                myWebView.getSettings().setDisplayZoomControls(true);
+                break;
+
+        }
+
+        return true;
     }
 
     @Override

app/src/main/java/com/cswala/cswala/Adapters/PortalListAdapter.java

@@ -15,14 +15,16 @@
 
 import com.cswala.cswala.Models.PortalListElement;
 import com.cswala.cswala.R;
+import com.cswala.cswala.utils.IntentHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class PortalListAdapter extends RecyclerView.Adapter<PortalListAdapter.PortalHolder> implements Filterable {
-    ArrayList<PortalListElement> data;
-    ArrayList<PortalListElement> dataFull;
-    Context ctx;
+    private ArrayList<PortalListElement> data;
+    private ArrayList<PortalListElement> dataFull;
+    private Context ctx;
+    private IntentHelper intentHelper;
 
     public PortalListAdapter(Context ctx, ArrayList<PortalListElement> data) {
         this.data = data;
@@ -43,10 +45,10 @@ public void onBindViewHolder(@NonNull PortalHolder holder, final int position) {
         holder.companyBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ctx.startActivity(
-                        new Intent(
-                                Intent.ACTION_VIEW,
-                                Uri.parse(data.get(position).getLink())));
+
+                intentHelper = new IntentHelper(ctx);
+                intentHelper.GoToWeb(data.get(position).getLink());
+
             }
         });
     }

app/src/main/res/drawable/ic_close.xml

@@ -0,0 +1,5 @@
+<vector android:height="36dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

app/src/main/res/layout/activity_web.xml

@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    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"
     tools:context=".Activities.WebActivity">
 
+    <include layout="@layout/toolbar"
+        android:id="@+id/webViewToolbar" />
+
     <WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:layout_height="match_parent"
+        android:layout_below="@+id/webViewToolbar"/>
+
+</RelativeLayout>

app/src/main/res/layout/toolbar.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+    app:popupTheme="@style/ThemeOverlay.MaterialComponents.Dark"
+    android:background="@color/colorPrimary"
+    app:title="@string/app_name"
+    app:titleTextColor="@color/md_black_1000"
+    app:titleTextAppearance="@style/customfontstyle"
+    app:navigationIcon="@drawable/ic_close" >
+
+</androidx.appcompat.widget.Toolbar>

app/src/main/res/menu/webview_menu.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/desktopView"
+        android:title="@string/desktopView"
+        app:showAsAction="collapseActionView"
+        app:cnb_iconColor="@color/colorPrimaryDark" />
+
+    <item
+        android:id="@+id/zoomControls"
+        android:title="@string/zoomControls"
+        app:showAsAction="collapseActionView"
+        app:cnb_iconColor="@color/colorPrimaryDark" />
+
+</menu>

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

@@ -45,6 +45,9 @@
     <string name="select_date">Select Date</string>
     <string name="save">save</string>
     <string name="contact_us">CONTACT US</string>
+    <string name="desktopView">Desktop site</string>
+    <string name="zoomControls">Zoom controls</string>
+    <string name="exit">Exit</string>
     <string-array name="gender1">
         <item>Male</item>
         <item>Female</item>