@hanwha-ss1/plugin 0.3.8 → 0.4.0

package/android/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
     <application>
         <activity
             android:theme="@style/AppTheme.NoActionBar"
-            android:name="com.openbrowser.WebViewActivity"
+            android:name=".WebViewActivity"
             android:exported="false" />
     </application>
 

package/android/src/main/java/com/plugin/linker/LinkerPlugin.java

@@ -108,10 +108,11 @@ public class LinkerPlugin extends Plugin{
     @PluginMethod
     public void open(PluginCall call) {
         String url = call.getString("url");
-        boolean isExternal = call.getBoolean("ext");
+        boolean isExternal = Boolean.TRUE.equals(call.getBoolean("ext"));
+        boolean hasClose = Boolean.TRUE.equals(call.getBoolean("isCloseBtn"));
         if(openBrowserImplementation == null) {
             openBrowserImplementation = new OpenBrowser();
         }
-        openBrowserImplementation.open(getActivity(), url, isExternal);
+        openBrowserImplementation.open(getActivity(), url, isExternal, hasClose);
     }
 }

package/android/src/main/java/com/plugin/openbrowser/OpenBrowser.java

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class OpenBrowser {
 
     public String echo(String value) {
@@ -19,7 +21,7 @@ public class OpenBrowser {
      * @param url
      * @param isExternal
      */
-    public void open(Activity activity, String url, boolean isExternal) {
+    public void open(AppCompatActivity activity, String url, boolean isExternal, boolean hasClose) {
         if(activity != null && url != null && !url.isEmpty()) {
             Intent intent;
             if(isExternal) {
@@ -27,6 +29,7 @@ public class OpenBrowser {
             } else {
                 intent = new Intent(activity, WebViewActivity.class);
                 intent.putExtra("url", url);
+                intent.putExtra("hasClose", hasClose);
             }
             activity.startActivity(intent);
         }

package/android/src/main/java/com/plugin/openbrowser/OpenBrowserPlugin.java

@@ -23,10 +23,11 @@ public class OpenBrowserPlugin extends Plugin {
     @PluginMethod
     public void open(PluginCall call) {
         String url = call.getString("url");
-        boolean isExternal = call.getBoolean("ext");
+        boolean isExternal = Boolean.TRUE.equals(call.getBoolean("ext"));
+        boolean hasClose = Boolean.TRUE.equals(call.getBoolean("isCloseBtn"));
         if(implementation == null) {
             implementation = new OpenBrowser();
         }
-        implementation.open(getActivity(), url, isExternal);
+        implementation.open(getActivity(), url, isExternal, hasClose);
     }
 }

package/android/src/main/java/com/plugin/openbrowser/WebViewActivity.java

@@ -12,23 +12,34 @@ import androidx.appcompat.app.AppCompatActivity;
 public class WebViewActivity extends AppCompatActivity {
 
     private WebView webView;
-    private ImageView ivClose;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_webview);
 
-        initLayout();
 
         String url = getIntent().getStringExtra("url");
+        boolean hasClose = getIntent().getBooleanExtra("hasClose", true);
+
+        initLayout(hasClose);
 
         openUrl(url);
     }
 
-    private void initLayout() {
+    private void initLayout(boolean hasClose) {
         webView = findViewById(R.id.webView);
-        ivClose = findViewById(R.id.ivClose);
+
+        if(hasClose) {
+            findViewById(R.id.ivClose).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    WebViewActivity.this.finish();
+                }
+            });
+        } else {
+            findViewById(R.id.layoutTitle).setVisibility(View.GONE);
+        }
 
         webView.getSettings().setJavaScriptEnabled(true);
         webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
@@ -47,13 +58,6 @@ public class WebViewActivity extends AppCompatActivity {
                 return super.shouldOverrideUrlLoading(view, url);
             }
         });
-
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                WebViewActivity.this.finish();
-            }
-        });
     }
 
     private void openUrl(String url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanwha-ss1/plugin",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "description": "Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",