Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

NPE fix

Browse source
This commit is contained in:
androiddevkotlin 2021-03-23 14:26:15 +02:00
parent 294bc53ecd
commit edc741e84f
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/layout/empty_purchases_layout.xml
View file

@ -69,7 +69,7 @@
android:id="@+id/restore_purchases"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/list_selector_background"
android:background="?android:attr/selectableItemBackground"
android:minHeight="@dimen/list_item_height"
android:paddingStart="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
@ -115,7 +115,7 @@
android:id="@+id/new_device_account_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/list_selector_background"
android:background="?android:attr/selectableItemBackground"
android:minHeight="@dimen/list_item_height"
android:paddingStart="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
@ -153,7 +153,7 @@
android:id="@+id/support_link_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/list_selector_background"
android:background="?android:attr/selectableItemBackground"
android:minHeight="@dimen/list_item_height"
android:paddingStart="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
@ -189,7 +189,7 @@
android:id="@+id/contact_support_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/list_selector_background"
android:background="?android:attr/selectableItemBackground"
android:paddingStart="@dimen/action_bar_image_side_margin"
android:paddingLeft="@dimen/action_bar_image_side_margin"
android:paddingTop="@dimen/card_padding"

11
OsmAnd/src/net/osmand/plus/settings/fragments/PurchasesFragment.java
View file

@ -97,6 +97,11 @@ public class PurchasesFragment extends BaseOsmAndFragment {
}
}
});
TextView infoDescription = mainView.findViewById(R.id.info_description);
String restorePurchases = getString(R.string.restore_purchases);
String infoPurchases = String.format(getString(R.string.empty_purchases_description), restorePurchases);
infoDescription.setText(infoPurchases);
}
AndroidUtils.addStatusBarPadding21v(getActivity(), mainView);
createToolbar(mainView, nightMode);
@ -174,6 +179,7 @@ public class PurchasesFragment extends BaseOsmAndFragment {
}
}
});
}
@Nullable
@ -218,11 +224,6 @@ public class PurchasesFragment extends BaseOsmAndFragment {
public void setFormatStrings() {
TextView contactSupportLink = mainView.findViewById(R.id.contact_support_title);
TextView supportDescription = mainView.findViewById(R.id.support_link_title);
TextView infoDescription = mainView.findViewById(R.id.info_description);
String restorePurchases = getString(R.string.restore_purchases);
String infoPurchases = String.format(getString(R.string.empty_purchases_description), restorePurchases);
infoDescription.setText(infoPurchases);
SpannableString spannableStringSupport = new SpannableString(getString(R.string.contact_support));
String urlSupport = "mailto:support@osmand.net";