Skip to content

Commit 5e7081a

Browse files
Implemented Edge to Edge (#66)
* Updated README * Implemented edge to edge for immersive exp
1 parent 32b9e48 commit 5e7081a

File tree

4 files changed

+38
-33
lines changed

4 files changed

+38
-33
lines changed

app/release/app-release.apk

1.68 MB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools">
4-
5-
<uses-permission android:name="android.permission.INTERNET" />
6-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
8-
9-
<application
10-
android:allowBackup="true"
11-
android:dataExtractionRules="@xml/data_extraction_rules"
12-
android:fullBackupContent="@xml/backup_rules"
13-
android:icon="@mipmap/ic_launcher"
14-
android:label="@string/app_name"
15-
android:roundIcon="@mipmap/ic_launcher_round"
16-
android:supportsRtl="true"
17-
android:theme="@style/Theme.MBCompass"
18-
tools:targetApi="31">
19-
<activity
20-
android:name=".MainActivity"
21-
android:exported="true"
22-
android:theme="@style/Theme.MBCompass">
23-
<intent-filter>
24-
<action android:name="android.intent.action.MAIN" />
25-
26-
<category android:name="android.intent.category.LAUNCHER" />
27-
</intent-filter>
28-
</activity>
29-
</application>
30-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
8+
9+
<application
10+
android:allowBackup="true"
11+
android:dataExtractionRules="@xml/data_extraction_rules"
12+
android:fullBackupContent="@xml/backup_rules"
13+
android:icon="@mipmap/ic_launcher"
14+
android:label="@string/app_name"
15+
android:roundIcon="@mipmap/ic_launcher_round"
16+
android:supportsRtl="true"
17+
android:theme="@style/Theme.MBCompass"
18+
tools:targetApi="31">
19+
<activity
20+
android:name=".MainActivity"
21+
android:windowSoftInputMode="adjustResize"
22+
android:exported="true"
23+
android:theme="@style/Theme.MBCompass">
24+
<intent-filter>
25+
<action android:name="android.intent.action.MAIN" />
26+
27+
<category android:name="android.intent.category.LAUNCHER" />
28+
</intent-filter>
29+
</activity>
30+
</application>
31+
3132
</manifest>

app/src/main/java/com/mubarak/mbcompass/MainActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
package com.mubarak.mbcompass
44

55
import android.os.Bundle
6-
import android.preference.PreferenceManager
7-
import androidx.activity.ComponentActivity
86
import androidx.activity.compose.setContent
7+
import androidx.activity.enableEdgeToEdge
98
import androidx.fragment.app.FragmentActivity
109
import com.mubarak.mbcompass.ui.CompassNavGraph
1110
import com.mubarak.mbcompass.ui.theme.MBCompassTheme
12-
import org.osmdroid.config.Configuration.getInstance
1311

1412
class MainActivity : FragmentActivity() {
1513
override fun onCreate(savedInstanceState: Bundle?) {
1614
super.onCreate(savedInstanceState)
15+
enableEdgeToEdge()
1716
setContent {
1817
MBCompassTheme {
1918
CompassNavGraph()

app/src/main/java/com/mubarak/mbcompass/ui/compass/CompassApp.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import androidx.compose.foundation.layout.Arrangement
1111
import androidx.compose.foundation.layout.Column
1212
import androidx.compose.foundation.layout.ExperimentalLayoutApi
1313
import androidx.compose.foundation.layout.FlowColumn
14+
import androidx.compose.foundation.layout.WindowInsets
1415
import androidx.compose.foundation.layout.fillMaxSize
16+
import androidx.compose.foundation.layout.navigationBarsPadding
1517
import androidx.compose.foundation.layout.padding
1618
import androidx.compose.foundation.layout.size
1719
import androidx.compose.material3.Icon
@@ -58,9 +60,12 @@ fun CompassApp(context: Context, navigateToMapScreen: () -> Unit) {
5860
mutableFloatStateOf(0F)
5961
}
6062
Scaffold(
63+
contentWindowInsets = WindowInsets(0,0,0,0),
6164
floatingActionButton = {
6265
SmallFloatingActionButton(
6366
onClick = navigateToMapScreen,
67+
modifier = Modifier
68+
.navigationBarsPadding()
6469
) {
6570
Icon(painterResource(R.drawable.map_fill_icon_24px), contentDescription = stringResource(R.string.map))
6671
}

0 commit comments

Comments
 (0)