blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #145 - Adds pills to the search screen

master
Jeff Boek 2019-01-28 11:54:43 -08:00
parent edcdd05c68
commit e73567a81a
6 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/drawable/ic_qr.xml 100644
View File

File diff suppressed because one or more lines are too long

12
app/src/main/res/drawable/ic_shortcuts.xml 100644
View File

File diff suppressed because one or more lines are too long

12
app/src/main/res/drawable/search_pill_background.xml 100644
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FAFAFC"/>
<stroke android:width="1dp"
android:color="#C6C6Ce"/>
<corners android:radius="16dp"/>
</shape>

59
app/src/main/res/layout/fragment_search.xml
View File

@ -47,9 +47,66 @@
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/pill_wrapper"
mozac:awesomeBarTitleTextColor="#212121"
mozac:awesomeBarDescriptionTextColor="#6b6b6b"
mozac:awesomeBarChipTextColor="#ffffff"
mozac:awesomeBarChipBackgroundColor="#444444" />
<LinearLayout
android:id="@+id/pill_wrapper"
android:background="@color/offwhite"
android:elevation="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
app:layout_constraintTop_toBottomOf="@id/awesomeBar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<Button
tools:ignore="RtlSymmetry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_scan_button"
android:textAllCaps="false"
android:textSize="14sp"
android:textColor="@color/searchPillText"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:singleLine="true"
android:drawableStart="@drawable/ic_qr"
android:padding="8dp"
android:paddingEnd="16dp"
android:drawablePadding="8dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:layout_marginEnd="8dp"
android:background="@drawable/search_pill_background"
style="@style/Widget.AppCompat.Button.Borderless" />
<Button
tools:ignore="RtlSymmetry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_shortcuts_button"
android:textAllCaps="false"
android:textSize="14sp"
android:textColor="@color/searchPillText"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:singleLine="true"
android:drawableStart="@drawable/ic_shortcuts"
android:padding="8dp"
android:paddingEnd="16dp"
android:drawablePadding="8dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:background="@drawable/search_pill_background"
style="@style/Widget.AppCompat.Button.Borderless" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/colors.xml
View File

@ -15,4 +15,6 @@
<color name="session_list_empty_bg">#1A665BFD</color>
<color name="session_list_empty_fg">#665BFD</color>
<color name="session_list_header">#6D6D6E</color>
<color name="searchPillText">#202340</color>
</resources>

2
app/src/main/res/values/strings.xml
View File

@ -23,4 +23,6 @@
<string name="sessions_intro_description">Fenix will collect your browsing sessions\n on your Home Screen for you to
retrieve\n later.
</string>
<string name="search_scan_button">Scan</string>
<string name="search_shortcuts_button">Shortcuts</string>
</resources>