Merge branch 'ubiquill-visually_distinguish_tabs_in_light_mode'
This commit is contained in:
commit
7792895837
2 changed files with 25 additions and 6 deletions
|
@ -166,6 +166,15 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/tab_bottom_shadow"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="2dp"
|
||||||
|
app:layout_anchor="@id/tab_layout"
|
||||||
|
app:layout_anchorGravity="bottom"
|
||||||
|
android:background="@drawable/material_drawer_shadow_bottom"
|
||||||
|
android:visibility="visible" />
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
<android.support.design.widget.FloatingActionButton
|
||||||
android:id="@+id/floating_btn"
|
android:id="@+id/floating_btn"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -174,4 +183,4 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:srcCompat="@drawable/ic_person_add_24dp"/>
|
app:srcCompat="@drawable/ic_person_add_24dp"/>
|
||||||
|
|
||||||
</android.support.design.widget.CoordinatorLayout>
|
</android.support.design.widget.CoordinatorLayout>
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
</android.support.design.widget.TabLayout>
|
</android.support.design.widget.TabLayout>
|
||||||
|
|
||||||
</android.support.v4.view.ViewPager>
|
</android.support.v4.view.ViewPager>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<com.arlib.floatingsearchview.FloatingSearchView
|
<com.arlib.floatingsearchview.FloatingSearchView
|
||||||
|
@ -70,11 +71,15 @@
|
||||||
app:floatingSearch_leftActionMode="showHamburger"
|
app:floatingSearch_leftActionMode="showHamburger"
|
||||||
app:floatingSearch_close_search_on_keyboard_dismiss="true"/>
|
app:floatingSearch_close_search_on_keyboard_dismiss="true"/>
|
||||||
|
|
||||||
<FrameLayout
|
<View
|
||||||
android:id="@+id/overlay_fragment_container"
|
android:id="@+id/tab_bottom_shadow"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="2dp"
|
||||||
</FrameLayout>
|
app:layout_anchor="@id/tab_layout"
|
||||||
|
app:layout_anchorGravity="bottom"
|
||||||
|
android:background="@drawable/material_drawer_shadow_bottom"
|
||||||
|
android:visibility="visible" />
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
<android.support.design.widget.FloatingActionButton
|
||||||
android:id="@+id/floating_btn"
|
android:id="@+id/floating_btn"
|
||||||
|
@ -85,4 +90,9 @@
|
||||||
android:layout_margin="16dp"
|
android:layout_margin="16dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:srcCompat="@drawable/ic_create_24dp"/>
|
app:srcCompat="@drawable/ic_create_24dp"/>
|
||||||
</android.support.design.widget.CoordinatorLayout>
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/overlay_fragment_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"></FrameLayout>
|
||||||
|
</android.support.design.widget.CoordinatorLayout>
|
||||||
|
|
Loading…
Reference in a new issue