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

Missed text in UI

Browse source 
"Get" button in "Downloads.
OsmAnd Live screen after purchase.
This commit is contained in:
androiddevkotlin 2021-02-03 15:29:00 +02:00
parent 457c90f945
commit 27fe223dd0
2 changed files with 85 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
OsmAnd/res/layout/subscription_fragment.xml
View file

@ -1,5 +1,4 @@
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -8,7 +7,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="wrap_content"
android:background="?attr/pstsTabBackground" android:background="?attr/pstsTabBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@ -19,19 +18,19 @@
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="52dp"
android:contentDescription="@string/shared_string_close" android:contentDescription="@string/shared_string_close"
app:srcCompat="@drawable/ic_action_remove_dark"/> app:srcCompat="@drawable/ic_action_remove_dark" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/titleTextView" android:id="@+id/titleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text="@string/osm_live_subscription" android:text="@string/osm_live_subscription"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size_large" android:textSize="@dimen/default_list_text_size_large"
android:textStyle="bold" android:textStyle="bold"
app:typeface="@string/font_roboto_regular" app:typeface="@string/font_roboto_regular" />
android:layout_marginStart="20dp" />
</LinearLayout> </LinearLayout>
@ -39,7 +38,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<include layout="@layout/card_bottom_divider"/> <include layout="@layout/card_bottom_divider" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -67,8 +66,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:minHeight="56dp" android:minHeight="56dp"
android:orientation="horizontal"> android:orientation="horizontal">
@ -76,54 +75,54 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="48dp" android:layout_height="48dp"
android:scaleType="center" android:scaleType="center"
app:srcCompat="@drawable/ic_action_osm_live" android:tint="@color/osmand_orange"
android:tint="@color/osmand_orange"/> app:srcCompat="@drawable/ic_action_osm_live" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:paddingStart="2dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:text="@string/osm_live_subscription_desc" android:text="@string/osm_live_subscription_desc"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary" />
android:layout_marginEnd="16dp"
android:paddingStart="2dp"
android:layout_marginStart="16dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:minHeight="56dp" android:minHeight="56dp"
android:orientation="vertical"> android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatCheckBox <androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/donationCheckbox" android:id="@+id/donationCheckbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:paddingStart="34dp"
android:paddingLeft="34dp" android:paddingLeft="34dp"
android:text="@string/donation_to_osm" android:text="@string/donation_to_osm" />
android:paddingStart="34dp"
android:layout_marginStart="16dp" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="72dp" android:layout_marginStart="@dimen/list_content_padding_large"
android:layout_marginRight="16dp" android:layout_marginLeft="@dimen/context_menu_progress_padding_left"
android:layout_marginTop="8dp" android:layout_marginEnd="@dimen/context_menu_progress_padding_left"
android:paddingLeft="2dp" android:layout_marginRight="@dimen/context_menu_progress_padding_left"
android:text="@string/donation_to_osm_desc" android:paddingStart="@dimen/subHeaderPadding"
android:textColor="?android:attr/textColorSecondary" android:paddingLeft="@dimen/subHeaderPadding"
android:layout_marginEnd="16dp" android:paddingEnd="@dimen/subHeaderPadding"
android:layout_marginStart="72dp" android:paddingRight="@dimen/subHeaderPadding"
android:paddingStart="2dp" /> android:text="@string/donation_to_osm_desc" />
</LinearLayout> </LinearLayout>
@ -140,13 +139,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:minHeight="56dp" android:minHeight="56dp"
android:orientation="horizontal"> android:orientation="horizontal">
@ -155,47 +154,47 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="48dp" android:layout_height="48dp"
android:scaleType="center" android:scaleType="center"
app:srcCompat="@drawable/ic_world_globe_dark"/> app:srcCompat="@drawable/ic_world_globe_dark" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:orientation="vertical" android:layout_marginEnd="16dp"
android:layout_marginStart="16dp" android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"> android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="2dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:text="@string/osm_live_support_region" android:text="@string/osm_live_support_region"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary" />
android:paddingStart="2dp" />
<net.osmand.plus.widgets.AutoCompleteTextViewEx <net.osmand.plus.widgets.AutoCompleteTextViewEx
android:id="@+id/selectCountryEdit" android:id="@+id/selectCountryEdit"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:editable="false" android:editable="false"
android:paddingStart="2dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingEnd="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="Ukraine" android:text="Ukraine"
android:paddingStart="2dp" app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:paddingEnd="0dp" /> app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:paddingStart="2dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:text="@string/osm_live_region_desc" android:text="@string/osm_live_region_desc"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary" />
android:paddingStart="2dp" />
</LinearLayout> </LinearLayout>
@ -213,21 +212,21 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="48dp" android:layout_height="48dp"
android:scaleType="center" android:scaleType="center"
app:srcCompat="@drawable/ic_action_message"/> app:srcCompat="@drawable/ic_action_message" />
<EditText <EditText
android:id="@+id/emailEdit" android:id="@+id/emailEdit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:hint="@string/shared_string_email_address" android:hint="@string/shared_string_email_address"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:paddingLeft="2dp" android:paddingStart="2dp"
android:layout_marginStart="16dp" android:paddingLeft="2dp" />
android:layout_marginEnd="16dp"
android:paddingStart="2dp" />
</LinearLayout> </LinearLayout>
@ -235,14 +234,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="72dp"
android:layout_marginLeft="72dp" android:layout_marginLeft="72dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:paddingStart="2dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:text="@string/osm_live_email_desc" android:text="@string/osm_live_email_desc"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary" />
android:paddingStart="2dp"
android:layout_marginStart="72dp"
android:layout_marginEnd="16dp" />
<LinearLayout <LinearLayout
@ -261,21 +260,21 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="48dp" android:layout_height="48dp"
android:scaleType="center" android:scaleType="center"
app:srcCompat="@drawable/ic_action_user"/> app:srcCompat="@drawable/ic_action_user" />
<EditText <EditText
android:id="@+id/userNameEdit" android:id="@+id/userNameEdit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:hint="@string/osm_live_user_public_name" android:hint="@string/osm_live_user_public_name"
android:inputType="text" android:inputType="text"
android:paddingLeft="2dp" android:paddingStart="2dp"
android:layout_marginEnd="16dp" android:paddingLeft="2dp" />
android:layout_marginStart="16dp"
android:paddingStart="2dp" />
</LinearLayout> </LinearLayout>
@ -284,16 +283,16 @@
android:id="@+id/hideUserNameCheckbox" android:id="@+id/hideUserNameCheckbox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginStart="72dp"
android:layout_marginLeft="72dp" android:layout_marginLeft="72dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="12dp"
android:paddingStart="4dp"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:text="@string/osm_live_hide_user_name" android:text="@string/osm_live_hide_user_name"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary" />
android:layout_marginEnd="16dp"
android:paddingStart="4dp"
android:layout_marginStart="72dp" />
</LinearLayout> </LinearLayout>
@ -303,35 +302,35 @@
android:id="@+id/editModeBottomView" android:id="@+id/editModeBottomView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:visibility="visible"> android:visibility="visible">
<Button <Button
android:id="@+id/saveChangesButton" android:id="@+id/saveChangesButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="72dp"
android:layout_marginLeft="72dp" android:layout_marginLeft="72dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:background="?attr/btn_round" android:background="?attr/btn_round"
android:paddingStart="16dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:text="@string/shared_string_save_changes" android:text="@string/shared_string_save_changes"
android:textColor="@color/color_white" android:textColor="@color/color_white" />
android:layout_marginStart="72dp"
android:layout_marginEnd="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<include layout="@layout/card_bottom_divider"/> <include layout="@layout/card_bottom_divider" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="16dp"/> android:layout_height="16dp" />
</LinearLayout> </LinearLayout>

