diff options
author | Roman Romanov <rromanov@65gb.net> | 2016-12-13 16:18:57 +0300 |
---|---|---|
committer | Roman Romanov <rromanov@65gb.net> | 2016-12-13 16:18:57 +0300 |
commit | d50c1c8b7df73e7c6535deb55a708c3b0b91192b (patch) | |
tree | a68efa68051cfb02723d31e6f5c58e36450eebf4 /android | |
parent | cbe13fc7d00432d274b0ba0b94118c94c9069022 (diff) |
[android] Removed skip button.
Diffstat (limited to 'android')
-rw-r--r-- | android/res/layout/fragment_news.xml | 11 | ||||
-rw-r--r-- | android/res/values-ru/strings.xml | 1 | ||||
-rw-r--r-- | android/res/values/strings.xml | 1 | ||||
-rw-r--r-- | android/src/com/mapswithme/maps/news/BaseNewsFragment.java | 12 |
4 files changed, 0 insertions, 25 deletions
diff --git a/android/res/layout/fragment_news.xml b/android/res/layout/fragment_news.xml index 496fa1a2d7..429ba823fc 100644 --- a/android/res/layout/fragment_news.xml +++ b/android/res/layout/fragment_news.xml @@ -21,17 +21,6 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <TextView - android:id="@+id/skip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="start" - android:text="@string/skip" - android:textAppearance="@style/MwmTextAppearance.Body3" - android:textColor="?colorAccent" - android:textAllCaps="true" - android:padding="@dimen/margin_base" - android:background="?clickableBackground"/> <ImageView android:id="@+id/back" diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 78a7a86034..f3443e7dae 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -1059,5 +1059,4 @@ <string name="whatsnew_font_size">Размер шрифта</string> <!-- january --> <string name="whatsnew_font_size_text">Названия объектов на карте теперь можно сделать крупнее.</string> - <string name="skip">Пропустить</string> </resources> diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index a878683525..c9b063e951 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1063,5 +1063,4 @@ <string name="whatsnew_font_size">Font Size</string> <!-- january --> <string name="whatsnew_font_size_text">Labels on the map can be made bigger.</string> - <string name="skip">Skip</string> </resources> diff --git a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java index b33839f4ec..04eda628ca 100644 --- a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java +++ b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java @@ -35,7 +35,6 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment private View mPrevButton; private View mNextButton; private View mDoneButton; - private View mSkipButton; private ImageView[] mDots; private int mPageCount; @@ -165,7 +164,6 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment UiUtils.showIf(cur > 0, mPrevButton); UiUtils.showIf(cur + 1 < mPageCount, mNextButton); UiUtils.visibleIf(cur + 1 == mPageCount, mDoneButton); - UiUtils.visibleIf(cur == 0, mSkipButton); if (mPageCount == 1) return; @@ -255,7 +253,6 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment mPrevButton = content.findViewById(R.id.back); mNextButton = content.findViewById(R.id.next); mDoneButton = content.findViewById(R.id.done); - mSkipButton = content.findViewById(R.id.skip); mPrevButton.setOnClickListener(new View.OnClickListener() { @@ -284,15 +281,6 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment } }); - mSkipButton.setOnClickListener(new View.OnClickListener() - { - @Override - public void onClick(View v) - { - dismissAllowingStateLoss(); - } - }); - update(); return res; } |