pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Deleted deprecated actions

Browse source
This commit is contained in:
Dmitry Donskoy 2018-07-04 14:53:26 +03:00 • committed by Vlad Mihaylenko
parent cc5ae45e72
commit d6b08cd25b
2 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/res/layout/about.xml
View file

@ -48,12 +48,6 @@
android:drawableLeft="@drawable/ic_website"
android:drawableStart="@drawable/ic_website"/>
<TextView android:id="@+id/blog"
style="@style/MwmWidget.TextView.Item"
android:text="@string/blog"
android:drawableLeft="@drawable/ic_blog"
android:drawableStart="@drawable/ic_blog"/>
<TextView android:id="@+id/facebook"
style="@style/MwmWidget.TextView.Item"
android:text="@string/facebook"
@ -66,12 +60,6 @@
android:drawableLeft="@drawable/ic_twitter"
android:drawableStart="@drawable/ic_twitter"/>
<TextView android:id="@+id/subscribe"
style="@style/MwmWidget.TextView.Item"
android:text="@string/subscribe_to_news"
android:drawableLeft="@drawable/ic_subscribe"
android:drawableStart="@drawable/ic_subscribe"/>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/margin_quarter"
@ -108,4 +96,4 @@
</com.mapswithme.maps.widget.ObservableScrollView>
<include layout="@layout/shadow_top"/>
</FrameLayout>
</FrameLayout>

17
android/src/com/mapswithme/maps/settings/AboutFragment.java
View file

@ -52,10 +52,8 @@ public class AboutFragment extends BaseSettingsFragment
.setText(getString(R.string.data_version, Framework.nativeGetDataVersion()));
setupItem(R.id.web, true, root);
setupItem(R.id.blog, true, root);
setupItem(R.id.facebook, false, root);
setupItem(R.id.twitter, false, root);
setupItem(R.id.subscribe, true, root);
setupItem(R.id.rate, true, root);
setupItem(R.id.share, true, root);
setupItem(R.id.copyright, false, root);
@ -95,12 +93,6 @@ public class AboutFragment extends BaseSettingsFragment
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.WEB_SITE)));
break;
case R.id.blog:
Statistics.INSTANCE.trackEvent(Statistics.EventName.Settings.WEB_BLOG);
AlohaHelper.logClick(AlohaHelper.Settings.WEB_BLOG);
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.WEB_BLOG)));
break;
case R.id.facebook:
Statistics.INSTANCE.trackEvent(Statistics.EventName.Settings.FACEBOOK);
AlohaHelper.logClick(AlohaHelper.Settings.FACEBOOK);
@ -113,15 +105,6 @@ public class AboutFragment extends BaseSettingsFragment
Utils.showTwitterPage(getActivity());
break;
case R.id.subscribe:
Statistics.INSTANCE.trackEvent(Statistics.EventName.Settings.SUBSCRIBE);
AlohaHelper.logClick(AlohaHelper.Settings.MAIL_SUBSCRIBE);
startActivity(new Intent(Intent.ACTION_SENDTO)
.setData(Utils.buildMailUri(Constants.Email.SUBSCRIBE,
getString(R.string.subscribe_me_subject),
getString(R.string.subscribe_me_body))));
break;
case R.id.rate:
Statistics.INSTANCE.trackEvent(Statistics.EventName.Settings.RATE);
AlohaHelper.logClick(AlohaHelper.Settings.RATE);