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

Merge pull request #10179 from osmandapp/send-gpx

Browse source 
Send gpx
This commit is contained in:
Vitaliy 2020-11-13 15:07:10 +00:00 committed by GitHub
commit 596cb99f66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/res/layout/send_gpx_fragment.xml
View file

@ -39,6 +39,7 @@
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/message_field" android:id="@+id/message_field"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background = "?attr/text_input_background"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" /> android:imeOptions="actionDone" />
@ -60,8 +61,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:background = "?attr/text_input_background"
android:text="osmand" /> android:text="osmand" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
</LinearLayout> </LinearLayout>
@ -87,7 +88,7 @@
android:paddingBottom="@dimen/context_menu_first_line_top_margin" android:paddingBottom="@dimen/context_menu_first_line_top_margin"
android:text="@string/gpx_visibility_txt" android:text="@string/gpx_visibility_txt"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
@ -127,6 +128,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:letterSpacing="@dimen/description_letter_spacing" android:letterSpacing="@dimen/description_letter_spacing"
android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_first_line_top_margin" android:paddingTop="@dimen/context_menu_first_line_top_margin"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
@ -177,20 +179,22 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:letterSpacing="@dimen/text_button_letter_spacing" android:letterSpacing="@dimen/description_letter_spacing"
android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
android:singleLine="true" android:singleLine="true"
android:text="@string/login_account" android:text="@string/login_account"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/user_name" android:id="@+id/user_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:letterSpacing="@dimen/description_letter_spacing" android:letterSpacing="@dimen/text_button_letter_spacing"
android:lineSpacingExtra="5dp"
android:maxLines="4" android:maxLines="4"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />

1
OsmAnd/res/values/attrs.xml
View file

@ -138,6 +138,7 @@
<attr name="btn_radio_button_right" format="reference"/> <attr name="btn_radio_button_right" format="reference"/>
<attr name="btn_radio_button_center" format="reference"/> <attr name="btn_radio_button_center" format="reference"/>
<attr name="bg_dash_line" format="reference"/> <attr name="bg_dash_line" format="reference"/>
<attr name="text_input_background" format="reference"/>
</declare-styleable> </declare-styleable>
<declare-styleable name="PagerSlidingTabStrip"> <declare-styleable name="PagerSlidingTabStrip">

2
OsmAnd/res/values/colors.xml
View file

@ -477,5 +477,7 @@
<color name="switch_button_active_stroke_dark">#80D28521</color> <color name="switch_button_active_stroke_dark">#80D28521</color>
<color name="empty_hint_bg">#80000000</color> <color name="empty_hint_bg">#80000000</color>
<color name="input_layout_bg_color">#4DCCCCCC</color> <color name="input_layout_bg_color">#4DCCCCCC</color>
<color name="text_input_background_light">#14000000</color>
<color name="text_input_background_dark">#0DFFFFFF</color>
</resources> </resources>

2
OsmAnd/res/values/styles.xml
View file

@ -245,6 +245,7 @@
<item name="btn_radio_button_center">@drawable/radio_button_center_light</item> <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
<item name="checkboxStyle">@style/CheckboxStyle</item> <item name="checkboxStyle">@style/CheckboxStyle</item>
<item name="radioButtonStyle">@style/RadioButtonStyle</item> <item name="radioButtonStyle">@style/RadioButtonStyle</item>
<item name="text_input_background">@color/text_input_background_light</item>
</style> </style>
<style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@ -539,6 +540,7 @@
<item name="btn_radio_button_center">@drawable/radio_button_center_dark</item> <item name="btn_radio_button_center">@drawable/radio_button_center_dark</item>
<item name="checkboxStyle">@style/CheckboxStyle</item> <item name="checkboxStyle">@style/CheckboxStyle</item>
<item name="radioButtonStyle">@style/RadioButtonStyle</item> <item name="radioButtonStyle">@style/RadioButtonStyle</item>
<item name="text_input_background">@color/text_input_background_dark</item>
</style> </style>
<style name="FreeVersionBanner" parent="OsmandDarkTheme"> <style name="FreeVersionBanner" parent="OsmandDarkTheme">

1
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java
View file

@ -70,6 +70,7 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
String fileName = gpxInfos[0].getFileName(); String fileName = gpxInfos[0].getFileName();
messageField.setText(Algorithms.getFileNameWithoutExtension(fileName)); messageField.setText(Algorithms.getFileNameWithoutExtension(fileName));
messageField.setSelection(messageField.getText().length());
final TextView visibilityName = sendOsmPoiView.findViewById(R.id.visibility_name); final TextView visibilityName = sendOsmPoiView.findViewById(R.id.visibility_name);
final TextView visibilityDescription = sendOsmPoiView.findViewById(R.id.visibility_description); final TextView visibilityDescription = sendOsmPoiView.findViewById(R.id.visibility_description);