Merge pull request #30 from tim-littlefair/task28-google_play_accessibility

Task28 google play accessibility

Author: tim-littlefair

Diff for: android-app/build.gradle

@@ -19,11 +19,18 @@ android {
 
     defaultConfig {
         applicationId "net.heretical_camelid.transit_emv_checker.android_app"
-        minSdk 26
+        minSdk 25
         targetSdk 34
 
         // Version name and number are managed in the root build.gradle file
+
         versionCode rootProject.ext.versionCode
+        // For builds triggered under build_and_test_everything.sh
+        // where the working directory exactly matches git HEAD,
+        // the 7-hex-prefix of the current git HEAD hash will
+        // be substituted for the $vname_suffix variable
+        // in the line below.
+        // For other builds, the variable will be the string 'dirty'.
         versionName rootProject.ext.versionName+"-$vname_suffix"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Diff for: android-app/proguard-rules.pro

@@ -14,8 +14,8 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile

Diff for: android-app/src/androidTest/java/net/heretical_camelid/transit_emv_checker/android_app/TECTestSuiteBase.java

@@ -64,13 +64,13 @@ public class TECTestSuiteBase {
     static final Logger LOGGER = LoggerFactory.getLogger(TEC_UiTestSuite.class);
     private static final String TEC_ANDROID_APP_PACKAGE =
         "net.heretical_camelid.transit_emv_checker.android_app";
-    private static final int _LAUNCH_TIMEOUT_SECONDS = 10;
+    private static final int _LAUNCH_TIMEOUT_SECONDS = 15;
     // At any point where we are waiting for a UI element to
     // appear, we use this timeout
-    private static final int _UI_APPEAR_TIMEOUT_SECONDS = 10;
+    private static final int _UI_APPEAR_TIMEOUT_SECONDS = 15;
     // At any point where we are waiting for a UI element to change
     // state, we use this unconditional sleep
-    protected static final int _UI_CHANGE_SLEEP_SECONDS = 1;
+    protected static final int _UI_CHANGE_SLEEP_SECONDS = 3;
     protected UiDevice mDevice;
 
     static Matcher<View> childAtPosition(

Diff for: android-app/src/main/java/net/heretical_camelid/transit_emv_checker/android_app/MainActivity.java

@@ -10,6 +10,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.lifecycle.MutableLiveData;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.navigation.NavController;
@@ -105,6 +106,7 @@ TapConductor replayCapturedTap(String mediaAssetName, ITerminal terminal) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
 
         s_userHasAgreed = false;
         m_emvMediaAgent = new EMVMediaAgent(this);

Diff for: android-app/src/main/java/net/heretical_camelid/transit_emv_checker/android_app/ui/html/ObservableWebViewWrapper.java

@@ -1,11 +1,13 @@
 package net.heretical_camelid.transit_emv_checker.android_app.ui.html;
 
 import android.annotation.SuppressLint;
+import android.content.res.Resources;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Base64;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -25,12 +27,17 @@ public class ObservableWebViewWrapper extends WebViewClient implements Handler.C
     public ObservableWebViewWrapper(WebView webView, MainActivity activity) {
         m_mainActivity = activity;
         m_webView = webView;
+
         // I have no reason to want Javascript enabled,
         // but running with it disabled triggers large
         // stack traces in logcat.
         // ref: https://stackoverflow.com/q/74198645
         m_webView.getSettings().setJavaScriptEnabled(true);
         m_webView.addJavascriptInterface(this,"observer");
+
+        // Pushing the text size up a little from the default
+        m_webView.getSettings().setTextZoom(125);
+
         m_webView.setWebViewClient(this);
     }
 

Diff for: android-app/src/main/res/layout/fragment_html.xml

@@ -15,7 +15,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:textAlignment="center"
-        android:textSize="20sp"
+        android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

Diff for: android-app/src/main/res/menu/bottom_nav_menu.xml

@@ -4,7 +4,9 @@
     <item
             android:id="@+id/navigation_home"
             android:icon="@drawable/ic_home_black_24dp"
-            android:title="@string/title_home"/>
+            android:title="@string/title_home"
+            android:contentDescription="Navigate to home tab"
+        />
 
     <item
             android:id="@+id/navigation_transit"

Diff for: android-app/src/main/res/navigation/mobile_navigation.xml

@@ -9,6 +9,7 @@
             android:id="@+id/navigation_home"
             android:name="net.heretical_camelid.transit_emv_checker.android_app.ui.home.HomeFragment"
             android:label="@string/title_home"
+            android:contentDescription="Navigate to home tab"
             tools:layout="@layout/fragment_home"/>
 
     <fragment

Diff for: build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
+    id 'com.android.application' version '8.6.1' apply false
     id 'com.google.gms.google-services' version '4.4.2' apply false
 }
 
@@ -16,14 +16,6 @@ plugins {
 // 2 digits each for for major, minor, patch version number
 // 1 trailing digit starts at zero can be updated for successive
 // attempts within the same release number
-// For builds triggered under build_and_test_everything.sh
-// where the working directory exactly matches git HEAD,
-// the 7-hex-prefix of the current git HEAD hash will
-// be substituted for the $vname_suffix variable
-// in the line below.
-// For other builds, the variable may include an
-// additional 3-hex-digit suffix derived from the
-// hash of git HEAD, or may be the string 'dirty'.
-ext.versionCode=300002010
+ext.versionCode=300002013
 
 ext.versionName="0.2.1"

Diff for: build_and_test_everything.sh

@@ -7,7 +7,7 @@
 # if the diff is empty, the separator and the diff hash are omitted
 generate_build_id() {
   head_hash7=$(git rev-parse HEAD | cut -c1-7)
-  diff_hash3=$(git diff | sha256sum - | cut -c1-3)
+  diff_hash3=$(git diff HEAD | sha256sum - | cut -c1-3)
   if [ "$diff_hash3" = "e3b" ]
   then
     # If git diff returned an empty stream, $diff_hash3 will be 'e3b'

Diff for: pcsc-cli-app/src/main/java/net/heretical_camelid/transit_emv_checker/pcsc_cli_app/PCSCProvider.java

@@ -29,13 +29,6 @@ public class PCSCProvider extends MyProviderBase {
 	 */
 	private final CardChannel channel;
 
-
-	/**Source option 5 is no longer supported. Use 7 or later.
-	 * Constructor using field
-	 *
-	 * @param pChannel
-	 *            card channel
-	 */
 	public PCSCProvider(Card card) {
 		channel = card.getBasicChannel();
 	}