version 1.3.1; Visual improvements

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_5_API_26.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-04-24T09:01:51.756259Z" />
+  </component>
+</project>

README.md

@@ -1,7 +1,7 @@
 # Bookwyrm-android
 An Android application for Bookwyrm. Basically, it is just bookwyrm put into a 'webview' element.
 What it does? It enables you to use BookWyrm on your Android phone without having to use a browser to go to it every time.
-It can also open links to userpages of Bookwyrm users.
+It can also open links to userpages of Bookwyrm users and it can scan ISBN codes.
 
 This application works on: Android 6 and above.
 

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "nl.privacydragon.bookwyrm"
         minSdk 23
         targetSdk 31
-        versionCode 7
-        versionName "1.3.0"
+        versionCode 8
+        versionName "1.3.1"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 7,
-      "versionName": "1.3.0",
+      "versionCode": 8,
+      "versionName": "1.3.1",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java

@@ -75,9 +75,11 @@ public class HandlerActivity extends AppCompatActivity {
         myWebView.addJavascriptInterface(new Object()
         {
             @JavascriptInterface           // For API 17+
-            public void performClick()
+            public void performClick(String what)
             {
-                ScanBarCode();
+                if (!what.contains("[object Window]")) { //For some reason the function has to be called when the event listener is attached to the button. So, by adding in 'this', it is possible to make sure to only act when the thing that called the function is NOT the window, but the button.
+                    ScanBarCode();
+                }
 
             }
         }, "scan");
@@ -184,15 +186,21 @@ public class HandlerActivity extends AppCompatActivity {
                         "        <span><b>Back to homeserver</b></span>\n" +
                         "    </a>`;} ;})()");
                 view.loadUrl("javascript:(function() { " +
-                        "const ISBN = document.createElement(\"p\");" +
-                        "ISBN.innerHTML = '<br/>Click to scan ISBN';" +
-                        "ISBN.addEventListener('click', () => {" +
-                        " scan.performClick();" +
-                        "});" +
-                        "const NewCenter = document.createElement(\"center\");" +
-                        "NewCenter.append(ISBN);" +
-                        "nav = document.body;" +
-                        "nav.insertBefore(NewCenter, nav.children[0]);" +
+                        "if (document.querySelectorAll(\"[data-modal-open]\")[0]) {" +
+                            "let ISBN_Button = document.querySelectorAll(\"[data-modal-open]\")[0];" +
+                            "ISBN_Button.replaceWith(ISBN_Button.cloneNode(true));" +
+                            "document.querySelectorAll(\"[data-modal-open]\")[0].addEventListener('click', () => {" +
+                                "scan.performClick(this);" +
+                            "});" +
+                        "} else {" +
+                            "let ISBN = document.createElement(\"div\");" +
+                            "ISBN.class = 'control';" +
+                            //"ISBN.class = 'button';" +
+                            //"ISBN.type = 'button';" +
+                            "ISBN.innerHTML = '<button class=\"button\" type=\"button\" onclick=\"scan.performClick(this)\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" width=\"24\" height=\"24\" aria-hidden=\"true\"><path fill=\"none\" d=\"M0 0h24v24H0z\"/><path d=\"M4 5v14h16V5H4zM3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm3 4h3v10H6V7zm4 0h2v10h-2V7zm3 0h1v10h-1V7zm2 0h3v10h-3V7z\"/></svg><span class=\"is-sr-only\">Search</span></button>';" +
+                            "nav = document.getElementsByClassName(\"field has-addons\")[0];" +
+                            "nav.appendChild(ISBN);" +
+                        "}" +
                         ";})()");
             }
         });
@@ -232,7 +240,7 @@ public class HandlerActivity extends AppCompatActivity {
         }
 
         IntentIntegrator intentIntegrator = new IntentIntegrator(HandlerActivity.this);
-        intentIntegrator.setDesiredBarcodeFormats(intentIntegrator.ALL_CODE_TYPES);
+        intentIntegrator.setDesiredBarcodeFormats(intentIntegrator.EAN_13);
         intentIntegrator.setBeepEnabled(true);
         intentIntegrator.setCameraId(0);
         intentIntegrator.setPrompt("SCAN");

app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java

