Skip to content

Commit b32c26b

Browse files
authored
Merge pull request #85 from gurnoorpannu/fix/topbar-overlap-issue
Fix proper system bar handling
2 parents 65a38f3 + 963ae96 commit b32c26b

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

app/src/main/java/com/amrdeveloper/linkhub/ui/MainActivity.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ import android.os.Bundle
66
import androidx.appcompat.app.AppCompatActivity
77
import androidx.appcompat.app.AppCompatDelegate
88
import androidx.core.os.bundleOf
9+
import androidx.navigation.fragment.NavHostFragment
10+
import androidx.navigation.ui.AppBarConfiguration
11+
import androidx.navigation.ui.setupWithNavController
912
import com.amrdeveloper.linkhub.R
1013
import com.amrdeveloper.linkhub.data.Theme
14+
import com.amrdeveloper.linkhub.databinding.ActivityMainBinding
1115
import com.amrdeveloper.linkhub.util.ACTION_CREATE_FOLDER
1216
import com.amrdeveloper.linkhub.util.ACTION_CREATE_LINK
1317
import com.amrdeveloper.linkhub.util.UiPreferences
@@ -21,10 +25,14 @@ class MainActivity : AppCompatActivity() {
2125
@Inject
2226
lateinit var uiPreferences: UiPreferences
2327

28+
private lateinit var binding: ActivityMainBinding
29+
2430
override fun onCreate(savedInstanceState: Bundle?) {
2531
super.onCreate(savedInstanceState)
26-
setContentView(R.layout.activity_main)
32+
binding = ActivityMainBinding.inflate(layoutInflater)
33+
setContentView(binding.root)
2734

35+
setupToolbar()
2836
handleMultiThemeOption()
2937

3038
if (uiPreferences.isPasswordEnabled()) {
@@ -34,6 +42,10 @@ class MainActivity : AppCompatActivity() {
3442
}
3543
}
3644

45+
private fun setupToolbar() {
46+
setSupportActionBar(binding.toolbar)
47+
}
48+
3749
fun handleLinkHubIntent() {
3850
when (intent.action) {
3951
Intent.ACTION_VIEW -> return

app/src/main/res/layout/activity_main.xml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,32 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:orientation="vertical"
8-
tools:context=".ui.MainActivity"
9-
tools:viewBindingIgnore="true">
8+
android:fitsSystemWindows="true"
9+
tools:context=".ui.MainActivity">
10+
11+
<com.google.android.material.appbar.AppBarLayout
12+
android:id="@+id/app_bar_layout"
13+
android:layout_width="match_parent"
14+
android:layout_height="wrap_content"
15+
android:theme="@style/ThemeOverlay.Material3.ActionBar">
16+
17+
<com.google.android.material.appbar.MaterialToolbar
18+
android:id="@+id/toolbar"
19+
android:layout_width="match_parent"
20+
android:layout_height="?attr/actionBarSize"
21+
android:background="?attr/colorPrimary"
22+
app:title="@string/app_name"
23+
app:titleTextColor="?attr/colorOnPrimary"
24+
app:navigationIconTint="?attr/colorOnPrimary" />
25+
26+
</com.google.android.material.appbar.AppBarLayout>
1027

1128
<androidx.fragment.app.FragmentContainerView
1229
android:id="@+id/nav_host_fragment"
1330
android:name="androidx.navigation.fragment.NavHostFragment"
1431
android:layout_width="match_parent"
15-
android:layout_height="match_parent"
32+
android:layout_height="0dp"
33+
android:layout_weight="1"
1634
app:defaultNavHost="true"
1735
app:navGraph="@navigation/nav_graph" />
1836

app/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22

3-
<style name="Theme.LinkHub" parent="Theme.Material3.Light">
3+
<style name="Theme.LinkHub" parent="Theme.Material3.Light.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/white</item>
66
<item name="colorPrimaryVariant">@color/white</item>

0 commit comments

Comments
 (0)