28
OsmAnd/res/layout/two_line_with_images_list_item.xml
View file

@ -24,7 +24,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/favorites_icon_right_margin" android:layout_marginRight="@dimen/favorites_icon_right_margin"
tools:src="@drawable/ic_map" tools:src="@drawable/ic_map"
android:layout_marginEnd="@dimen/favorites_icon_right_margin" /> android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@ -81,26 +81,26 @@
android:visibility="gone" android:visibility="gone"
tools:src="@drawable/ic_action_import" tools:src="@drawable/ic_action_import"
tools:visibility="visible" tools:visibility="visible"
android:layout_marginStart="@dimen/dashFavIconMargin" /> android:layout_marginStart="@dimen/dashFavIconMargin" />
<Button <Button
android:id="@+id/rightButton" android:id="@+id/rightButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="33dp" android:layout_height="wrap_content"
android:minWidth="40dp"
android:paddingLeft="18dp"
android:paddingRight="18dp"
android:background="@drawable/buy_btn_background_light"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dashFavIconMargin"
android:layout_marginLeft="@dimen/dashFavIconMargin" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_marginRight="8dp" android:layout_marginEnd="@dimen/list_header_padding"
android:textColor="@color/buy_button_color" android:layout_marginRight="@dimen/list_header_padding"
android:minWidth="@dimen/list_header_height"
android:minHeight="@dimen/list_content_padding_large"
android:paddingStart="@dimen/context_menu_progress_padding_left"
android:paddingLeft="@dimen/context_menu_progress_padding_left"
android:paddingEnd="@dimen/context_menu_progress_padding_left"
android:paddingRight="@dimen/context_menu_progress_padding_left"
android:text="@string/buy" android:text="@string/buy"
android:visibility="gone" android:textColor="@color/text_color_tab_active_light"
android:layout_marginStart="@dimen/dashFavIconMargin" android:visibility="visible" />
android:layout_marginEnd="8dp"
android:paddingEnd="18dp"
android:paddingStart="18dp" />
</LinearLayout> </LinearLayout>