parent
cf61c10c39
commit
2796a7ff18
|
@ -67,20 +67,16 @@
|
|||
app:layout_constraintTop_toBottomOf="@id/download_dialog_title"
|
||||
tools:text="Firefox_Preview_v2.1.apk" />
|
||||
|
||||
<Button
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/download_dialog_action_button"
|
||||
style="@style/PositiveButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="@drawable/rounded_all_corners"
|
||||
android:backgroundTint="?accent"
|
||||
android:padding="16dp"
|
||||
android:text="@string/mozac_feature_downloads_button_open"
|
||||
android:textAllCaps="false"
|
||||
android:textColor="?contrastText"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/download_dialog_filename" />
|
||||
|
|
|
@ -1,32 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
<?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/. -->
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<LinearLayout
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/sync_error_background_color"
|
||||
android:baselineAligned="false"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:background="@color/sync_error_background_color"
|
||||
android:baselineAligned="false">
|
||||
android:paddingEnd="16dp">
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/icon_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<androidx.preference.internal.PreferenceImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:maxWidth="48dp"
|
||||
app:maxHeight="48dp"/>
|
||||
app:maxHeight="48dp"
|
||||
app:maxWidth="48dp" />
|
||||
</FrameLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
@ -34,26 +33,26 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:paddingStart="0dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingBottom="16dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_horizontal"
|
||||
android:layout_weight="1">
|
||||
android:paddingStart="0dp"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingBottom="16dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/errorSummary"
|
||||
app:drawableStartCompat="@drawable/ic_info"
|
||||
android:text="@string/sync_add_new_device_message"
|
||||
android:drawablePadding="8dp"
|
||||
app:drawableTint="@color/sync_error_text_color"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/sync_error_text_color"
|
||||
android:textSize="16sp"
|
||||
android:drawablePadding="8dp"
|
||||
android:ellipsize="marquee"
|
||||
android:fadingEdge="horizontal"
|
||||
android:visibility="visible"/>
|
||||
android:text="@string/sync_add_new_device_message"
|
||||
android:textColor="@color/sync_error_text_color"
|
||||
android:textSize="16sp"
|
||||
android:visibility="visible"
|
||||
app:drawableStartCompat="@drawable/ic_info"
|
||||
app:drawableTint="@color/sync_error_text_color" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
@ -62,18 +61,17 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="vertical"/>
|
||||
android:orientation="vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/learn_button"
|
||||
style="@style/NeutralButton"
|
||||
android:padding="16dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/sync_add_new_device_learn_button" />
|
||||
|
||||
|
@ -82,8 +80,8 @@
|
|||
style="@style/NeutralButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="16dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/sync_add_new_device_connect_button" />
|
||||
</LinearLayout>
|
||||
|
|
|
@ -3,74 +3,76 @@
|
|||
- 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/. -->
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/createShortcutWrapper"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/scrim_background"
|
||||
android:fitsSystemWindows="true"
|
||||
tools:context="org.mozilla.fenix.shortcut.PwaOnboardingDialogFragment">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="32dp"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingBottom="16dp"
|
||||
android:background="@drawable/dialog_background"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:background="@drawable/dialog_background">
|
||||
android:paddingBottom="16dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/add_to_homescreen_title"
|
||||
android:textAppearance="@style/HeaderTextStyle"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:text="@string/add_to_homescreen_title"/>
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/home_icon"
|
||||
android:importantForAccessibility="no"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginStart="0dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
app:srcCompat="@drawable/ic_add_to_homescreen"
|
||||
app:layout_constraintTop_toBottomOf="@id/dialog_title"
|
||||
android:importantForAccessibility="no"
|
||||
app:layout_constraintEnd_toStartOf="@id/description"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/description" />
|
||||
app:layout_constraintTop_toBottomOf="@id/dialog_title"
|
||||
app:srcCompat="@drawable/ic_add_to_homescreen" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/description"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/add_to_homescreen_description_2"
|
||||
android:textColor="?primaryText"
|
||||
android:textSize="16sp"
|
||||
android:text="@string/add_to_homescreen_description_2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/home_icon"
|
||||
app:layout_constraintTop_toTopOf="@id/home_icon"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="@id/home_icon" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
style="@style/Widget.MaterialComponents.Button"
|
||||
android:id="@+id/add_button"
|
||||
style="@style/PositiveButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:backgroundTint="?accent"
|
||||
android:padding="10dp"
|
||||
android:letterSpacing="0"
|
||||
android:text="@string/add_to_homescreen_title"
|
||||
android:textAllCaps="false"
|
||||
android:textColor="?contrastText"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
android:letterSpacing="0"
|
||||
app:layout_constraintBottom_toTopOf="@id/cancel_button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
@ -81,13 +83,13 @@
|
|||
style="@style/Widget.MaterialComponents.Button.TextButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:fontFamily="@font/metropolis_semibold"
|
||||
android:letterSpacing="0"
|
||||
android:text="@string/add_to_homescreen_continue"
|
||||
android:textAllCaps="false"
|
||||
android:textColor="?primaryText"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
android:letterSpacing="0"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
<?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/. -->
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
|
@ -7,9 +8,9 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/foundation"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingTop="20dp"
|
||||
android:paddingEnd="20dp"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingBottom="10dp">
|
||||
|
||||
<ImageView
|
||||
|
@ -17,10 +18,10 @@
|
|||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:importantForAccessibility="no"
|
||||
app:srcCompat="@drawable/ic_info"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:tint="@color/contrast_text_private_theme"/>
|
||||
app:srcCompat="@drawable/ic_info"
|
||||
tools:tint="@color/contrast_text_private_theme" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
|
@ -33,7 +34,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="@string/search_suggestions_onboarding_title"
|
||||
tools:textAppearance="?android:attr/textAppearanceListItem"/>
|
||||
tools:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text"
|
||||
|
@ -45,7 +46,7 @@
|
|||
app:layout_constraintStart_toStartOf="@id/title"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"
|
||||
tools:text="@string/search_suggestions_onboarding_text"
|
||||
tools:textAppearance="?attr/textAppearanceListItemSmall"/>
|
||||
tools:textAppearance="?attr/textAppearanceListItemSmall" />
|
||||
|
||||
<org.mozilla.fenix.utils.LinkTextView
|
||||
android:id="@+id/learn_more"
|
||||
|
@ -60,24 +61,27 @@
|
|||
app:layout_constraintEnd_toStartOf="@id/dismiss"
|
||||
app:layout_constraintStart_toStartOf="@id/title"
|
||||
app:layout_constraintTop_toBottomOf="@id/text"
|
||||
tools:textColor="@color/accent_high_contrast_private_theme"/>
|
||||
tools:textColor="@color/accent_high_contrast_private_theme" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/allow"
|
||||
style="@style/NeutralButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="12dp"
|
||||
android:text="@string/search_suggestions_onboarding_allow_button"
|
||||
android:layout_marginTop="20dp"
|
||||
android:paddingHorizontal="12dp"
|
||||
android:text="@string/search_suggestions_onboarding_allow_button"
|
||||
app:layout_constraintEnd_toEndOf="@id/title"
|
||||
app:layout_constraintTop_toBottomOf="@id/text" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dismiss"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="20dp"
|
||||
android:layout_height="48dp"
|
||||
android:fontFamily="@font/metropolis_semibold"
|
||||
android:gravity="center_vertical"
|
||||
android:letterSpacing="0"
|
||||
android:paddingHorizontal="20dp"
|
||||
android:text="@string/search_suggestions_onboarding_do_not_allow_button"
|
||||
android:textColor="#ffffff"
|
||||
android:textStyle="bold"
|
||||
|
|
|
@ -280,10 +280,9 @@
|
|||
<item name="iconPadding">8dp</item>
|
||||
<item name="iconGravity">textStart</item>
|
||||
<item name="android:textAlignment">center</item>
|
||||
<item name="android:background">@drawable/rounded_button_background</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:minHeight">48dp</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:radius">4dp</item>
|
||||
<item name="android:layout_height">48dp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="backgroundTint">@color/grey_button_color</item>
|
||||
|
@ -331,18 +330,6 @@
|
|||
<item name="android:background">@drawable/search_pill_drawable_button_background</item>
|
||||
</style>
|
||||
|
||||
<style name="SitePermissionButton" parent="Widget.AppCompat.Button.Borderless">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:foreground">?android:attr/selectableItemBackground</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textColor">?primaryText</item>
|
||||
<item name="android:paddingStart">24dp</item>
|
||||
<item name="android:paddingEnd">24dp</item>
|
||||
<item name="android:elevation">0dp</item>
|
||||
<item name="fontFamily">@font/metropolis_semibold</item>
|
||||
</style>
|
||||
|
||||
<style name="DialogStyleBase" parent="NormalTheme">
|
||||
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
|
||||
<item name="android:colorControlNormal">?accentHighContrast</item>
|
||||
|
|
Loading…
Reference in New Issue
Block a user