From 7b146a198e563ca2462b799f374e13446be9d5b3 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Mon, 8 Jan 2018 03:14:29 -0600 Subject: [PATCH] added sharing and covertext --- .idea/misc.xml | 12 +----- .idea/modules.xml | 1 + app/src/main/assets/index.html | 9 ++++- app/src/main/assets/main.js | 20 +++++++++- .../net/chaoswebs/snow10/MainActivity.java | 39 +++++++++++++++++++ 5 files changed, 68 insertions(+), 13 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..f3d13dd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,17 +27,7 @@ - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 4b8fe29..d284138 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index a3bec20..fc12f55 100755 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -40,7 +40,12 @@ 


-        

+		  

+          

+              
+              
+          

+		  

         

       

       

@@ -63,6 +68,8 @@
 		
Bytes: 0


 		

 		

+		

+		

 		

 			
 			


diff --git a/app/src/main/assets/main.js b/app/src/main/assets/main.js
index 35a969c..a7b3ad2 100755
--- a/app/src/main/assets/main.js
+++ b/app/src/main/assets/main.js
@@ -12,6 +12,18 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see .
 */
+$('#share').click(function(){
+console.log(AndroidFunction);
+AndroidFunction.share($('#output').val());
+$.bootstrapGrowl('shared', {type: 'success'})
+});
+
+function split2(str, delim) {
+    var parts=str.split(delim);
+    return [parts[0], parts.splice(1,parts.length).join(delim)];
+}
+
+
 var clipboard = new Clipboard('.btn');
 
 var zero = '​';
@@ -173,7 +185,13 @@ function go(mode) {
 		}
 		// convert result to binary
 		output = textToBin(encodeURIComponent(input));
-		$('#output').text(replaceAll(replaceAll(output.toString(), "1", one), "0", zero));
+		output = replaceAll(replaceAll(output.toString(), "1", one), "0", zero);
+		coverText = $('#visibleText').val();
+        coverText = split2(coverText);
+        partOne = coverText[0];
+        partTwo = coverText[1];
+		$('#output').val(partOne + output + partTwo);
+		console.log(partOne + output + partTwo);
 	}
 	else
 	{
diff --git a/app/src/main/java/net/chaoswebs/snow10/MainActivity.java b/app/src/main/java/net/chaoswebs/snow10/MainActivity.java
index 1ddffe6..62248d0 100644
--- a/app/src/main/java/net/chaoswebs/snow10/MainActivity.java
+++ b/app/src/main/java/net/chaoswebs/snow10/MainActivity.java
@@ -1,5 +1,6 @@
 package net.chaoswebs.snow10;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.net.Uri;
@@ -8,6 +9,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.Window;
+import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -25,11 +27,47 @@ public class MainActivity extends AppCompatActivity {
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see .
     */
+/*
+    public class JavascriptInterface{
+        Context mContext;
+
+        JavascriptInterface(Context c) {
+            mContext = c;
+        }
+
+        public void share(String action){
+            Intent intent2 = new Intent(); intent2.setAction(Intent.ACTION_SEND);
+            intent2.setType("text/plain");
+            intent2.putExtra(Intent.EXTRA_TEXT, action );
+            startActivity(Intent.createChooser(intent2, "Share via"));
+        }
+    }
+    */
+
+    public class JavaScriptInterface {
+        Context mContext;
+
+        /** Instantiate the interface and set the context */
+        JavaScriptInterface(Context c) {
+            mContext = c;
+        }
+
+        /** Show a toast from the web page */
+        @JavascriptInterface
+        public void share(String action){
+            Intent intent2 = new Intent(); intent2.setAction(Intent.ACTION_SEND);
+            intent2.setType("text/plain");
+            intent2.putExtra(Intent.EXTRA_TEXT, action );
+            startActivity(Intent.createChooser(intent2, "Share via"));
+        }
+    }
+
 
     private WebView view;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         //this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_main);
@@ -50,6 +88,7 @@ public class MainActivity extends AppCompatActivity {
         });
 
         view.getSettings().setJavaScriptEnabled(true);
+        view.addJavascriptInterface(new JavaScriptInterface(this), "AndroidFunction");
         view.loadUrl("file:///android_asset/index.html");
         setContentView(view);
     }