Skip to content

Commit ea60dc2

Browse files
committed
Revert "Fixes issue #84,"
This reverts commit 963ae96.
1 parent 779257e commit ea60dc2

File tree

3 files changed

+5
-35
lines changed

3 files changed

+5
-35
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ 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
129
import com.amrdeveloper.linkhub.R
1310
import com.amrdeveloper.linkhub.data.Theme
14-
import com.amrdeveloper.linkhub.databinding.ActivityMainBinding
1511
import com.amrdeveloper.linkhub.util.ACTION_CREATE_FOLDER
1612
import com.amrdeveloper.linkhub.util.ACTION_CREATE_LINK
1713
import com.amrdeveloper.linkhub.util.UiPreferences
@@ -25,14 +21,10 @@ class MainActivity : AppCompatActivity() {
2521
@Inject
2622
lateinit var uiPreferences: UiPreferences
2723

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

35-
setupToolbar()
3628
handleMultiThemeOption()
3729

3830
if (uiPreferences.isPasswordEnabled()) {
@@ -42,10 +34,6 @@ class MainActivity : AppCompatActivity() {
4234
}
4335
}
4436

45-
private fun setupToolbar() {
46-
setSupportActionBar(binding.toolbar)
47-
}
48-
4937
fun handleLinkHubIntent() {
5038
when (intent.action) {
5139
Intent.ACTION_VIEW -> return

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,14 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:orientation="vertical"
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>
8+
tools:context=".ui.MainActivity"
9+
tools:viewBindingIgnore="true">
2710

2811
<androidx.fragment.app.FragmentContainerView
2912
android:id="@+id/nav_host_fragment"
3013
android:name="androidx.navigation.fragment.NavHostFragment"
3114
android:layout_width="match_parent"
32-
android:layout_height="0dp"
33-
android:layout_weight="1"
15+
android:layout_height="match_parent"
3416
app:defaultNavHost="true"
3517
app:navGraph="@navigation/nav_graph" />
3618

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

0 commit comments

Comments
 (0)