diff --git a/OsmAnd/res/drawable/dialog_active_card_bg.xml b/OsmAnd/res/drawable/dialog_active_card_bg.xml new file mode 100644 index 0000000000..ccf3936585 --- /dev/null +++ b/OsmAnd/res/drawable/dialog_active_card_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/OsmAnd/res/drawable/dialog_card_bg.xml b/OsmAnd/res/drawable/dialog_card_bg.xml new file mode 100644 index 0000000000..3a8352bc4f --- /dev/null +++ b/OsmAnd/res/drawable/dialog_card_bg.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/OsmAnd/res/drawable/wikivoyage_active_card_bg.xml b/OsmAnd/res/drawable/wikivoyage_active_card_bg.xml new file mode 100644 index 0000000000..fea31ba76f --- /dev/null +++ b/OsmAnd/res/drawable/wikivoyage_active_card_bg.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_active_card.xml b/OsmAnd/res/layout/purchase_dialog_active_card.xml new file mode 100644 index 0000000000..2ec419d5db --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_active_card.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_active_card_row.xml b/OsmAnd/res/layout/purchase_dialog_active_card_row.xml new file mode 100644 index 0000000000..0577fbcbc5 --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_active_card_row.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_card.xml b/OsmAnd/res/layout/purchase_dialog_card.xml new file mode 100644 index 0000000000..a8d546e811 --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_card.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_card_button.xml b/OsmAnd/res/layout/purchase_dialog_card_button.xml new file mode 100644 index 0000000000..4ecbbd27c8 --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_card_button.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_card_header.xml b/OsmAnd/res/layout/purchase_dialog_card_header.xml new file mode 100644 index 0000000000..ff0ba0d43e --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_card_header.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_card_row.xml b/OsmAnd/res/layout/purchase_dialog_card_row.xml new file mode 100644 index 0000000000..d567ca8b3c --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_card_row.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/purchase_dialog_fragment.xml b/OsmAnd/res/layout/purchase_dialog_fragment.xml new file mode 100644 index 0000000000..367cf30398 --- /dev/null +++ b/OsmAnd/res/layout/purchase_dialog_fragment.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml index 93308407d4..e9696ab479 100644 --- a/OsmAnd/res/values/attrs.xml +++ b/OsmAnd/res/values/attrs.xml @@ -65,6 +65,10 @@ + + + + diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index 70e89435d8..4a6d13a57f 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -1,6 +1,17 @@ + #212121 + #cccccc + #212121 + #727272 + #e6e6e6 + #2d3133 + #727272 + #b3b3b3 + #4d4d4d + + #bfbfbf #c5d2e6 #3db878 diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml index 033ed86009..a516f00b0f 100644 --- a/OsmAnd/res/values/sizes.xml +++ b/OsmAnd/res/values/sizes.xml @@ -1,5 +1,14 @@ + + 64dp + 32dp + 20dp + 28sp + 64dp + 48dp + 52dp + 36dp 6dp 2dp diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index bff61aa316..29c4269687 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,9 @@ 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 --> + Choose plan + To read Travel articles offline, you need to purchase one of the following items. + Choose suitable item: Don\'t Do Only with WiFi diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml index 0fae185936..576736a856 100644 --- a/OsmAnd/res/values/styles.xml +++ b/OsmAnd/res/values/styles.xml @@ -197,6 +197,10 @@ @color/coordinate_input_edit_text_normal_light + @color/dialog_title_color_light + @color/dialog_description_color_light + @color/card_description_text_color_light + @color/wikivoyage_bg_light @color/wikivoyage_card_bg_light @color/wikivoyage_card_divider_light @@ -391,6 +395,10 @@ @color/coordinate_input_edit_text_normal_dark + @color/dialog_title_color_dark + @color/dialog_description_color_dark + @color/card_description_text_color_dark + @color/wikivoyage_bg_dark @color/wikivoyage_card_bg_dark @color/wikivoyage_card_divider_dark