diff --git a/.idea/misc.xml b/.idea/misc.xml index 6407632..e1f4d78 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,8 +3,10 @@ diff --git a/app/build.gradle b/app/build.gradle index fc26895..db10ea7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,10 +9,10 @@ android { applicationId "nl.privacydragon.bookwyrm" minSdk 23 targetSdk 31 - versionCode 6 - versionName "1.2.3" + versionCode 7 + versionName "1.3.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -29,9 +29,14 @@ android { dependencies { - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:2.0.4' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'com.google.zxing:core:3.3.0' + implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar' + //implementation 'com.github.yuriy-budiyev:code-scanner:2.1.2' + + } \ No newline at end of file diff --git a/app/release/Bookwyrm-v1.2.3.apk b/app/release/Bookwyrm-v1.2.3.apk deleted file mode 100644 index fa5f6a1..0000000 Binary files a/app/release/Bookwyrm-v1.2.3.apk and /dev/null differ diff --git a/app/release/Bookwyrm-v1.3.0.apk b/app/release/Bookwyrm-v1.3.0.apk new file mode 100644 index 0000000..01237be Binary files /dev/null and b/app/release/Bookwyrm-v1.3.0.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 52d0c56..4e2cb6d 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 6, - "versionName": "1.2.3", + "versionCode": 7, + "versionName": "1.3.0", "outputFile": "app-release.apk" } ], diff --git a/app/src/androidTest/java/nl/privacydragon/bookwyrm/ExampleInstrumentedTest.java b/app/src/androidTest/java/nl/privacydragon/bookwyrm/ExampleInstrumentedTest.java index a270986..30e4a3f 100644 --- a/app/src/androidTest/java/nl/privacydragon/bookwyrm/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/nl/privacydragon/bookwyrm/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package nl.privacydragon.bookwyrm; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f60476..25633a0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,6 +4,13 @@ package="nl.privacydragon.bookwyrm"> + + + + + - @@ -23,9 +29,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -34,9 +40,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -45,9 +51,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -56,9 +62,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -67,9 +73,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -78,9 +84,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -89,9 +95,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -100,9 +106,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -111,9 +117,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -122,9 +128,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -133,9 +139,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -144,9 +150,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -155,9 +161,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -166,9 +172,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -177,9 +183,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -188,9 +194,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -199,9 +205,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -210,9 +216,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -221,9 +227,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> @@ -232,9 +238,9 @@ + android:pathPrefix="/user/" + android:scheme="https" /> \n" + " Back to homeserver\n" + " `;} ;})()"); - + view.loadUrl("javascript:(function() { " + + "const ISBN = document.createElement(\"p\");" + + "ISBN.innerHTML = '
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]);" + + ";})()"); } }); + /*myWebView.setWebChromeClient(new WebChromeClient(){ + // Need to accept permissions to use the camera + @Override + public void onPermissionRequest(PermissionRequest request) { + String permission = Manifest.permission.CAMERA; + int grant = ContextCompat.checkSelfPermission(HandlerActivity.this, permission); + if (grant != PackageManager.PERMISSION_GRANTED) { + String[] permission_list = new String[1]; + permission_list[0] = permission; + ActivityCompat.requestPermissions(HandlerActivity.this, permission_list, 1); + } + request.grant(request.getResources()); + final String[] requestedResources = request.getResources(); + for (String r : requestedResources) { + if (r.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) { + request.grant(new String[]{PermissionRequest.RESOURCE_VIDEO_CAPTURE}); + break; + } + } + } + });*/ //Here, load the login page of the server. That actually does all that is needed. + //myWebView.loadUrl("https://serratus.github.io/quaggaJS/examples/live_w_locator.html"); myWebView.loadUrl(toGoServer); } + + public void ScanBarCode() { + String permission = Manifest.permission.CAMERA; + int grant = ContextCompat.checkSelfPermission(HandlerActivity.this, permission); + if (grant != PackageManager.PERMISSION_GRANTED) { + String[] permission_list = new String[1]; + permission_list[0] = permission; + ActivityCompat.requestPermissions(HandlerActivity.this, permission_list, 1); + } + + IntentIntegrator intentIntegrator = new IntentIntegrator(HandlerActivity.this); + intentIntegrator.setDesiredBarcodeFormats(intentIntegrator.ALL_CODE_TYPES); + intentIntegrator.setBeepEnabled(true); + intentIntegrator.setCameraId(0); + intentIntegrator.setPrompt("SCAN"); + intentIntegrator.setBarcodeImageEnabled(false); + intentIntegrator.initiateScan(); + + //return "blup"; + //return "bla"; + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + IntentResult Result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); + if (Result != null) { + if (Result.getContents() == null) { + Toast.makeText(this, "cancelled", Toast.LENGTH_SHORT).show(); + } else { + Log.d("MainActivity", "Scanned"); + myWebView.loadUrl("Javascript:(function() {document.getElementById('search_input').value = " + Result.getContents() + ";" + + "document.getElementsByTagName('form')[0].submit(); ;})()"); + LoadIndicator.setVisibility(View.VISIBLE); + + } + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } + + /*public class WebAppInterface { + Context mContext; + + //Instantiate the interface and set the context + WebAppInterface(Context c) { + mContext = c; + } + + // Show a toast from the web page + @JavascriptInterface + public void showToast(String toast) { + Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show(); + } + }*/ + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { // Check if the key event was the Back button and if there's history @@ -187,5 +312,11 @@ public class HandlerActivity extends AppCompatActivity { startActivity(intent); return true; } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + LoadIndicator.setVisibility(View.VISIBLE); + } + } } \ No newline at end of file diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java index 03b2856..291fb56 100644 --- a/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java +++ b/app/src/main/java/nl/privacydragon/bookwyrm/MainActivity.java @@ -6,13 +6,15 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyProperties; -import android.support.v7.app.AppCompatActivity; +//import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.util.Base64; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import java.io.IOException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java index 11aadb2..8723b32 100644 --- a/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java +++ b/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java @@ -1,16 +1,31 @@ package nl.privacydragon.bookwyrm; +import android.Manifest; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.support.v7.app.AppCompatActivity; +//import android.support.v7.app.AppCompatActivity; +import android.content.pm.PackageManager; +import android.graphics.Bitmap; import android.os.Bundle; import android.util.Base64; +import android.util.Log; import android.view.KeyEvent; +import android.view.View; +import android.webkit.JavascriptInterface; import android.webkit.WebResourceRequest; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.widget.ProgressBar; +import android.widget.Toast; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + +import com.google.zxing.integration.android.IntentIntegrator; +import com.google.zxing.integration.android.IntentResult; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -31,13 +46,24 @@ import javax.crypto.spec.GCMParameterSpec; public class StartActivity extends AppCompatActivity { WebView myWebView; + ProgressBar LoadIndicator; @SuppressLint("SetJavaScriptEnabled") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start); + LoadIndicator = (ProgressBar) findViewById(R.id.progressBar3); myWebView = (WebView) findViewById(R.id.webview); myWebView.getSettings().setJavaScriptEnabled(true); + myWebView.addJavascriptInterface(new Object() + { + @JavascriptInterface // For API 17+ + public void performClick() + { + ScanBarCode(); + + } + }, "scan"); //The user credentials are stored in the shared preferences, so first they have to be read from there. String defaultValue = "none"; SharedPreferences sharedPref = StartActivity.this.getSharedPreferences(getString(R.string.server), Context.MODE_PRIVATE); @@ -109,16 +135,67 @@ public class StartActivity extends AppCompatActivity { //A webviewclient thing is needed for some stuff. To automatically log in, the credentials are put in the form by the javascript that is loaded once the page is fully loaded. Then it is automatically submitted if the current page is the login page. myWebView.setWebViewClient(new MyWebViewClient(){ public void onPageFinished(WebView view, String url) { + LoadIndicator.setVisibility(View.GONE); 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\");" + + "ISBN.innerHTML = '
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]);" + + ";})()"); } }); //Here, load the login page of the server. That actually does all that is needed. myWebView.loadUrl("https://" + server + "/login"); } + public void ScanBarCode() { + String permission = Manifest.permission.CAMERA; + int grant = ContextCompat.checkSelfPermission(StartActivity.this, permission); + if (grant != PackageManager.PERMISSION_GRANTED) { + String[] permission_list = new String[1]; + permission_list[0] = permission; + ActivityCompat.requestPermissions(StartActivity.this, permission_list, 1); + } + + IntentIntegrator intentIntegrator = new IntentIntegrator(StartActivity.this); + intentIntegrator.setDesiredBarcodeFormats(intentIntegrator.ALL_CODE_TYPES); + intentIntegrator.setBeepEnabled(false); + intentIntegrator.setCameraId(0); + intentIntegrator.setPrompt("SCAN ISBN"); + intentIntegrator.setBarcodeImageEnabled(false); + intentIntegrator.initiateScan(); + + //return "blup"; + //return "bla"; + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + IntentResult Result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); + if (Result != null) { + if (Result.getContents() == null) { + Toast.makeText(this, "cancelled", Toast.LENGTH_SHORT).show(); + } else { + Log.d("MainActivity", "Scanned"); + myWebView.loadUrl("Javascript:(function() {document.getElementById('search_input').value = " + Result.getContents() + ";" + + "document.getElementsByTagName('form')[0].submit(); ;})()"); + LoadIndicator.setVisibility(View.VISIBLE); + + } + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { // Check if the key event was the Back button and if there's history @@ -147,5 +224,10 @@ public class StartActivity extends AppCompatActivity { startActivity(intent); return true; } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + LoadIndicator.setVisibility(View.VISIBLE); + } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 58ff272..4978aa1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml index 226044d..81a492c 100644 --- a/app/src/main/res/layout/activity_start.xml +++ b/app/src/main/res/layout/activity_start.xml @@ -1,16 +1,25 @@ - + + android:layout_height="match_parent" /> + + - - \ No newline at end of file + \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt new file mode 100644 index 0000000..33c11ef --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/7.txt @@ -0,0 +1,5 @@ +* Added a loading bar +* You can now scan ISBN's, on any instance! + +More technical change: +* Mitigated the project to use Androidx libraries, for that is necessary for the ISBN scanning... diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 1752fb6..4fecfdb 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,3 +1,8 @@ -This is an Android client for BookWyrm. -It is just BookWyrm put into a webview element, nothing special. +This is an Android client for BookWyrm – a federated social network for tracking your reading, talking about books, writing reviews, and discovering what to read next. It is just BookWyrm put into a webview element, nothing special – but it adds some convenience on top: + +* bookwyrm links can be made to open with the app (e.g. clicking on the link to someone's userprofile will open that from your own bookwyrm instance) +* thanks to that, you can immediately follow them easily if you want. +* it lets you easily return to your own home timeline when viewing something like posts, on another bookwyrm instance, because the 'back' button is then modified for that. +* You can also search for books by scanning the ISBN, no matter what instance of Bookwyrm you use. + This application is not an official client! (An official client does not exist yet, as far as I know) diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png index 4b11136..870b5e5 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png index a4d5be9..5e4ecd0 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png new file mode 100644 index 0000000..7eca916 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png differ diff --git a/gradle.properties b/gradle.properties index 71f9eed..9bf2bbf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true + +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/libs/ZBarAndroidSDK-0.2/libs/zbar.jar b/libs/ZBarAndroidSDK-0.2/libs/zbar.jar new file mode 100644 index 0000000..7d50b95 Binary files /dev/null and b/libs/ZBarAndroidSDK-0.2/libs/zbar.jar differ diff --git a/settings.gradle b/settings.gradle index 4a5dba7..b8d77c8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,9 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + //maven { url 'https://jitpack.io' } } } + rootProject.name = "Bookwyrm" -include ':app' +include ':app' \ No newline at end of file