From d91ed5f6585cc6038958fc0550805c875430ad40 Mon Sep 17 00:00:00 2001
From: Mateusz Drzazga <mateusz.drzazga@amsterdamstandard.com>
Date: Thu, 29 Apr 2021 12:26:26 +0200
Subject: [PATCH 1/2] Add ripple to close button in WebActivity, fix tint color
 not being applied to the ProgressBar. Remove unnecessary null checks.

---
 .../forscience/whistlepunk/signin/WebActivity.java | 14 ++++----------
 .../main/res/layout/activity_arduino_auth_web.xml  |  6 ++++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/WebActivity.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/WebActivity.java
index d781a929..5a145c39 100644
--- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/WebActivity.java
+++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/WebActivity.java
@@ -87,30 +87,24 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mWebView != null) {
-            mWebView.destroy();
-        }
+        mWebView.destroy();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        if (mWebView != null) {
-            mWebView.onPause();
-        }
+        mWebView.onPause();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        if (mWebView != null) {
-            mWebView.onResume();
-        }
+        mWebView.onResume();
     }
 
     @Override
     public void onBackPressed() {
-        if (mWebView != null && mWebView.canGoBack()) {
+        if (mWebView.canGoBack()) {
             mWebView.goBack();
         } else {
             super.onBackPressed();
diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_web.xml b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_web.xml
index 5fb6fb1c..731d8086 100644
--- a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_web.xml
+++ b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_web.xml
@@ -20,8 +20,10 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginStart="18dp"
-            android:background="@null"
+            android:background="?selectableItemBackgroundBorderless"
+            android:clickable="true"
             android:contentDescription="@null"
+            android:focusable="true"
             android:scaleType="centerInside"
             android:src="@drawable/ic_arduino_auth_close"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -65,9 +67,9 @@
             android:layout_width="0dp"
             android:layout_height="4dp"
             android:elevation="0dp"
-            android:foregroundTint="@color/arduino_carrot"
             android:indeterminate="false"
             android:max="100"
+            android:progressTint="@color/arduino_carrot"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

From 6e90d22d4133fe54270cca4285e8efa0f28fc0d3 Mon Sep 17 00:00:00 2001
From: Mateusz Drzazga <mateusz.drzazga@amsterdamstandard.com>
Date: Thu, 29 Apr 2021 13:16:05 +0200
Subject: [PATCH 2/2] Add touch feedback to sign in button and privacy policy

---
 .../src/main/res/layout/activity_main.xml         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_main.xml b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_main.xml
index 788ba33c..d5b578b1 100644
--- a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_main.xml
+++ b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_main.xml
@@ -20,7 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    tools:openDrawer="start">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -80,13 +81,16 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            tools:visibility="visible">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/navigation_user_layout"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:background="?selectableItemBackground"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent">
@@ -124,7 +128,6 @@
                 android:id="@+id/navigation_footer_separator"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
-                android:layout_marginBottom="16dp"
                 android:background="@color/arduino_fog"
                 app:layout_constraintBottom_toTopOf="@id/navigation_user_layout"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -134,9 +137,11 @@
                 android:id="@+id/navigation_privacy_policy"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:background="?selectableItemBackground"
                 android:fontFamily="@font/open_sans"
                 android:gravity="center"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
                 android:text="@string/arduino_auth_privacy"
                 android:textColor="@color/arduino_gris"
                 android:textSize="14sp"