Bookwyrm/Bookwyrm_Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standard dark app background

Browse Source
This commit is contained in:
Privacy_Dragon
2022-05-03 13:29:43 +02:00
parent 928e922a8f
commit 8037938adf
10 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

BIN
app/release/Bookwyrm-v1.3.1.apk
View File

Binary file not shown.

BIN
app/release/Bookwyrm-v1.3.2.apk Normal file
View File

Binary file not shown.

4
app/release/output-metadata.json
View File

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

9
app/src/main/AndroidManifest.xml
View File

@ -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">

6
app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java
View File

@ -70,6 +70,7 @@ 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()
@ -176,6 +177,7 @@ 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 + "'; ;})()");
@ -216,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];
@ -226,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;
}

2
app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java
View File

@ -54,6 +54,7 @@ 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()
{
@ -138,6 +139,7 @@ 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 + "'; ;})()");

27
app/src/main/res/layout/activity_main.xml
View File

@ -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"

2
app/src/main/res/values-night/themes.xml
View File

@ -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>

2
app/src/main/res/values/themes.xml
View File

@ -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>