Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'visually_distinguish_tabs_in_light_mode' of https://github.com/ubiquill/Tusky into ubiquill-visually_distinguish_tabs_in_light_mode

This commit is contained in:
Vavassor 2017-04-09 20:18:43 -04:00
parent 4d9fd09a3c a8c44da532
commit b810dff259
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/activity_account.xml
View File

@ -166,6 +166,15 @@
android:layout_width="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:id="@+id/floating_btn"
android:layout_width="wrap_content"
@ -174,4 +183,4 @@
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_person_add_24dp"/>
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>

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

@ -55,6 +55,7 @@
</android.support.design.widget.TabLayout>
</android.support.v4.view.ViewPager>
</LinearLayout>
<com.arlib.floatingsearchview.FloatingSearchView
@ -70,11 +71,15 @@
app:floatingSearch_leftActionMode="showHamburger"
app:floatingSearch_close_search_on_keyboard_dismiss="true"/>
<FrameLayout
android:id="@+id/overlay_fragment_container"
<View
android:id="@+id/tab_bottom_shadow"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
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:id="@+id/floating_btn"
@ -85,4 +90,9 @@
android:layout_margin="16dp"
android:layout_height="wrap_content"
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>