blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #145 - Pulls properties into a common style

master
Jeff Boek 2019-01-28 12:00:11 -08:00
parent e73567a81a
commit 73346269a0
4 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/drawable/ic_qr.xml
View File

@ -1,3 +1,6 @@
<!-- 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/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"

3
app/src/main/res/drawable/ic_shortcuts.xml
View File

@ -1,3 +1,6 @@
<!-- 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/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"

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

@ -70,43 +70,14 @@
app:layout_constraintBottom_toBottomOf="parent">
<Button
tools:ignore="RtlSymmetry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/search_pill"
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" />
android:layout_marginEnd="8dp"/>
<Button
tools:ignore="RtlSymmetry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/search_pill"
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" />
android:drawableStart="@drawable/ic_shortcuts" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

17
app/src/main/res/values/styles.xml
View File

@ -9,4 +9,21 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/searchPillText</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:gravity">center_vertical</item>
<item name="android:singleLine">true</item>
<item name="android:padding">8dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:drawablePadding">8dp</item>
<item name="android:minWidth">0dp</item>
<item name="android:minHeight">0dp</item>
<item name="android:background">@drawable/search_pill_background</item>
</style>
</resources>