From 9d7fd022969d7adaaf0c77b416f6f7b105c9d6c7 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Sun, 10 Nov 2019 20:37:29 +0300
Subject: [PATCH] Changed theme for welcome screen

---
 .../welcome_buttons_horizontal_container.xml  | 21 +++++++++----------
 .../onboarding/WelcomeDialogFragment.java     | 10 ++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/android/res/layout/welcome_buttons_horizontal_container.xml b/android/res/layout/welcome_buttons_horizontal_container.xml
index 910f9dffdb..b654c57f10 100644
--- a/android/res/layout/welcome_buttons_horizontal_container.xml
+++ b/android/res/layout/welcome_buttons_horizontal_container.xml
@@ -7,29 +7,28 @@
   <Button
     android:id="@+id/accept_btn"
     style="@style/MwmWidget.Button.Primary"
-    android:layout_alignParentEnd="true"
-    android:layout_width="wrap_content"
+    android:layout_width="@dimen/welcome_btn_min_height"
     android:layout_height="wrap_content"
-    android:lines="1"
-    android:minWidth="@dimen/welcome_btn_min_height"
+    android:layout_alignParentEnd="true"
+    android:singleLine="true"
     android:text="@string/accept" />
   <TextView
     android:id="@+id/decline_btn"
-    android:layout_toStartOf="@id/accept_btn"
-    android:layout_width="wrap_content"
+    android:layout_width="@dimen/welcome_btn_min_height"
     android:layout_height="wrap_content"
+    android:minHeight="@dimen/primary_button_min_height"
+    android:layout_centerVertical="true"
     android:layout_marginEnd="@dimen/margin_half"
+    android:layout_toStartOf="@id/accept_btn"
     android:background="?attr/selectableItemBackground"
     android:fontFamily="@string/robotoMedium"
     android:gravity="center"
     android:letterSpacing="0.01"
-    android:minWidth="@dimen/welcome_btn_min_height"
+    android:singleLine="true"
     android:textAllCaps="true"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="@dimen/text_size_body_3"
     android:textStyle="normal"
-    android:layout_centerVertical="true"
-    android:lines="1"
-    tools:text="NOW"
-    tools:ignore="UnusedAttribute" />
+    tools:ignore="UnusedAttribute"
+    tools:text="NOW" />
 </RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java b/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
index a75a9a5013..024e0090be 100644
--- a/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
+++ b/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
@@ -19,6 +19,7 @@ import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmDialogFragment;
 import com.mapswithme.maps.news.WelcomeScreenBindingType;
 import com.mapswithme.util.Counters;
+import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.UiUtils;
 
 public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View.OnClickListener
@@ -93,7 +94,8 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View
   @Override
   protected int getCustomTheme()
   {
-    return getFullscreenTheme();
+    return ThemeUtils.isNightTheme() ? R.style.MwmTheme_DialogFragment_NoFullscreen_Night
+                                     : R.style.MwmTheme_DialogFragment_NoFullscreen;
   }
 
   @NonNull
@@ -141,11 +143,7 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View
     image.setImageResource(mWelcomeScreenBindingType.getImage());
     acceptBtn.setText(mWelcomeScreenBindingType.getAcceptButton());
     declineBtn.setOnClickListener(v -> {});
-
-    boolean hasSubtitle = mWelcomeScreenBindingType.getSubtitle() != null;
-    UiUtils.showIf(hasSubtitle, subtitle);
-    if (hasSubtitle)
-      subtitle.setText(mWelcomeScreenBindingType.getSubtitle());
+    subtitle.setText(mWelcomeScreenBindingType.getSubtitle());
   }
 
   @NonNull