Merge branch 'main' into pr/53

Author: riggaroo

.github/workflows/build_and_test.yml

@@ -42,7 +42,13 @@ jobs:
         env:
           DEBUG_GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.DEBUG_GOOGLE_SERVICES_JSON_BASE64 }}
         run: |
-          echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          if [ -z "$DEBUG_GOOGLE_SERVICES_JSON_BASE64" ]; then
+            echo "DEBUG_GOOGLE_SERVICES_JSON_BASE64 is empty. Copying test-google-services.json."
+            cp test-google-services.json app/google-services.json
+          else
+            echo "Decoding DEBUG_GOOGLE_SERVICES_JSON_BASE64."
+            echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          fi
 
       - name: Apply Spotless
         run: ./gradlew spotlessApply
@@ -131,7 +137,13 @@ jobs:
         env:
           DEBUG_GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.DEBUG_GOOGLE_SERVICES_JSON_BASE64 }}
         run: |
-          echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          if [ -z "$DEBUG_GOOGLE_SERVICES_JSON_BASE64" ]; then
+            echo "DEBUG_GOOGLE_SERVICES_JSON_BASE64 is empty. Copying test-google-services.json."
+            cp test-google-services.json app/google-services.json
+          else
+            echo "Decoding DEBUG_GOOGLE_SERVICES_JSON_BASE64."
+            echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
+          fi
 
       - name: Build
         run: ./gradlew assembleDebug assembleDebugAndroidTest

app/src/main/java/com/android/developers/androidify/MainActivity.kt

@@ -33,12 +33,16 @@ import com.android.developers.androidify.navigation.MainNavigation
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.util.LocalOcclusion
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.function.Consumer
 
 @ExperimentalMaterial3ExpressiveApi
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
     private val isWindowOccluded = mutableStateOf(false)
+    private val presentationListener = Consumer<Boolean> { isMinFractionRendered ->
+        isWindowOccluded.value = !isMinFractionRendered
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -76,8 +80,17 @@ class MainActivity : ComponentActivity() {
             windowManager.registerTrustedPresentationListener(
                 window.decorView.windowToken,
                 presentationThreshold,
-                mainExecutor
-            ) { isMinFractionRendered -> isWindowOccluded.value = !isMinFractionRendered }
+                mainExecutor,
+                presentationListener
+            )
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+            windowManager.unregisterTrustedPresentationListener(presentationListener)
         }
     }
 

test-google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "abc",
+    "project_id": "YourProjectId",
+    "storage_bucket": "abc"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "APlaceholderAPIKeyWith-ThirtyNineCharsX",
+        "android_client_info": {
+          "package_name": "com.android.developers.androidify"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "APlaceholderAPIKeyWith-ThirtyNineCharsX"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}