From 7772036cd6361a75ba29d243bd49e80ab6c3ddfe Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Fri, 1 Nov 2019 13:53:40 +0300
Subject: [PATCH] Changed results, added annotations, removed files

---
 .../pager_fragment_all_pass_subscription.xml  | 206 +++++++++---------
 .../purchase/AllPassSubscriptionFragment.java |   2 +-
 .../purchase/AllPassSubscriptionPage.java     |   2 +-
 .../AllPassSubscriptionPagerFragment.java     |   2 +-
 .../maps/purchase/SubsButtonEntity.java       |  46 ----
 .../com/mapswithme/maps/widget/DotPager.java  |   2 +
 6 files changed, 105 insertions(+), 155 deletions(-)
 delete mode 100644 android/src/com/mapswithme/maps/purchase/SubsButtonEntity.java

diff --git a/android/res/layout/pager_fragment_all_pass_subscription.xml b/android/res/layout/pager_fragment_all_pass_subscription.xml
index f95bdf3389..fa5b014779 100644
--- a/android/res/layout/pager_fragment_all_pass_subscription.xml
+++ b/android/res/layout/pager_fragment_all_pass_subscription.xml
@@ -1,114 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <ImageView
+    android:id="@+id/img1"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-      <ImageView
-        android:id="@+id/img1"
+    android:layout_height="match_parent"
+    android:scaleType="centerCrop"
+    android:src="@drawable/img_bonfire" />
+  <ImageView
+    android:id="@+id/img2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scaleType="centerCrop"
+    android:src="@drawable/img_camping" />
+  <ImageView
+    android:id="@+id/img3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scaleType="centerCrop"
+    android:src="@drawable/img_winter" />
+  <androidx.core.widget.NestedScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:gravity="center_horizontal"
+      android:orientation="vertical">
+      <View
+        android:id="@+id/status_bar_placeholder"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/img_bonfire"/>
-      <ImageView
-        android:id="@+id/img2"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
+      <TextView
+        android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/img_camping"/>
-      <ImageView
-        android:id="@+id/img3"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_base_plus_quarter"
+        android:layout_marginTop="@dimen/all_pass_top_offset"
+        android:layout_marginEnd="@dimen/margin_base_plus_quarter"
+        android:fontFamily="@string/robotoMedium"
+        android:gravity="center"
+        android:text="@string/all_pass_subscription_header"
+        android:textAllCaps="true"
+        android:textColor="@color/white_lightest"
+        android:textSize="@dimen/text_size_body_4" />
+      <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/img_winter"/>
-
-      <androidx.core.widget.NestedScrollView
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_base_plus_quarter"
+        android:layout_marginTop="@dimen/margin_half"
+        android:layout_marginEnd="@dimen/margin_base_plus_quarter"
+        android:fontFamily="@font/fredoka_one"
+        android:gravity="center"
+        android:text="@string/all_pass_subscription_subheader"
+        android:textColor="@color/all_pass_subtitle"
+        android:textSize="@dimen/text_size_title" />
+      <com.mapswithme.maps.widget.ParallaxBackgroundViewPager
+        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
+        android:layout_height="@dimen/subscription_view_pager_height"
+        android:layout_marginTop="@dimen/auth_dialog_padding_top"
+        android:overScrollMode="never"
+        app:autoScroll="true"
+        app:scrollPeriod="4000" />
+      <LinearLayout
+        android:id="@+id/bottom_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
         <LinearLayout
-          android:orientation="vertical"
-          android:gravity="center_horizontal"
+          android:id="@+id/indicator"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_base_plus"
+          android:orientation="horizontal" />
+        <com.mapswithme.maps.widget.SubscriptionButton
+          android:id="@+id/annual_sub_btn"
           android:layout_width="match_parent"
