Merge pull request #7093 from nextcloud/accessibilityScanner

Enable accessibility scanner

build.gradle

@@ -382,6 +382,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-accessibility:$espressoVersion"
 
     // Mocking support
     androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older

src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java

@@ -43,12 +43,14 @@ import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 
+import androidx.test.espresso.Espresso;
 import androidx.test.espresso.contrib.DrawerActions;
 import androidx.test.espresso.contrib.NavigationViewActions;
 import androidx.test.espresso.intent.rule.IntentsTestRule;
 import androidx.test.rule.GrantPermissionRule;
 
 import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static junit.framework.TestCase.assertEquals;
@@ -155,4 +157,22 @@ public class FileDisplayActivityIT extends AbstractOnServerIT {
         shortSleep();
         assertEquals(getStorageManager().getFileByPath("/"), sut.getCurrentDir());
     }
+
+    @Test
+    public void switchToGridView() {
+        activityRule.launchActivity(null);
+
+        assertTrue(new CreateFolderOperation("/test/", user, targetContext)
+                       .execute(client, getStorageManager())
+                       .isSuccess());
+
+        Espresso.onView(withId(R.id.switch_grid_view_button)).perform(click());
+    }
+
+    @Test
+    public void openAccountSwitcher() {
+        activityRule.launchActivity(null);
+
+        Espresso.onView(withId(R.id.switch_account_button)).perform(click());
+    }
 }

src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -41,6 +41,7 @@ import com.owncloud.android.utils.FileStorageUtils;
 import junit.framework.TestCase;
 
 import org.apache.commons.io.FileUtils;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 
@@ -185,6 +186,11 @@ public abstract class AbstractIT {
         }
     }
 
+    @Before
+    public void enableAccessibilityChecks() {
+        androidx.test.espresso.accessibility.AccessibilityChecks.enable().setRunChecksFromRootView(true);
+    }
+
     protected FileDataStorageManager getStorageManager() {
         return fileDataStorageManager;
     }

src/androidTest/java/com/owncloud/android/ui/LoginIT.java

@@ -28,6 +28,7 @@ import android.os.Bundle;
 
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.account.UserAccountManagerImpl;
+import com.owncloud.android.AbstractIT;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 
@@ -54,7 +55,7 @@ import static org.junit.Assert.assertEquals;
 
 
 @LargeTest
-public class LoginIT {
+public class LoginIT extends AbstractIT {
     @Rule
     public GrantPermissionRule permissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 

src/main/res/layout-land/account_setup.xml

@@ -70,14 +70,15 @@
                         android:layout_height="wrap_content"
                         android:ems="10"
                         android:text="@string/auth_host_url"
+                        android:labelFor="@+id/host_url_input"
                         android:textColor="@color/login_text_color" />
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/host_url_input"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:minHeight="@dimen/minimum_size_for_touchable_area"
                         android:layout_gravity="bottom"
-                        android:contentDescription="@string/auth_host_address"
                         android:drawablePadding="@dimen/alternate_half_padding"
                         android:inputType="textUri"
                         android:paddingStart="@dimen/zero"

src/main/res/layout/account_item.xml

@@ -123,7 +123,7 @@
 
         <ImageView
             android:id="@+id/account_menu"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/minimum_size_for_touchable_area"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"

src/main/res/layout/account_setup.xml

@@ -69,14 +69,15 @@
                         android:layout_height="wrap_content"
                         android:ems="10"
                         android:text="@string/auth_host_url"
+                        android:labelFor="@+id/host_url_input"
                         android:textColor="@color/login_text_color" />
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/host_url_input"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:minHeight="@dimen/minimum_size_for_touchable_area"
                         android:layout_gravity="bottom"
-                        android:contentDescription="@string/auth_host_address"
                         android:drawablePadding="@dimen/alternate_half_padding"
                         android:inputType="textUri"
                         android:paddingStart="@dimen/zero"
@@ -92,14 +93,14 @@
 
                 <ImageButton
                     android:id="@+id/test_server_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/minimum_size_for_touchable_area"
+                    android:layout_height="@dimen/minimum_size_for_touchable_area"
                     android:layout_gravity="center_vertical|end"
                     android:layout_marginEnd="@dimen/alternate_half_padding"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/test_server_button"
                     android:onClick="onTestServerConnectionClick"
-                    android:padding="@dimen/zero"
+                    android:padding="12dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/arrow_right"
                     android:tint="@color/login_text_color" />

src/main/res/layout/file_details_activities_fragment.xml

@@ -19,9 +19,10 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,25 +34,22 @@
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/commentInputField"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/minimum_size_for_touchable_area"
             android:layout_weight="1"
             android:hint="@string/new_comment"
-            android:paddingTop="@dimen/standard_padding"
+            android:layout_marginTop="@dimen/standard_half_margin"
             android:textColorHint="@color/secondary_text_color" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/submitComment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            style="@style/Widget.AppTheme.Button.IconButton"
+            android:layout_width="@dimen/minimum_size_for_touchable_area"
+            android:layout_height="@dimen/minimum_size_for_touchable_area"
             android:contentDescription="@string/common_send"
-            android:paddingBottom="@dimen/standard_padding"
-            android:paddingEnd="@dimen/standard_padding"
-            android:paddingLeft="@dimen/standard_padding"
-            android:paddingRight="@dimen/standard_padding"
-            android:paddingStart="@dimen/standard_padding"
-            android:paddingTop="@dimen/standard_padding"
-            android:src="@drawable/ic_send" />
+            app:cornerRadius="24dp"
+            app:icon="@drawable/ic_send"
+            app:iconTint="@color/grey_600"/>
+
     </LinearLayout>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

src/main/res/layout/file_details_fragment.xml

@@ -28,16 +28,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="@dimen/standard_padding"
-        android:paddingTop="@dimen/standard_padding"
-        android:paddingRight="@dimen/standard_padding"
-        android:paddingBottom="@dimen/standard_padding">
+        android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:padding="@dimen/standard_padding"
             android:orientation="vertical">
 
             <TextView
@@ -112,57 +109,60 @@
 
         </LinearLayout>
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/overflow_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@color/bg_default"
+            style="@style/Widget.AppTheme.Button.IconButton"
+            android:layout_width="@dimen/minimum_size_for_touchable_area"
+            android:layout_height="@dimen/minimum_size_for_touchable_area"
             android:contentDescription="@string/overflow_menu"
-            android:src="@drawable/ic_dots_vertical" />
+            app:cornerRadius="24dp"
+            app:icon="@drawable/ic_dots_vertical"
+            app:iconTint="@color/grey_600" />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/progressBlock"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/standard_padding"
-        android:paddingRight="@dimen/standard_padding"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/standard_padding"
+        android:paddingEnd="@dimen/zero"
         android:paddingBottom="@dimen/standard_half_padding">
 
-        <TextView
-            android:id="@+id/progressText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/downloader_download_in_progress_ticker" />
-
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
-            android:gravity="center"
-            android:orientation="horizontal">
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/progressText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/downloader_download_in_progress_ticker" />
 
             <ProgressBar
                 android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:indeterminate="false"
                 android:indeterminateOnly="false" />
 
-            <ImageButton
-                android:id="@+id/cancelBtn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/standard_half_margin"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/common_cancel"
-                android:src="@drawable/ic_cancel" />
-
         </LinearLayout>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancelBtn"
+            style="@style/Widget.AppTheme.Button.IconButton"
+            android:layout_width="@dimen/minimum_size_for_touchable_area"
+            android:layout_height="@dimen/minimum_size_for_touchable_area"
+            android:contentDescription="@string/common_cancel"
+            app:cornerRadius="24dp"
+            app:icon="@drawable/ic_cancel"
+            app:iconTint="@color/grey_600"
+            android:layout_marginTop="@dimen/standard_eighth_margin"/>
+
     </LinearLayout>
 
     <View

src/main/res/layout/first_run_activity.xml

@@ -97,6 +97,7 @@
             android:id="@+id/host_own_server"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="@dimen/minimum_size_for_touchable_area"
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
             android:gravity="center_horizontal"

src/main/res/layout/list_item.xml

@@ -160,14 +160,14 @@
 
         <ImageView
             android:id="@+id/sharedIcon"
-            android:layout_width="wrap_content"
+            android:layout_width="48dp"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/unreadComments"
             android:clickable="true"
             android:contentDescription="@string/shared_icon_share"
             android:focusable="true"
-            android:paddingStart="@dimen/standard_half_padding"
+            android:paddingStart="@dimen/list_item_share_right_margin"
             android:paddingEnd="@dimen/list_item_share_right_margin"
             android:src="@drawable/ic_unshared" />
 
@@ -196,15 +196,15 @@
 
         <ImageView
             android:id="@+id/overflow_menu"
-            android:layout_width="wrap_content"
+            android:layout_width="48dp"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/custom_checkbox"
             android:clickable="true"
             android:contentDescription="@string/overflow_menu"
             android:focusable="true"
-            android:paddingStart="@dimen/standard_half_padding"
-            android:paddingEnd="@dimen/alternate_padding"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
             android:src="@drawable/ic_dots_vertical" />
 
     </RelativeLayout>

src/main/res/layout/toolbar_standard.xml

@@ -48,7 +48,7 @@
                 style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+                android:layout_marginStart="7dp"
                 android:contentDescription="@string/actionbar_sort"
                 android:minWidth="0dp"
                 android:text="@string/menu_item_sort_by_date_newest_first"
@@ -67,9 +67,9 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/switch_grid_view_button"
                 style="@style/Widget.AppTheme.Button.IconButton"
-                android:layout_width="38dp"
-                android:layout_height="38dp"
-                android:layout_marginEnd="4dp"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginEnd="1dp"
                 android:contentDescription="@string/action_switch_grid_view"
                 app:cornerRadius="24dp"
                 app:icon="@drawable/ic_view_module"
@@ -147,9 +147,9 @@
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/menu_button"
                     style="@style/Widget.AppTheme.Button.IconButton"
-                    android:layout_width="38dp"
-                    android:layout_height="38dp"
-                    android:layout_marginStart="8dp"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="5dp"
                     android:contentDescription="@string/action_switch_grid_view"
                     app:cornerRadius="@dimen/button_corner_radius"
                     app:icon="@drawable/ic_menu"
@@ -161,11 +161,11 @@
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/search_text"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="18dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="13dp"
                     android:layout_marginEnd="18dp"
                     android:ellipsize="end"
-                    android:gravity="start"
+                    android:gravity="start|center_vertical"
                     android:lines="1"
                     android:textColor="@color/fontSecondaryAppbar"
                     android:textSize="16sp"
@@ -178,9 +178,8 @@
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/switch_account_button"
                     style="@style/Widget.AppTheme.Button.IconButton"
-                    android:layout_width="42dp"
-                    android:layout_height="42dp"
-                    android:layout_marginEnd="6dp"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
                     app:cornerRadius="@dimen/button_corner_radius"
                     app:iconSize="30dp"
                     app:layout_constraintBottom_toBottomOf="parent"

src/main/res/values/colors.xml

@@ -39,6 +39,7 @@
     <color name="standard_grey">#757575</color>
     <color name="actionbar_shadow">#222222</color>
     <color name="grey_200">#EEEEEE</color>
+    <color name="grey_600">#666666</color>
 
     <!-- standard material color definitions -->
 

src/main/res/values/dims.xml

@@ -139,4 +139,5 @@
     <dimen name="account_action_button_height">50dp</dimen>
     <dimen name="account_action_button_vertical_margin">10dp</dimen>
     <dimen name="online_status_item_height">52dp</dimen>
+    <dimen name="minimum_size_for_touchable_area">48dp</dimen>
 </resources>

src/main/res/values/strings.xml

@@ -417,7 +417,6 @@
     <string name="subject_user_shared_with_you">%1$s shared \"%2$s\" with you</string>
     <string name="subject_shared_with_you">\"%1$s\" has been shared with you</string>
 
-    <string name="auth_host_address">Server address</string>
     <string name="common_error_out_memory">Not enough memory</string>
 
     <string name="username">Username</string>