From 4345b792f1ad61f2d2168ca7af7fbf2b7b0e8126 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 13 Dec 2017 00:59:54 -0500 Subject: [PATCH] Use Search Toolbar in MainActivity --- qksms/src/main/AndroidManifest.xml | 2 +- .../com/moez/QKSMS/presentation/common/base/QkActivity.kt | 1 + .../java/com/moez/QKSMS/presentation/main/MainActivity.kt | 8 +++++++- qksms/src/main/res/layout/main_activity.xml | 2 +- qksms/src/main/res/layout/toolbar_search.xml | 4 +++- qksms/src/main/res/values/strings.xml | 1 + 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 6019572a..13144294 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ android:name=".common.QKApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" + android:label="" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppThemeLight"> diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt index fc063419..e36b468b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem +import android.widget.TextView import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.presentation.Navigator import io.reactivex.disposables.CompositeDisposable diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 0a7e80b2..21d24cad 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -29,7 +29,7 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* 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 javax.inject.Inject @@ -62,6 +62,7 @@ class MainActivity : QkActivity(), MainView { ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState() requestPermissions() viewModel.bindView(this) + toolbarSearch.setHint(R.string.title_conversations) recyclerView.layoutManager = LinearLayoutManager(this) @@ -178,4 +179,9 @@ class MainActivity : QkActivity(), MainView { .check() } + override fun setTitle(title: CharSequence?) { + super.setTitle(title) + toolbarSearch.setText(title) + } + } diff --git a/qksms/src/main/res/layout/main_activity.xml b/qksms/src/main/res/layout/main_activity.xml index f0a44054..abf33040 100644 --- a/qksms/src/main/res/layout/main_activity.xml +++ b/qksms/src/main/res/layout/main_activity.xml @@ -12,7 +12,7 @@ android:animateLayoutChanges="true" android:orientation="vertical"> - + QKSMS Settings + Search conversations… Type a name or number Call