Some of popup layout fixed

mozilla-mobile · Sep 5, 2019 · 5c51f4c · 5c51f4c
1 parent 8feee6d
commit 5c51f4c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -297,6 +297,7 @@ class HomeFragment : Fragment(), AccountObserver {
 
         requireComponents.backgroundServices.accountManager.register(this, owner = this)
 
+        showOnboarding()
         if (Settings.getInstance(context!!).showPrivateModeContextualFeatureRecommender && browsingModeManager.mode.isPrivate) {
             showOnboarding()
         }
@@ -554,7 +555,6 @@ class HomeFragment : Fragment(), AccountObserver {
         context?.let {
             val layout = LayoutInflater.from(it)
                 .inflate(R.layout.pbm_shortcut_popup, null)
-            layout.onboarding_message.text = getString(R.string.cfr_message)
             val trackingOnboarding =
                 PopupWindow(
                     layout,

diff --git a/app/src/main/res/drawable/rounded_gray_corners.xml b/app/src/main/res/drawable/rounded_gray_corners.xml
@@ -0,0 +1,8 @@
+<?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="@color/grey_button_color" />
+    <corners android:radius="@dimen/tab_corner_radius"/>
+</shape>
diff --git a/app/src/main/res/layout/pbm_shortcut_popup.xml b/app/src/main/res/layout/pbm_shortcut_popup.xml
@@ -15,26 +15,22 @@
             android:layout_gravity="end"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_triangle" />
-    <!-- app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toBottomOf="@id/message" -->
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/pbm_shortcut_popup_background"
-            app:layout_constraintTop_toTopOf="parent">
+            android:background="@drawable/pbm_shortcut_popup_background">
 
         <TextView
-                android:id="@+id/onboarding_message"
+                android:id="@+id/cfr_message"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:layout_marginEnd="16dp"
                 android:lineSpacingExtra="2dp"
-                android:text="@string/etp_onboarding_message"
+                android:text="@string/cfr_message"
                 android:textColor="@color/primary_text_dark_theme"
                 android:textSize="16sp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -44,17 +40,26 @@
         <Button
                 android:id="@+id/cfr_pos_button"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:background="@drawable/rounded_gray_corners"
                 android:text="@string/cfr_pos_button_text"
-                app:layout_constraintTop_toBottomOf="@id/onboarding_message"
+                android:textColor="@color/above_dark_theme"
+                android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cfr_message" />
 
         <Button
                 android:id="@+id/cfr_neg_button"
+                android:background="@android:color/transparent"
+                android:textColor="@color/white_color"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/cfr_neg_button_text"
+                android:textSize="16sp"
                 app:layout_constraintTop_toBottomOf="@id/cfr_pos_button"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />