prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some adjustments

Browse Source
This commit is contained in:
Zakhar Timoshenko
2022-03-11 21:50:49 +03:00
parent 0b07e83e3c
commit 52dbd70c2f
3 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
View File

@@ -227,10 +227,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
leftMargin = insets.left + topMargin leftMargin = insets.left + topMargin
rightMargin = insets.right + topMargin rightMargin = insets.right + topMargin
} }
if (drawer != null) { binding.container.updateLayoutParams<MarginLayoutParams> {
binding.container.updateLayoutParams<MarginLayoutParams> { topMargin = -(binding.appbar.measureHeight())
topMargin = -(binding.appbar.measureHeight())
}
} }
} }

31
app/src/main/res/layout-w720dp-land/activity_main.xml
View File

@@ -11,26 +11,33 @@
android:id="@+id/navigationView" android:id="@+id/navigationView"
android:layout_width="260dp" android:layout_width="260dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="false"
app:drawerLayoutCornerSize="0dp" app:drawerLayoutCornerSize="0dp"
app:elevation="0dp" app:elevation="0dp"
android:fitsSystemWindows="false"
app:menu="@menu/nav_drawer" /> app:menu="@menu/nav_drawer" />
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
tools:layout="@layout/fragment_list" />
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" app:elevation="0dp"
android:stateListAnimator="@null"> app:liftOnScroll="false">
<FrameLayout <FrameLayout
android:id="@+id/toolbar_card" android:id="@+id/toolbar_card"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="54dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
@@ -43,11 +50,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true">
app:contentInsetStartWithNavigation="0dp"
app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle"
app:titleTextColor="?android:colorControlNormal"
tools:title="@string/app_name">
<org.koitharu.kotatsu.search.ui.widget.SearchEditText <org.koitharu.kotatsu.search.ui.widget.SearchEditText
android:id="@+id/searchView" android:id="@+id/searchView"
@@ -55,12 +58,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"
android:drawablePadding="6dp" android:drawablePadding="16dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="@string/search_manga" android:hint="@string/search_manga"
android:imeOptions="actionSearch" android:imeOptions="actionSearch"
android:importantForAutofill="no" android:importantForAutofill="no"
android:paddingBottom="1dp"
android:singleLine="true" /> android:singleLine="true" />
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
@@ -69,13 +71,6 @@
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
tools:layout="@layout/fragment_list" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab" android:id="@+id/fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"

6
app/src/main/res/layout/activity_main.xml
View File

@@ -42,10 +42,7 @@
android:background="@null" android:background="@null"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
app:contentInsetStartWithNavigation="0dp" app:contentInsetStartWithNavigation="0dp">
app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle"
app:titleTextColor="?android:colorControlNormal"
tools:title="@string/app_name">
<org.koitharu.kotatsu.search.ui.widget.SearchEditText <org.koitharu.kotatsu.search.ui.widget.SearchEditText
android:id="@+id/searchView" android:id="@+id/searchView"
@@ -57,7 +54,6 @@
android:hint="@string/search_manga" android:hint="@string/search_manga"
android:imeOptions="actionSearch" android:imeOptions="actionSearch"
android:importantForAutofill="no" android:importantForAutofill="no"
android:paddingBottom="1dp"
android:singleLine="true" /> android:singleLine="true" />
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>