@@ -58,9 +58,11 @@ public class StartActivity extends AppCompatActivity {
         myWebView.addJavascriptInterface(new Object()
         {
             @JavascriptInterface           // For API 17+
-            public void performClick()
+            public void performClick(String what)
             {
-                ScanBarCode();
+                if (!what.contains("[object Window]")) { //For some reason the function has to be called when the event listener is attached to the button. So, by adding in 'this', it is possible to make sure to only act when the thing that called the function is NOT the window, but the button.
+                    ScanBarCode();
+                }
 
             }
         }, "scan");
@@ -141,16 +143,22 @@ public class StartActivity extends AppCompatActivity {
                 view.loadUrl("javascript:(function() { document.getElementById('id_localname_confirm').value = '" + name + "'; ;})()");
                 view.loadUrl("javascript:(function() { if (window.location.href == 'https://" + server + "/login') { document.getElementsByName(\"login-confirm\")[0].submit();} ;})()");
                 view.loadUrl("javascript:(function() { " +
-                        "const ISBN = document.createElement(\"p\");" +
-                        "ISBN.innerHTML = '<br/>Click to scan ISBN';" +
-                        "ISBN.addEventListener('click', () => {" +
-                        " scan.performClick();" +
-                        "});" +
-                        "const NewCenter = document.createElement(\"center\");" +
-                        "NewCenter.append(ISBN);" +
-                        "nav = document.body;" +
-                        "nav.insertBefore(NewCenter, nav.children[0]);" +
-                        ";})()");
+                        "if (document.querySelectorAll(\"[data-modal-open]\")[0]) {" +
+                            "let ISBN_Button = document.querySelectorAll(\"[data-modal-open]\")[0];" +
+                            "ISBN_Button.replaceWith(ISBN_Button.cloneNode(true));" +
+                            "document.querySelectorAll(\"[data-modal-open]\")[0].addEventListener('click', () => {" +
+                                "scan.performClick(this);" +
+                            "});" +
+                        "} else {" +
+                            "let ISBN = document.createElement(\"div\");" +
+                            "ISBN.class = 'control';" +
+                            //"ISBN.class = 'button';" +
+                            //"ISBN.type = 'button';" +
+                            "ISBN.innerHTML = '<button class=\"button\" type=\"button\" onclick=\"scan.performClick(this)\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" width=\"24\" height=\"24\" aria-hidden=\"true\"><path fill=\"none\" d=\"M0 0h24v24H0z\"/><path d=\"M4 5v14h16V5H4zM3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm3 4h3v10H6V7zm4 0h2v10h-2V7zm3 0h1v10h-1V7zm2 0h3v10h-3V7z\"/></svg><span class=\"is-sr-only\">Search</span></button>';" +
+                            "nav = document.getElementsByClassName(\"field has-addons\")[0];" +
+                            "nav.appendChild(ISBN);" +
+                            "}" +
+                        ";})()"); //This lines replace the ISBN-scan button event listener with one that points to the on-device scanning implementation, if it is available on the instance. If not, the button is added.
 
             }
         });
@@ -167,7 +175,7 @@ public class StartActivity extends AppCompatActivity {
         }
 
         IntentIntegrator intentIntegrator = new IntentIntegrator(StartActivity.this);
-        intentIntegrator.setDesiredBarcodeFormats(intentIntegrator.ALL_CODE_TYPES);
+        intentIntegrator.setDesiredBarcodeFormats(intentIntegrator.EAN_13);
         intentIntegrator.setBeepEnabled(false);
         intentIntegrator.setCameraId(0);
         intentIntegrator.setPrompt("SCAN ISBN");

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

@@ -14,6 +14,7 @@
     <ProgressBar
         android:id="@+id/progressBar3"
         style="?android:attr/progressBarStyleHorizontal"
+        android:indeterminate="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="715dp"

fastlane/metadata/android/en-US/full_description.txt

@@ -6,3 +6,5 @@ This is an Android client for BookWyrm – a federated social network for tracki
 * You can also search for books by scanning the ISBN, no matter what instance of Bookwyrm you use.
 
 <b>This application is <u>not</u> an official client!</b> (An official client does not exist yet, as far as I know)
+
+The ISBN scanning feature is created with the zxing-android-embedded library.