update README

.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

@@ -5,4 +5,7 @@ It can also open links to userpages of Bookwyrm users and it can scan ISBN codes
 
 This application works on: Android 6 and above.
 
-And if you want to know, I am `@StoryDragon@wyrms.de` on BookWyrm.
+And if you want to know, I am [`@StoryDragon@wyrms.de`](https://wyrms.de/user/storydragon) on BookWyrm.
+
+For the ISBN-scanning I use the library zxing-android-embedded.
+The barcode icon that is added for instances that do not have ISBN-scanning by default comes from the Remix Icon project.

app/build.gradle

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

app/release/output-metadata.json

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

app/src/main/AndroidManifest.xml

@@ -5,13 +5,11 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera" />
 
-    <meta-data
-        android:name="android.webkit.WebView.MetricsOptOut"
-        android:value="true" />
-
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher_wyrm"
@@ -19,6 +17,9 @@
         android:roundIcon="@mipmap/ic_launcher_wyrm_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Bookwyrm">
+        <meta-data
+            android:name="android.webkit.WebView.MetricsOptOut"
+            android:value="true" />
         <activity
             android:name=".HandlerActivity"
             android:exported="true">
@@ -242,6 +243,94 @@
                     android:pathPrefix="/user/"
                     android:scheme="https" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="bookwyrm.lond.com.br"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="good.franv.site"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="books.solarpunkanarchism.org"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="shoko.one"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="bookwyrm.mennisch.net"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="library.southfox.me"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="bookrastinating.com"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="library.cybre.city"
+                    android:pathPrefix="/user/" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".StartActivity"

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

@@ -70,14 +70,17 @@ public class HandlerActivity extends AppCompatActivity {
         // End of auto-generated stuff
         LoadIndicator = (ProgressBar) findViewById(R.id.progressBar3);
         myWebView = (WebView) findViewById(R.id.webview);
+        myWebView.setVisibility(View.GONE);
         myWebView.getSettings().setJavaScriptEnabled(true);
         myWebView.getSettings().setDomStorageEnabled(true);
         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");
@@ -174,25 +177,40 @@ public class HandlerActivity extends AppCompatActivity {
         myWebView.setWebViewClient(new HandlerActivity.MyWebViewClient() {
             public void onPageFinished(WebView view, String url) {
                 LoadIndicator.setVisibility(View.GONE);
+                myWebView.setVisibility(View.VISIBLE);
 
                 view.loadUrl("javascript:(function() { document.getElementById('id_password').value = '" + passw + "'; ;})()");
                 view.loadUrl("javascript:(function() { document.getElementById('id_localname').value = '" + name + "'; ;})()");
                 view.loadUrl("javascript:(function() { if (window.location.href == '" + finalToGoServer + "' && !/(review|generatednote|quotation|comment)/i.test(window.location.href)) { document.getElementsByName(\"login\")[0].submit();} ;})()");
                 view.loadUrl("javascript:(function() { if (window.location.href == 'https://" + server + "') { document.getElementsByName(\"login\")[0].submit();} ;})()");
-                view.loadUrl("javascript:(function() { if (/(review|generatednote|quotation|comment)/i.test(window.location.href)) { document.getElementsByClassName(\"block\")[0].innerHTML = ` <a href=\"https://"+ server  +"\" class=\"button\" data-back=\"\">\n" +
+                view.loadUrl("javascript:(function() { if (/(review|generatednote|quotation|comment)/i.test(window.location.href)) {" +
-                        "        <span class=\"icon icon-arrow-left\" aria-hidden=\"true\"></span>\n" +
+                                "blocks = document.getElementsByClassName('block');" +
-                        "        <span><b>Back to homeserver</b></span>\n" +
+                                "for (let element of blocks){" +
-                        "    </a>`;} ;})()");
+                                        "if (element.localName == 'header') { " +
+                                            "element.innerHTML = ` <a href=\"https://"+ server  +"\" class=\"button\" data-back=\"\">\n" +
+                                                "<span class=\"icon icon-arrow-left\" aria-hidden=\"true\"></span>\n" +
+                                                "<span><b>Back to homeserver</b></span>\n" +
+                                            "</a>`;" +
+                                            "break;" +
+                                        "}" +
+                                "}" +
+                        "} ;})()");
                 view.loadUrl("javascript:(function() { " +
-                        "const ISBN = document.createElement(\"p\");" +
+                        "if (document.querySelectorAll(\"[data-modal-open]\")[0]) {" +
-                        "ISBN.innerHTML = '<br/>Click to scan ISBN';" +
+                            "let ISBN_Button = document.querySelectorAll(\"[data-modal-open]\")[0];" +
-                        "ISBN.addEventListener('click', () => {" +
+                            "ISBN_Button.replaceWith(ISBN_Button.cloneNode(true));" +
-                        " scan.performClick();" +
+                            "document.querySelectorAll(\"[data-modal-open]\")[0].addEventListener('click', () => {" +
-                        "});" +
+                                "scan.performClick(this);" +
-                        "const NewCenter = document.createElement(\"center\");" +
+                            "});" +
-                        "NewCenter.append(ISBN);" +
+                        "} else {" +
-                        "nav = document.body;" +
+                            "let ISBN = document.createElement(\"div\");" +
-                        "nav.insertBefore(NewCenter, nav.children[0]);" +
+                            "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);" +
+                        "}" +
                         ";})()");
             }
         });
@@ -200,7 +218,7 @@ public class HandlerActivity extends AppCompatActivity {
             // Need to accept permissions to use the camera
             @Override
             public void onPermissionRequest(PermissionRequest request) {
-                String permission = Manifest.permission.CAMERA;
+                String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
                 int grant = ContextCompat.checkSelfPermission(HandlerActivity.this, permission);
                 if (grant != PackageManager.PERMISSION_GRANTED) {
                     String[] permission_list = new String[1];
@@ -210,7 +228,7 @@ public class HandlerActivity extends AppCompatActivity {
                 request.grant(request.getResources());
                 final String[] requestedResources = request.getResources();
                 for (String r : requestedResources) {
-                   if (r.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
+                   if (r.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) {
                       request.grant(new String[]{PermissionRequest.RESOURCE_VIDEO_CAPTURE});
                       break;
                    }
@@ -232,7 +250,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

@@ -54,13 +54,16 @@ public class StartActivity extends AppCompatActivity {
         setContentView(R.layout.activity_start);
         LoadIndicator = (ProgressBar) findViewById(R.id.progressBar3);
         myWebView = (WebView) findViewById(R.id.webview);
+        myWebView.setVisibility(View.GONE);
         myWebView.getSettings().setJavaScriptEnabled(true);
         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");
@@ -136,21 +139,28 @@ public class StartActivity extends AppCompatActivity {
         myWebView.setWebViewClient(new MyWebViewClient(){
             public void onPageFinished(WebView view, String url) {
                 LoadIndicator.setVisibility(View.GONE);
+                myWebView.setVisibility(View.VISIBLE);
 
                 view.loadUrl("javascript:(function() { document.getElementById('id_password_confirm').value = '" + passw + "'; ;})()");
                 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\");" +
+                        "if (document.querySelectorAll(\"[data-modal-open]\")[0]) {" +
-                        "ISBN.innerHTML = '<br/>Click to scan ISBN';" +
+                            "let ISBN_Button = document.querySelectorAll(\"[data-modal-open]\")[0];" +
-                        "ISBN.addEventListener('click', () => {" +
+                            "ISBN_Button.replaceWith(ISBN_Button.cloneNode(true));" +
-                        " scan.performClick();" +
+                            "document.querySelectorAll(\"[data-modal-open]\")[0].addEventListener('click', () => {" +
-                        "});" +
+                                "scan.performClick(this);" +
-                        "const NewCenter = document.createElement(\"center\");" +
+                            "});" +
-                        "NewCenter.append(ISBN);" +
+                        "} else {" +
-                        "nav = document.body;" +
+                            "let ISBN = document.createElement(\"div\");" +
-                        "nav.insertBefore(NewCenter, nav.children[0]);" +
+                            "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 +177,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_main.xml

@@ -26,7 +26,7 @@
         android:id="@+id/Instance"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
+        android:layout_marginStart="10dp"
         android:layout_marginEnd="1dp"
         android:layout_marginBottom="262dp"
         android:hint="bookwyrm.social"
@@ -41,7 +41,7 @@
         android:id="@+id/Username"
         android:layout_width="409dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="1dp"
+        android:layout_marginStart="10dp"
         android:layout_marginEnd="1dp"
         android:layout_marginBottom="284dp"
         android:hint="Username"
@@ -55,7 +55,7 @@
 
     <EditText
         android:id="@+id/Password"
-        android:layout_width="409dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="1dp"
@@ -89,10 +89,10 @@
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="10dp"
         android:layout_marginTop="76dp"
         android:layout_marginEnd="185dp"
-        android:layout_marginBottom="35dp"
+        android:layout_marginBottom="10dp"
         android:text="Instance. WITHOUT the https part"
         app:layout_constraintBottom_toTopOf="@+id/Instance"
         app:layout_constraintEnd_toEndOf="parent"
@@ -107,7 +107,7 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="24dp"
         android:layout_marginEnd="41dp"
-        android:layout_marginBottom="35dp"
+        android:layout_marginBottom="10dp"
         android:text="Username"
         app:layout_constraintBottom_toTopOf="@+id/Username"
         app:layout_constraintEnd_toEndOf="parent"
@@ -115,6 +115,21 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/Instance" />
 
+    <TextView
+        android:id="@+id/textView6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="340dp"
+        android:layout_marginBottom="10dp"
+        android:text="Password"
+        app:layout_constraintBottom_toTopOf="@+id/Password"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/Username" />
+
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"

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"

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.Bookwyrm" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.Bookwyrm" parent="Theme.AppCompat">
         <!-- Primary brand color. -->
         <item name="colorPrimary">#3298DC</item>
         <item name="colorPrimaryDark">#1B557C</item>

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.Bookwyrm" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.Bookwyrm" parent="Theme.AppCompat">
         <!-- Primary brand color. -->
         <item name="colorPrimary">#3298DC</item>
         <item name="colorPrimaryDark">#1B557C</item>

fastlane/metadata/android/en-US/changelogs/8.txt

@@ -0,0 +1,6 @@
+* Improved the loading bar.
+* The ISBN-scanning feature now works by simply clicking the ISBN button that is used by the instances that have scanning already available.
+* For instances that do not support the scanning server-side, there is now instead of the text a button for ISBN-scanning, similar to the standard one.
+* More bookwyrm instances added to the ones that can be opened in the app.
+* Small bug-fix, so now only ISBN-codes (And other EAN-13 codes) will be scanned.
+* Another bug-fix. The modified back button works again.

fastlane/metadata/android/en-US/changelogs/9.txt

@@ -0,0 +1,2 @@
+* Changed the initial screen to dark mode. 
+* The login screen things are now better aligned.