diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2a1eaa3..1c390a0a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
package="com.rtbishop.look4sat">
-
-
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt
index 0d468577..215148a2 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt
@@ -17,13 +17,15 @@
*/
package com.rtbishop.look4sat.ui
+import android.content.pm.ActivityInfo
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.setupWithNavController
import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.utility.PrefsManager
import com.rtbishop.look4sat.databinding.ActivityMainBinding
+import com.rtbishop.look4sat.utility.PrefsManager
+import com.rtbishop.look4sat.utility.navigateSafe
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
@@ -34,16 +36,16 @@ class Look4SatActivity : AppCompatActivity() {
lateinit var prefsManager: PrefsManager
override fun onCreate(savedInstanceState: Bundle?) {
+ requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
setTheme(R.style.AppTheme)
super.onCreate(savedInstanceState)
- ActivityMainBinding.inflate(layoutInflater).apply {
- setContentView(root)
- val navHost = supportFragmentManager.findFragmentById(R.id.nav_host) as NavHostFragment
- navBottom.setupWithNavController(navHost.navController)
- if (prefsManager.isFirstLaunch()) {
- prefsManager.setFirstLaunchDone()
- navHost.navController.navigate(R.id.nav_dialog_splash)
- }
+ val binding = ActivityMainBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+ val navHost = supportFragmentManager.findFragmentById(R.id.nav_host) as NavHostFragment
+ binding.navBottom.setupWithNavController(navHost.navController)
+ if (prefsManager.isFirstLaunch()) {
+ prefsManager.setFirstLaunchDone()
+ navHost.navController.navigateSafe(R.id.nav_dialog_splash)
}
}
}
diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt b/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt
index d3857932..5dde77fb 100644
--- a/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt
@@ -17,11 +17,6 @@
*/
package com.rtbishop.look4sat.utility
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
import android.os.Bundle
import androidx.annotation.IdRes
import androidx.fragment.app.Fragment
@@ -33,10 +28,6 @@ import androidx.navigation.Navigator
import androidx.navigation.fragment.findNavController
import com.github.amsacode.predict4java.GroundStationPosition
import com.github.amsacode.predict4java.Satellite
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
import java.util.concurrent.TimeUnit
import kotlin.math.max
import kotlin.math.min
@@ -111,22 +102,3 @@ fun Fragment.getNavResult(@IdRes id: Int, key: String, onResult: (result: T)
}
})
}
-
-@ExperimentalCoroutinesApi
-fun Context.isNetworkAvailableFlow(): Flow = callbackFlow {
- val callback = object : ConnectivityManager.NetworkCallback() {
- override fun onAvailable(network: Network) {
- offer(true)
- }
-
- override fun onLost(network: Network) {
- offer(false)
- }
- }
- val manager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
- manager.registerNetworkCallback(NetworkRequest.Builder().run {
- addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
- build()
- }, callback)
- awaitClose { manager.unregisterNetworkCallback(callback) }
-}
diff --git a/build.gradle b/build.gradle
index 9dad375e..6a891745 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
material_version = '1.3.0'
constraint_layout_version = '2.0.4'
lifecycle_version = '2.3.1'
- navigation_version = '2.3.4'
+ navigation_version = '2.3.5'
preference_version = '1.1.1'
room_version = '2.2.6'
hilt_version = '2.33-beta'