-          android:layout_height="match_parent">
-
-          <View
-            android:id="@+id/status_bar_placeholder"
-            android:layout_width="match_parent"
-            android:background="@android:color/transparent"
-            android:layout_height="wrap_content"/>
-          <TextView
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_base_plus_quarter"
-            android:layout_marginEnd="@dimen/margin_base_plus_quarter"
-            android:layout_marginTop="@dimen/all_pass_top_offset"
-            android:fontFamily="@string/robotoMedium"
-            android:gravity="center"
-            android:textAllCaps="true"
-            android:text="@string/all_pass_subscription_header"
-            android:textColor="@color/white_lightest"
-            android:textSize="@dimen/text_size_body_4" />
-          <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_half"
-            android:layout_marginStart="@dimen/margin_base_plus_quarter"
-            android:layout_marginEnd="@dimen/margin_base_plus_quarter"
-            android:fontFamily="@font/fredoka_one"
-            android:gravity="center"
-            android:text="@string/all_pass_subscription_subheader"
-            android:textColor="@color/all_pass_subtitle"
-            android:textSize="@dimen/text_size_title" />
-
-          <com.mapswithme.maps.widget.ParallaxBackgroundViewPager
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/auth_dialog_padding_top"
-            android:layout_height="@dimen/subscription_view_pager_height"
-            android:overScrollMode="never"
-            app:autoScroll="true"
-            app:scrollPeriod="4000"/>
-
-          <LinearLayout
-            android:id="@+id/bottom_container"
-            android:gravity="center_horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
-            <LinearLayout
-              android:id="@+id/indicator"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal"
-              android:layout_marginTop="@dimen/margin_base_plus"/>
-            <com.mapswithme.maps.widget.SubscriptionButton
-              android:id="@+id/annual_sub_btn"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginStart="@dimen/margin_base_plus"
-              android:layout_marginTop="@dimen/nav_street_height"
-              android:layout_marginEnd="@dimen/margin_base_plus"
-              app:buttonBackground="@drawable/button_accent"
-              app:saleBackground="@drawable/all_pass_sale_bg"
-              app:saleTextColor="@color/tips_and_triks_primary_text_night"
-              app:showSale="true" />
-            <com.mapswithme.maps.widget.SubscriptionButton
-              android:id="@+id/month_sub_btn"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginStart="@dimen/margin_base_plus"
-              android:layout_marginTop="@dimen/margin_base"
-              android:layout_marginEnd="@dimen/margin_base_plus"
-              app:buttonBackground="@drawable/button_secondary_transparent"
-              app:buttonTextColor="@color/black_primary" />
-
-          </LinearLayout>
-        </LinearLayout>
-      </androidx.core.widget.NestedScrollView>
-
-  </RelativeLayout>
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/margin_base_plus"
+          android:layout_marginTop="@dimen/nav_street_height"
+          android:layout_marginEnd="@dimen/margin_base_plus"
+          app:buttonBackground="@drawable/button_accent"
+          app:saleBackground="@drawable/all_pass_sale_bg"
+          app:saleTextColor="@color/tips_and_triks_primary_text_night"
+          app:showSale="true" />
+        <com.mapswithme.maps.widget.SubscriptionButton
+          android:id="@+id/month_sub_btn"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/margin_base_plus"
+          android:layout_marginTop="@dimen/margin_base"
+          android:layout_marginEnd="@dimen/margin_base_plus"
+          app:buttonBackground="@drawable/button_secondary_transparent"
+          app:buttonTextColor="@color/black_primary" />
+      </LinearLayout>
+    </LinearLayout>
+  </androidx.core.widget.NestedScrollView>
+</RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionFragment.java
index e28692f8f4..0b55d3af9d 100644
--- a/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionFragment.java
+++ b/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionFragment.java
@@ -38,7 +38,7 @@ public class AllPassSubscriptionFragment extends Fragment
   }
 
   @NonNull
-  public static AllPassSubscriptionFragment newFragment(int index)
+  static Fragment newInstance(int index)
   {
     AllPassSubscriptionFragment fragment = new AllPassSubscriptionFragment();
     Bundle args = new Bundle();
diff --git a/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPage.java b/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPage.java
index 1173a53e48..11fa218432 100644
--- a/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPage.java
+++ b/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPage.java
@@ -17,7 +17,7 @@ public enum AllPassSubscriptionPage
   @StringRes
   private final int mDescriptionId;
 
-  AllPassSubscriptionPage(int titleId, int descriptionId)
+  AllPassSubscriptionPage(@StringRes int titleId, @StringRes int descriptionId)
   {
     mTitleId = titleId;
     mDescriptionId = descriptionId;
diff --git a/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPagerFragment.java b/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPagerFragment.java
index 6d111f76a8..343d12f970 100644
--- a/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPagerFragment.java
+++ b/android/src/com/mapswithme/maps/purchase/AllPassSubscriptionPagerFragment.java
@@ -115,7 +115,7 @@ public class AllPassSubscriptionPagerFragment extends BaseMwmFragment
     @Override
     public Fragment getItem(int i)
     {
-      return AllPassSubscriptionFragment.newFragment(i);
+      return AllPassSubscriptionFragment.newInstance(i);
     }
 
     @Override
diff --git a/android/src/com/mapswithme/maps/purchase/SubsButtonEntity.java b/android/src/com/mapswithme/maps/purchase/SubsButtonEntity.java
deleted file mode 100644
index c95b756836..0000000000
--- a/android/src/com/mapswithme/maps/purchase/SubsButtonEntity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mapswithme.maps.purchase;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class SubsButtonEntity
-{
-  @NonNull
-  private final String mName;
-
-  @NonNull
-  private final String mPrice;
-
-  @Nullable
-  private final String mSale;
-
-  SubsButtonEntity(@NonNull String name, @NonNull String price, @Nullable String sale)
-  {
-    mName = name;
-    mPrice = price;
-    mSale = sale;
-  }
-
-  SubsButtonEntity(@NonNull String name, @NonNull String price)
-  {
-    this(name, price, null);
-  }
-
-  @NonNull
-  public String getName()
-  {
-    return mName;
-  }
-
-  @NonNull
-  public String getPrice()
-  {
-    return mPrice;
-  }
-
-  @Nullable
-  public String getSale()
-  {
-    return mSale;
-  }
-}
diff --git a/android/src/com/mapswithme/maps/widget/DotPager.java b/android/src/com/mapswithme/maps/widget/DotPager.java
index ae925dadfa..a2ae3fa8bb 100644
--- a/android/src/com/mapswithme/maps/widget/DotPager.java
+++ b/android/src/com/mapswithme/maps/widget/DotPager.java
@@ -155,7 +155,9 @@ public class DotPager implements ViewPager.OnPageChangeListener
     private final Context mContext;
     @Nullable
     private OnPageChangedListener mListener;
+    @DrawableRes
     private int mActiveDotDrawableResId = R.drawable.news_marker_active;
+    @DrawableRes
     private int mInactiveDotDrawableResId = R.drawable.news_marker_inactive;
 
     public Builder(@NonNull Context context, @NonNull ViewPager pager, @NonNull PagerAdapter adapter)