Commit c3b8edc5 authored by Dayona Joseph's avatar Dayona Joseph
Browse files

UI update

Change ActionBarDrawableToggle icon
Change 'send' icon color
parent 7ab6af2a
Pipeline #63264 passed with stage
in 10 minutes and 5 seconds
......@@ -23,12 +23,10 @@ import android.animation.ObjectAnimator
import android.app.AlertDialog
import android.content.Intent
import android.content.res.ColorStateList
import android.os.Build
import android.os.Bundle
import android.view.Gravity
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.ViewStub
import android.view.*
import androidx.annotation.RequiresApi
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.core.app.ActivityCompat
import androidx.core.view.GravityCompat
......@@ -44,13 +42,7 @@ import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.androidxcompat.drawerOpen
import com.moez.QKSMS.common.base.QkThemedActivity
import com.moez.QKSMS.common.util.extensions.autoScrollToStart
import com.moez.QKSMS.common.util.extensions.dismissKeyboard
import com.moez.QKSMS.common.util.extensions.resolveThemeColor
import com.moez.QKSMS.common.util.extensions.scrapViews
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.common.util.extensions.*
import com.moez.QKSMS.feature.blocking.BlockingDialog
import com.moez.QKSMS.feature.changelog.ChangelogDialog
import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
......@@ -120,6 +112,7 @@ class MainActivity : QkThemedActivity(), MainView {
private val syncing by lazy { findViewById<View>(R.id.syncing) }
private val backPressedSubject: Subject<NavItem> = PublishSubject.create()
@RequiresApi(Build.VERSION_CODES.M)
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
......@@ -127,6 +120,14 @@ class MainActivity : QkThemedActivity(), MainView {
viewModel.bindView(this)
onNewIntentIntent.onNext(intent)
toggle.isDrawerIndicatorEnabled=false
toggle.setToolbarNavigationClickListener{
drawerLayout.openDrawer(GravityCompat.START)
}
toggle.setHomeAsUpIndicator(R.drawable.ic_drawer_icon)
toggle.drawerArrowDrawable.color = getColor(R.color.tools_theme);
(snackbar as? ViewStub)?.setOnInflateListener { _, _ ->
snackbarButton.clicks().autoDisposable(scope()).subscribe(snackbarButtonIntent)
}
......
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="25dp"
android:height="25dp"
android:viewportWidth="7"
android:viewportHeight="7">
<path
android:pathData="M6.89041,0.94613C6.90497,0.94613 6.91952,0.94613 6.94863,0.91703C6.96319,0.90247 6.97774,0.88792 6.97774,0.85881V0.50844C6.97774,0.49388 6.96318,0.47933 6.94863,0.45022C6.91952,0.43566 6.90496,0.42111 6.89041,0.42111H0.52554C0.49643,0.42111 0.48187,0.43567 0.46731,0.45022C0.4382,0.47933 0.4382,0.49389 0.4382,0.50844V0.8588C0.4382,0.88791 0.4382,0.90247 0.46731,0.91702C0.48187,0.94613 0.49643,0.94613 0.52554,0.94613L6.89041,0.94613ZM6.89041,3.28183C6.90497,3.28183 6.91952,3.28183 6.94863,3.25272C6.96319,3.23817 6.97774,3.22361 6.97774,3.1945V2.84414C6.97774,2.82958 6.96318,2.81503 6.94863,2.78592C6.91952,2.77136 6.90496,2.75681 6.89041,2.75681H0.52554C0.49643,2.75681 0.48187,2.77137 0.46731,2.78592C0.4382,2.81503 0.4382,2.82959 0.4382,2.84414V3.19449C0.4382,3.2236 0.4382,3.23816 0.46731,3.25271C0.48187,3.28182 0.49643,3.28182 0.52554,3.28182L6.89041,3.28183ZM6.89041,5.61759C6.90497,5.61759 6.91952,5.61759 6.94863,5.58848C6.96319,5.57392 6.97774,5.55937 6.97774,5.53026V5.17991C6.97774,5.16535 6.96318,5.1508 6.94863,5.12169C6.91952,5.10714 6.90496,5.09258 6.89041,5.09258H0.52554C0.49643,5.09258 0.48187,5.10714 0.46731,5.12169C0.4382,5.1508 0.4382,5.16536 0.4382,5.17991V5.53026C0.4382,5.55937 0.4382,5.57393 0.46731,5.58848C0.48187,5.61759 0.49643,5.61759 0.52554,5.61759H6.89041Z"
android:fillColor="#0087EC"/>
</vector>
......@@ -336,7 +336,6 @@
android:contentDescription="@string/compose_send_cd"
android:elevation="4dp"
android:padding="10dp"
android:tint="?android:textColorSecondary"
android:src="@drawable/ic_send"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
......
......@@ -37,6 +37,7 @@
android:focusableInTouchMode="true"
app:contentInsetStartWithNavigation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment