Add some more info to help, remove default zoomable image

petabyt · Mar 3, 2024 · 5b7ff70 · 5b7ff70
1 parent 0ccb4ee
commit 5b7ff70
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/dev/danielc/fujiapp/Viewer.java b/app/src/main/java/dev/danielc/fujiapp/Viewer.java
@@ -1,8 +1,6 @@
 // Download the image, button for share and download
 // Copyright 2023 Daniel C - https://github.com/petabyt/fujiapp
 
-// TODO: prevent back arrow when downloading image
-
 package dev.danielc.fujiapp;
 
 import android.annotation.SuppressLint;
@@ -143,7 +141,7 @@ void downloadFileManually(int handle, int size) {
         if (rc != 0) {
             toast("Download Error");
             Backend.reportError(Backend.PTP_IO_ERR, "Download error");
-            return; // TODO: fail()
+            return; // TODO: exit Viewer?
         }
 
         Backend.cSetProgressBarObj(null, 0);

diff --git a/app/src/main/res/drawable/zoomable.jpg b/app/src/main/res/drawable/zoomable.jpg
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
@@ -51,6 +51,14 @@
                 android:textAllCaps="false"
                 android:textSize="14sp" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="false"
+                android:text="@string/help_text3_1"
+                android:textAllCaps="false"
+                android:textSize="14sp" />
+
             <TextView
                 android:id="@+id/textView12"
                 android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_viewer.xml b/app/src/main/res/layout/activity_viewer.xml
@@ -24,7 +24,6 @@
             android:id="@+id/zoom_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@drawable/zoomable"
             app:zoomage_animateOnReset="true"
             app:zoomage_autoCenter="true"
             app:zoomage_autoResetMode="UNDER"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,13 +3,13 @@
     <string name="help_text">This app is a reimplementation of Fujifilm\'s WiFi app. Expect bugs! There are no promises that it will be better than the official app.</string>
     <string name="help_text2">Troubleshooting:</string>
     <string name="help_text3">Your camera\'s WiFi menu should be accessible from the \'Fn\' button on the top of the body.</string>
-    <string name="help_text4">Sorry, modern cameras with Bluetooth aren\'t supported yet. That\'s on the roadmap!</string>
+    <string name="help_text3_1">On newer cameras, it\'s available from \'PLAY BACK MENU\' -> \'WIRELESS COMMUNICATION\'</string>
+    <string name="help_text4">Bluetooth is not supported yet. That\'s on the roadmap!</string>
     <string name="help_text5">Please report any bugs on this project\'s Github page: https://github.com/petabyt/fudge</string>
     <string name="help_text6">Credits:</string>
     <string name="help_text7">camlib (Apache license)</string>
     <string name="help_text8">com.jsibbold.zoomage.ZoomageView (Apache license)</string>
     <string name="help_text9">Google Material Icons (Apache license)</string>
-    <string name="help_text10">Default image landscape painting is by me :)</string>
 
     <string name="url">https://github.com/petabyt/fudge</string>
     <string name="motd_thing">Fudge open beta-testing release</string>