forked from upstream-mirrors/quik
Use Search Toolbar in MainActivity
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
android:name=".common.QKApplication"
|
android:name=".common.QKApplication"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label=""
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppThemeLight">
|
android:theme="@style/AppThemeLight">
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import android.os.Bundle
|
|||||||
import android.support.v7.app.AppCompatActivity
|
import android.support.v7.app.AppCompatActivity
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
|
import android.widget.TextView
|
||||||
import com.moez.QKSMS.common.util.Colors
|
import com.moez.QKSMS.common.util.Colors
|
||||||
import com.moez.QKSMS.presentation.Navigator
|
import com.moez.QKSMS.presentation.Navigator
|
||||||
import io.reactivex.disposables.CompositeDisposable
|
import io.reactivex.disposables.CompositeDisposable
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import io.reactivex.subjects.PublishSubject
|
|||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import kotlinx.android.synthetic.main.drawer_view.*
|
import kotlinx.android.synthetic.main.drawer_view.*
|
||||||
import kotlinx.android.synthetic.main.main_activity.*
|
import kotlinx.android.synthetic.main.main_activity.*
|
||||||
import kotlinx.android.synthetic.main.toolbar.*
|
import kotlinx.android.synthetic.main.toolbar_search.*
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@@ -62,6 +62,7 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
|||||||
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
|
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
|
||||||
requestPermissions()
|
requestPermissions()
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
toolbarSearch.setHint(R.string.title_conversations)
|
||||||
|
|
||||||
recyclerView.layoutManager = LinearLayoutManager(this)
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||||
|
|
||||||
@@ -178,4 +179,9 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
|||||||
.check()
|
.check()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun setTitle(title: CharSequence?) {
|
||||||
|
super.setTitle(title)
|
||||||
|
toolbarSearch.setText(title)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
android:animateLayoutChanges="true"
|
android:animateLayoutChanges="true"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<include layout="@layout/toolbar" />
|
<include layout="@layout/toolbar_search" />
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -6,11 +6,13 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="56dp"
|
android:layout_height="56dp"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
|
android:focusable="true"
|
||||||
|
android:focusableInTouchMode="true"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:minHeight="56dp">
|
android:minHeight="56dp">
|
||||||
|
|
||||||
<com.moez.QKSMS.presentation.common.widget.QkEditText
|
<com.moez.QKSMS.presentation.common.widget.QkEditText
|
||||||
android:id="@+id/toolbarTitle"
|
android:id="@+id/toolbarSearch"
|
||||||
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"
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
<string name="app_name">QKSMS</string>
|
<string name="app_name">QKSMS</string>
|
||||||
|
|
||||||
<string name="title_settings">Settings</string>
|
<string name="title_settings">Settings</string>
|
||||||
|
<string name="title_conversations">Search conversations…</string>
|
||||||
<string name="title_compose">Type a name or number</string>
|
<string name="title_compose">Type a name or number</string>
|
||||||
|
|
||||||
<string name="menu_call">Call</string>
|
<string name="menu_call">Call</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user