Move toolbar from controller to activity

This commit is contained in:
Moez Bhatti
2018-07-30 23:25:32 -04:00
parent 75162c8114
commit 54facab486
9 changed files with 491 additions and 606 deletions
@@ -17,292 +17,256 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView
android:id="@+id/scrollView"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/toolbarTitle"
style="@style/ToolbarText"
tools:text="Swipe actions" />
</androidx.appcompat.widget.Toolbar>
<ScrollView
android:id="@+id/scrollView"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/right"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:foreground="?attr/selectableItemBackground">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/right"
android:layout_width="match_parent"
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rightTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground">
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/settings_swipe_actions_right"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@id/rightChange"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rightTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/settings_swipe_actions_right"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@id/rightChange"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rightLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/rightTitle"
app:layout_constraintStart_toStartOf="@id/rightTitle"
app:layout_constraintTop_toBottomOf="@id/rightTitle"
app:textSize="secondary"
tools:text="Archive" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rightLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/rightTitle"
app:layout_constraintStart_toStartOf="@id/rightTitle"
app:layout_constraintTop_toBottomOf="@id/rightTitle"
app:textSize="secondary"
tools:text="Archive" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rightChange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/settings_swipe_actions_change"
android:textAllCaps="true"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/rightTitle"
app:textSize="secondary" />
<View
android:id="@+id/rightBackground"
android:layout_width="match_parent"
android:layout_height="84dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:alpha="0.1"
android:background="@drawable/rounded_rectangle_outline_4dp"
android:backgroundTint="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rightLabel" />
<ImageView
android:id="@+id/rightIcon"
android:layout_width="96dp"
android:layout_height="84dp"
android:background="@drawable/rounded_rectangle_left_4dp"
android:paddingBottom="30dp"
android:paddingEnd="48dp"
android:paddingStart="24dp"
android:paddingTop="30dp"
app:layout_constraintBottom_toBottomOf="@id/rightBackground"
app:layout_constraintStart_toStartOf="@id/rightBackground"
app:layout_constraintTop_toTopOf="@id/rightBackground"
tools:backgroundTint="@color/tools_theme"
tools:src="@drawable/ic_archive_black_24dp"
tools:tint="@color/textPrimaryDark" />
<ImageView
android:id="@+id/rightAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:background="@drawable/circle"
android:backgroundTint="?android:attr/divider"
android:padding="8dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="@id/rightBackground"
app:layout_constraintStart_toEndOf="@id/rightIcon"
app:layout_constraintTop_toTopOf="@id/rightBackground" />
<View
android:id="@+id/rightTitleRect"
android:layout_width="128dp"
android:layout_height="8dp"
android:layout_marginStart="16dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toTopOf="@id/rightSummaryRect"
app:layout_constraintStart_toEndOf="@id/rightAvatar"
app:layout_constraintTop_toTopOf="@id/rightBackground"
app:layout_constraintVertical_chainStyle="packed" />
<View
android:id="@+id/rightSummaryRect"
android:layout_width="96dp"
android:layout_height="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="@id/rightBackground"
app:layout_constraintStart_toStartOf="@id/rightTitleRect"
app:layout_constraintTop_toBottomOf="@id/rightTitleRect" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rightChange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/settings_swipe_actions_change"
android:textAllCaps="true"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/rightTitle"
app:textSize="secondary" />
<View
android:id="@+id/rightBackground"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/divider" />
android:layout_height="84dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:alpha="0.1"
android:background="@drawable/rounded_rectangle_outline_4dp"
android:backgroundTint="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rightLabel" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/left"
android:layout_width="match_parent"
<ImageView
android:id="@+id/rightIcon"
android:layout_width="96dp"
android:layout_height="84dp"
android:background="@drawable/rounded_rectangle_left_4dp"
android:paddingBottom="30dp"
android:paddingEnd="48dp"
android:paddingStart="24dp"
android:paddingTop="30dp"
app:layout_constraintBottom_toBottomOf="@id/rightBackground"
app:layout_constraintStart_toStartOf="@id/rightBackground"
app:layout_constraintTop_toTopOf="@id/rightBackground"
tools:backgroundTint="@color/tools_theme"
tools:src="@drawable/ic_archive_black_24dp"
tools:tint="@color/textPrimaryDark" />
<ImageView
android:id="@+id/rightAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:background="@drawable/circle"
android:backgroundTint="?android:attr/divider"
android:padding="8dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="@id/rightBackground"
app:layout_constraintStart_toEndOf="@id/rightIcon"
app:layout_constraintTop_toTopOf="@id/rightBackground" />
<View
android:id="@+id/rightTitleRect"
android:layout_width="128dp"
android:layout_height="8dp"
android:layout_marginStart="16dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toTopOf="@id/rightSummaryRect"
app:layout_constraintStart_toEndOf="@id/rightAvatar"
app:layout_constraintTop_toTopOf="@id/rightBackground"
app:layout_constraintVertical_chainStyle="packed" />
<View
android:id="@+id/rightSummaryRect"
android:layout_width="96dp"
android:layout_height="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="@id/rightBackground"
app:layout_constraintStart_toStartOf="@id/rightTitleRect"
app:layout_constraintTop_toBottomOf="@id/rightTitleRect" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/divider" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/left"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground">
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/leftTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground">
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/settings_swipe_actions_left"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@id/leftChange"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/leftTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/settings_swipe_actions_left"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@id/leftChange"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/leftLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/leftTitle"
app:layout_constraintStart_toStartOf="@id/leftTitle"
app:layout_constraintTop_toBottomOf="@id/leftTitle"
app:textSize="secondary"
tools:text="Archive" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/leftLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/leftTitle"
app:layout_constraintStart_toStartOf="@id/leftTitle"
app:layout_constraintTop_toBottomOf="@id/leftTitle"
app:textSize="secondary"
tools:text="Archive" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/leftChange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/settings_swipe_actions_change"
android:textAllCaps="true"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/leftTitle"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/leftChange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/settings_swipe_actions_change"
android:textAllCaps="true"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/leftTitle"
app:textSize="secondary" />
<View
android:id="@+id/leftBackground"
android:layout_width="match_parent"
android:layout_height="84dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:alpha="0.1"
android:background="@drawable/rounded_rectangle_outline_4dp"
android:backgroundTint="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/leftLabel" />
<View
android:id="@+id/leftBackground"
android:layout_width="match_parent"
android:layout_height="84dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:alpha="0.1"
android:background="@drawable/rounded_rectangle_outline_4dp"
android:backgroundTint="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/leftLabel" />
<ImageView
android:id="@+id/leftIcon"
android:layout_width="96dp"
android:layout_height="84dp"
android:background="@drawable/rounded_rectangle_right_4dp"
android:paddingBottom="30dp"
android:paddingEnd="24dp"
android:paddingStart="48dp"
android:paddingTop="30dp"
app:layout_constraintBottom_toBottomOf="@id/leftBackground"
app:layout_constraintEnd_toEndOf="@id/leftBackground"
app:layout_constraintTop_toTopOf="@id/leftBackground"
tools:backgroundTint="@color/tools_theme"
tools:src="@drawable/ic_archive_black_24dp"
tools:tint="@color/textPrimaryDark" />
<ImageView
android:id="@+id/leftIcon"
android:layout_width="96dp"
android:layout_height="84dp"
android:background="@drawable/rounded_rectangle_right_4dp"
android:paddingBottom="30dp"
android:paddingEnd="24dp"
android:paddingStart="48dp"
android:paddingTop="30dp"
app:layout_constraintBottom_toBottomOf="@id/leftBackground"
app:layout_constraintEnd_toEndOf="@id/leftBackground"
app:layout_constraintTop_toTopOf="@id/leftBackground"
tools:backgroundTint="@color/tools_theme"
tools:src="@drawable/ic_archive_black_24dp"
tools:tint="@color/textPrimaryDark" />
<ImageView
android:id="@+id/leftAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:background="@drawable/circle"
android:backgroundTint="?android:attr/divider"
android:padding="8dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="@id/leftBackground"
app:layout_constraintStart_toStartOf="@id/leftBackground"
app:layout_constraintTop_toTopOf="@id/leftBackground" />
<ImageView
android:id="@+id/leftAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:background="@drawable/circle"
android:backgroundTint="?android:attr/divider"
android:padding="8dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="@id/leftBackground"
app:layout_constraintStart_toStartOf="@id/leftBackground"
app:layout_constraintTop_toTopOf="@id/leftBackground" />
<View
android:id="@+id/leftTitleRect"
android:layout_width="128dp"
android:layout_height="8dp"
android:layout_marginStart="16dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toTopOf="@id/leftSummaryRect"
app:layout_constraintStart_toEndOf="@id/leftAvatar"
app:layout_constraintTop_toTopOf="@id/leftBackground"
app:layout_constraintVertical_chainStyle="packed" />
<View
android:id="@+id/leftTitleRect"
android:layout_width="128dp"
android:layout_height="8dp"
android:layout_marginStart="16dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toTopOf="@id/leftSummaryRect"
app:layout_constraintStart_toEndOf="@id/leftAvatar"
app:layout_constraintTop_toTopOf="@id/leftBackground"
app:layout_constraintVertical_chainStyle="packed" />
<View
android:id="@+id/leftSummaryRect"
android:layout_width="96dp"
android:layout_height="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="@id/leftBackground"
app:layout_constraintStart_toStartOf="@id/leftTitleRect"
app:layout_constraintTop_toBottomOf="@id/leftTitleRect" />
<View
android:id="@+id/leftSummaryRect"
android:layout_width="96dp"
android:layout_height="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="@id/leftBackground"
app:layout_constraintStart_toStartOf="@id/leftTitleRect"
app:layout_constraintTop_toBottomOf="@id/leftTitleRect" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
<View
android:layout_width="0dp"
android:layout_height="8dp"
android:background="@drawable/ab_shadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>