Merge pull request #6572 from nextcloud/dark

Add dark screenshots

scripts/androidScreenshotTest

@@ -4,7 +4,7 @@ if [ $# -lt 2 ]; then
     echo "1: record: true/false
 2: class name
 3: method name
-4: darkMode / \"all\" to run all screenshot combinations
+4: darkMode: dark/light / \"all\" to run all screenshot combinations
 5: color"
 
     exit

scripts/checkIfRunDrone.sh

@@ -6,7 +6,7 @@ if [ -z $3 ] ; then
 fi
 
 export BRANCH=$(scripts/analysis/getBranchBase.sh $1 $2 $3 | sed s'/"//'g)
-if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|build.gradle") -eq 0 ] ; then
+if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|^screenshots|build.gradle") -eq 0 ] ; then
     echo "No source files changed"
     exit 1
 else

scripts/runAllScreenshotCombinations

@@ -30,11 +30,11 @@ do
             exit
         fi
     else
-        ./gradlew gplayDebugExecuteScreenshotTests \
+        ./gradlew --console plain gplayDebugExecuteScreenshotTests \
         $record \
         -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest \
         -Pandroid.testInstrumentationRunnerArguments.COLOR="$color" \
-        -Pandroid.testInstrumentationRunnerArguments.DARKMODE="$darkMode" \
+        -Pandroid.testInstrumentationRunnerArguments.DARKMODE="$darkMode" </dev/null > /dev/null \
         && scripts/deleteOutdatedComments.sh "$1-$darkMode-$color" "Screenshot" "$DRONE_PULL_REQUEST" \
         "$GIT_USERNAME" "$GIT_TOKEN" \
         || scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" "$DRONE_BUILD_NUMBER" \

scripts/screenshotCombinations

@@ -1 +1,2 @@
 light blue
+dark blue

src/main/res/layout/notifications_layout.xml

@@ -57,6 +57,7 @@
                     android:scrollbarStyle="outsideOverlay"
                     android:scrollbars="vertical"
                     android:visibility="visible"
+                    android:background="@color/bg_default"
                     tools:listitem="@layout/notification_list_item" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -76,7 +77,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>