From 7b2e59765e48e5d6abc0c9575ee34b1a0543eee7 Mon Sep 17 00:00:00 2001
From: Joshua Kuestersteffen <jbkstuff@gmail.com>
Date: Mon, 3 Aug 2020 22:10:16 -0500
Subject: [PATCH] Fix problem where app crashes after the theme is changed (#7)

---
 .github/workflows/android_pr_ci.yml                            | 2 +-
 app/build.gradle.kts                                           | 2 +-
 .../com/sduduzog/slimlauncher/ui/options/OpenAppsFragment.kt   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android_pr_ci.yml b/.github/workflows/android_pr_ci.yml
index 1d070dd8..1490ed25 100644
--- a/.github/workflows/android_pr_ci.yml
+++ b/.github/workflows/android_pr_ci.yml
@@ -23,4 +23,4 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: app
-          path: app/build/outputs/apk/debug/com.jkuester.unlauncher.debug.apk
+          path: app/build/outputs/apk/debug/com.jkuester.unlauncher.apk
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9a08ebba..1346a43b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -83,7 +83,7 @@ dependencies {
     // Arch Components
     implementation("androidx.core:core-ktx:1.5.0-alpha01")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("android.arch.navigation:navigation-fragment:1.0.0")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.2.0")
     implementation("androidx.room:room-runtime:2.2.5")
     implementation("androidx.lifecycle:lifecycle-common-java8:2.2.0")
     kapt("androidx.room:room-compiler:2.2.5")
diff --git a/app/src/main/java/com/sduduzog/slimlauncher/ui/options/OpenAppsFragment.kt b/app/src/main/java/com/sduduzog/slimlauncher/ui/options/OpenAppsFragment.kt
index 1d98268a..b2412ae8 100644
--- a/app/src/main/java/com/sduduzog/slimlauncher/ui/options/OpenAppsFragment.kt
+++ b/app/src/main/java/com/sduduzog/slimlauncher/ui/options/OpenAppsFragment.kt
@@ -2,6 +2,7 @@ package com.sduduzog.slimlauncher.ui.options
 
 import android.content.ComponentName
 import android.content.Intent
+import androidx.navigation.fragment.NavHostFragment
 import com.sduduzog.slimlauncher.data.model.App
 
 class OpenAppsFragment : AddAppFragment() {
@@ -20,6 +21,6 @@ class OpenAppsFragment : AddAppFragment() {
             }
         } catch (e: Exception) {
         }
-        activity?.supportFragmentManager?.popBackStack();
+        NavHostFragment.findNavController(this).popBackStack();
     }
 }
\ No newline at end of file