chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Merge upstream

Browse source
This commit is contained in:
Eugen Rochko 2017-03-10 04:35:08 +01:00
commit 473f7f75f1
6 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/res/layout/activity_main.xml
View file

@ -16,14 +16,14 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<!--<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/AppTheme.Account.AppBarLayout"
app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
android:elevation="4dp"
android:background="?attr/toolbar_background_color" />
android:background="?attr/toolbar_background_color" />-->
<android.support.v4.view.ViewPager
android:id="@+id/pager"
@ -34,9 +34,11 @@
android:id="@+id/tab_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:paddingTop="?attr/actionBarSize"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabBackground="?android:colorBackground"
app:tabPaddingStart="1dp"
app:tabPaddingTop="4dp"
app:tabPaddingEnd="1dp">
<android.support.design.widget.TabItem
@ -59,6 +61,19 @@
</android.support.v4.view.ViewPager>
</LinearLayout>
<com.arlib.floatingsearchview.FloatingSearchView
android:id="@+id/floating_search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:floatingSearch_searchBarMarginLeft="6dp"
app:floatingSearch_searchBarMarginTop="4dp"
app:floatingSearch_searchBarMarginRight="6dp"
app:floatingSearch_searchHint="@string/search"
app:floatingSearch_suggestionsListAnimDuration="250"
app:floatingSearch_showSearchKey="false"
app:floatingSearch_leftActionMode="showHamburger"
app:floatingSearch_close_search_on_keyboard_dismiss="true"/>
<FrameLayout
android:id="@+id/overlay_fragment_container"
android:layout_width="match_parent"