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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2018-04-22 16:46:22 +02:00
commit de2f78e867
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/values/strings.xml
View file

@ -9,14 +9,16 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="monthly_map_updates">Map updates: <b>every month</b></string>
<string name="daily_map_updates">Map updates: <b>every day, every hour</b></string>
<string name="in_app_purchase">In-App purchase</string>
<string name="in_app_purchase_desc">One time payment</string>
<string name="in_app_purchase_desc_ex">Once purchased, it will be permanently available to you.</string>
<string name="purchase_unlim_title">Buy - %1$s</string>
<string name="purchase_subscription_title">Subscript - %1$s</string>
<string name="purchase_subscription_title">Subscribe - %1$s</string>
<string name="wikivoyage_offline">Wikivoyage offline</string>
<string name="dayly_map_updates">Map updates: every day</string>
<string name="unlimited_downloads">Unlimited downloads</string>
<string name="wikipedia_offline">Wikipedia offline</string>
<string name="contour_lines_sea_depth">Contour lines + Sea depth</string>

24
OsmAnd/src/net/osmand/plus/dialogs/ChoosePlanDialogFragment.java
View file

@ -47,20 +47,20 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
private PlanType planType;
private OsmAndFeature[] osmandLiveFeatures = {
OsmAndFeature.WIKIVOYAGE_OFFLINE,
OsmAndFeature.DAYLY_MAP_UPDATES,
OsmAndFeature.UNLIMITED_DOWNLOADS,
OsmAndFeature.DAILY_MAP_UPDATES,
OsmAndFeature.WIKIPEDIA_OFFLINE,
OsmAndFeature.WIKIVOYAGE_OFFLINE,
OsmAndFeature.CONTOUR_LINES_SEA_DEPTH,
OsmAndFeature.UNLOCK_ALL_FEATURES,
OsmAndFeature.DONATION_TO_OSM
OsmAndFeature.DONATION_TO_OSM,
// OsmAndFeature.UNLOCK_ALL_FEATURES,
};
private OsmAndFeature[] osmandUnlimitedFeatures = {
OsmAndFeature.WIKIVOYAGE_OFFLINE,
OsmAndFeature.DAYLY_MAP_UPDATES,
OsmAndFeature.UNLIMITED_DOWNLOADS,
OsmAndFeature.WIKIPEDIA_OFFLINE
OsmAndFeature.MONTHLY_MAP_UPDATES,
OsmAndFeature.WIKIPEDIA_OFFLINE,
OsmAndFeature.WIKIVOYAGE_OFFLINE,
};
public enum PlanType {
@ -85,7 +85,8 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
public enum OsmAndFeature {
WIKIVOYAGE_OFFLINE(R.string.wikivoyage_offline),
DAYLY_MAP_UPDATES(R.string.dayly_map_updates),
DAILY_MAP_UPDATES(R.string.daily_map_updates),
MONTHLY_MAP_UPDATES(R.string.monthly_map_updates),
UNLIMITED_DOWNLOADS(R.string.unlimited_downloads),
WIKIPEDIA_OFFLINE(R.string.wikipedia_offline),
CONTOUR_LINES_SEA_DEPTH(R.string.contour_lines_sea_depth),
@ -103,7 +104,7 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
}
public static OsmAndFeature[] possibleValues() {
return new OsmAndFeature[]{WIKIVOYAGE_OFFLINE, DAYLY_MAP_UPDATES, UNLIMITED_DOWNLOADS,
return new OsmAndFeature[]{WIKIVOYAGE_OFFLINE, DAILY_MAP_UPDATES, MONTHLY_MAP_UPDATES, UNLIMITED_DOWNLOADS,
WIKIPEDIA_OFFLINE, CONTOUR_LINES_SEA_DEPTH, UNLOCK_ALL_FEATURES, DONATION_TO_OSM};
}
}
@ -239,8 +240,9 @@ public class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment {
View featureRowDiv = null;
for (OsmAndFeature feature : osmandLiveFeatures) {
String featureName = feature.toHumanString(ctx);
View featureRow = inflate(planType.osmandLiveFeature == feature
? R.layout.purchase_dialog_card_selected_row : R.layout.purchase_dialog_card_row, cardView);
// View featureRow = inflate(planType.osmandLiveFeature == feature
// ? R.layout.purchase_dialog_card_selected_row : R.layout.purchase_dialog_card_row, cardView);
View featureRow = inflate(R.layout.purchase_dialog_card_row, cardView);
TextViewEx titleView = (TextViewEx) featureRow.findViewById(R.id.title);
titleView.setText(featureName);
featureRowDiv = featureRow.findViewById(R.id.div);