Modified permissions screen

android/res/layout-land/fragment_detail_permissions.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/rv__permissions"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_centerInParent="true"
+    android:layout_above="@+id/btn_frame"/>
+  <RelativeLayout
+    android:id="@id/btn_frame"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:paddingBottom="@dimen/margin_half_plus_eight"
+    android:gravity="center_vertical">
+    <include
+      android:id="@+id/divider"
+      layout="@layout/divider_horizontal"/>
+    <include
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginStart="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus_eight"
+      android:layout_below="@id/divider"
+      layout="@layout/welcome_buttons_horizontal_container"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+  </RelativeLayout>
+</RelativeLayout>

android/res/layout/accept_decline_button_container.xml

@@ -29,6 +29,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textSize="@dimen/text_size_body_3"
         android:textStyle="normal"
+        android:text="@string/learn_more"
         tools:ignore="UnusedAttribute"
         tools:text="NOT NOW" />
     </FrameLayout>

android/res/layout/fragment_detail_permissions.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <androidx.recyclerview.widget.RecyclerView
@@ -10,45 +9,13 @@
     android:layout_height="match_parent"
     android:layout_centerInParent="true"
     android:layout_above="@+id/btn_frame"/>
-  <RelativeLayout
-    android:id="@id/btn_frame"
-    android:orientation="horizontal"
+  <include
+    android:id="@+id/btn_frame"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/margin_double_plus"
+    android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:paddingTop="@dimen/margin_quarter_plus"
-    android:paddingBottom="@dimen/margin_quarter_plus"
-    android:paddingRight="@dimen/margin_half"
-    android:paddingLeft="@dimen/margin_half"
-    android:background="?accentButtonBackground"
-    android:gravity="center_vertical">
-    <TextView
-      android:id="@+id/btn__back"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:paddingLeft="@dimen/margin_half"
-      android:paddingRight="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.Button"
-      android:textColor="?accentButtonTextColor"
-      android:fontFamily="@string/robotoMedium"
-      android:text="@string/back"
-      android:gravity="center_vertical"
-      android:background="?clickableBackground"
-      tools:targetApi="jelly_bean"/>
-    <TextView
-      android:id="@+id/btn__continue"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:paddingLeft="@dimen/margin_half"
-      android:paddingRight="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.Button"
-      android:textColor="?accentButtonTextColor"
-      android:fontFamily="@string/robotoMedium"
-      android:text="@string/continue_download"
-      android:gravity="center_vertical"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
-      android:background="?clickableBackground"
-      tools:targetApi="jelly_bean"/>
-  </RelativeLayout>
+    android:layout_marginStart="@dimen/margin_base_plus"
+    android:layout_marginEnd="@dimen/margin_base_plus"
+    android:layout_marginBottom="@dimen/margin_base_plus"
+    layout="@layout/welcome_buttons_vertical_container"/>
 </RelativeLayout>

android/res/layout/welcome_buttons_horizontal_container.xml

@@ -29,6 +29,7 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="@dimen/text_size_body_3"
     android:textStyle="normal"
+    android:text="@string/learn_more"
     tools:ignore="UnusedAttribute"
     tools:text="NOW" />
 </RelativeLayout>

android/src/com/mapswithme/maps/onboarding/IntroductionDialogFragment.java

@@ -42,7 +42,7 @@ public class IntroductionDialogFragment extends BaseMwmDialogFragment
     View content = View.inflate(getActivity(), R.layout.fragment_welcome, null);
     res.setContentView(content);
     IntroductionScreenFactory factory = getScreenFactory();
-    TextView button = content.findViewById(R.id.btn__continue);
+    TextView button = content.findViewById(R.id.accept_btn);
     button.setText(factory.getAction());
     button.setOnClickListener(v -> onAcceptClicked());
     ImageView image = content.findViewById(R.id.iv__image);

android/src/com/mapswithme/maps/permissions/PermissionsDetailDialogFragment.java

@@ -2,6 +2,8 @@ package com.mapswithme.maps.permissions;
 
 import android.app.Dialog;
 import android.os.Bundle;
+import android.widget.TextView;
+
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -12,7 +14,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.mapswithme.maps.R;
 
 public class PermissionsDetailDialogFragment extends BasePermissionsDialogFragment
@@ -47,7 +48,10 @@ public class PermissionsDetailDialogFragment extends BasePermissionsDialogFragme
     permissions.setLayoutManager(new LinearLayoutManager(getContext(),
                                                          LinearLayoutManager.VERTICAL, false));
     permissions.setAdapter(new PermissionsAdapter());
-
+    TextView acceptBtn = res.findViewById(R.id.accept_btn);
+    acceptBtn.setText(R.string.continue_download);
+    TextView declineBtn = res.findViewById(R.id.decline_btn);
+    declineBtn.setText(R.string.back);
     return res;
   }
 
@@ -62,7 +66,7 @@ public class PermissionsDetailDialogFragment extends BasePermissionsDialogFragme
   @Override
   protected int getFirstActionButton()
   {
-    return R.id.btn__back;
+    return R.id.decline_btn;
   }
 
   @Override
@@ -75,6 +79,6 @@ public class PermissionsDetailDialogFragment extends BasePermissionsDialogFragme
   @Override
   protected int getContinueActionButton()
   {
-    return R.id.btn__continue;
+    return R.id.accept_btn;
   }
 }

android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java

@@ -36,7 +36,7 @@ public class PermissionsDialogFragment extends BasePermissionsDialogFragment
   @Override
   protected int getImageRes()
   {
-    return R.drawable.img_permissions;
+    return R.drawable.img_permission_explanation;
   }
 
   @StringRes
@@ -64,7 +64,7 @@ public class PermissionsDialogFragment extends BasePermissionsDialogFragment
   @Override
   protected int getFirstActionButton()
   {
-    return R.id.accept_btn;
+    return R.id.decline_btn;
   }
 
   @Override
@@ -77,7 +77,7 @@ public class PermissionsDialogFragment extends BasePermissionsDialogFragment
   @Override
   protected int getContinueActionButton()
   {
-    return R.id.btn__continue;
+    return R.id.accept_btn;
   }
 
   @Override