gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 04:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplification of new toolbar

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-28 12:12:01 +01:00
parent 818d15dbec
commit 47ad0038cc
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -67,9 +67,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
ButterKnife.bind(this) ButterKnife.bind(this)
setSupportActionBar(toolbar) setSupportActionBar(toolbar)

7
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
View File

@ -110,18 +110,13 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
if (it is MainActivity) { if (it is MainActivity) {
it.searchCardView?.isVisible = value it.searchCardView?.isVisible = value
it.floatingActionButton?.isVisible = value it.floatingActionButton?.isVisible = value
it.toolbar.isVisible = !value
val layoutParams = it.toolbar.layoutParams as AppBarLayout.LayoutParams
if (value) { if (value) {
layoutParams.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
it.appBar?.setBackgroundResource(R.color.transparent) it.appBar?.setBackgroundResource(R.color.transparent)
} else { } else {
layoutParams.scrollFlags = 0
it.appBar?.setBackgroundResource(R.color.colorPrimary) it.appBar?.setBackgroundResource(R.color.colorPrimary)
} }
it.toolbar.layoutParams = layoutParams
} }
} }

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

@ -34,8 +34,13 @@
android:layout_height="56dp" android:layout_height="56dp"
android:background="@color/transparent" android:background="@color/transparent"
android:elevation="0dp" android:elevation="0dp"
android:windowContentOverlay="@null"
app:elevation="0dp"> app:elevation="0dp">
<include
layout="@layout/search_layout"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -43,11 +48,8 @@
android:background="@color/transparent" android:background="@color/transparent"
android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar" android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
app:contentInsetStartWithNavigation="0dp" app:contentInsetStartWithNavigation="0dp"
app:layout_scrollFlags="scroll|enterAlways|snap" app:popupTheme="@style/appActionBarPopupMenu" />
app:popupTheme="@style/appActionBarPopupMenu">
<include layout="@layout/search_layout" />
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

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

@ -26,7 +26,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false"
>
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/searchCardView" android:id="@+id/searchCardView"
@ -39,7 +40,8 @@
app:cardBackgroundColor="@color/transparent" app:cardBackgroundColor="@color/transparent"
android:elevation="2dp" android:elevation="2dp"
app:cardElevation="2dp" app:cardElevation="2dp"
android:visibility="gone"> android:visibility="gone"
app:layout_scrollFlags="scroll|enterAlways|snap">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"