kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Added update guides btns, reordered sharing options

Browse source
This commit is contained in:
Dmitry Donskoy 2019-01-28 11:30:33 +03:00 • committed by Aleksandr Zatsepin
parent 8e8ab8cbb3
commit 74c673e7c7
8 changed files with 202 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-hdpi/ic_undo.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 720 B

BIN
android/res/drawable-mdpi/ic_undo.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 474 B

BIN
android/res/drawable-xhdpi/ic_undo.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 976 B

BIN
android/res/drawable-xxhdpi/ic_undo.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
android/res/drawable-xxxhdpi/ic_undo.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

217
android/res/layout/fragment_ugc_routes_sharing_options.xml
View file

@ -24,6 +24,118 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/get_direct_link_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:minHeight="@dimen/height_block_base"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/limited_access"
android:paddingStart="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:paddingLeft="@dimen/margin_base"/>
<include layout="@layout/list_divider"/>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/cardBackground">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/get_direct_link_image"
android:layout_width="@dimen/sharing_options_img_size"
android:layout_height="@dimen/sharing_options_img_size"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
app:tint="?accentColorSelector"
app:srcCompat="@drawable/ic_link"
android:layout_marginTop="@dimen/margin_half_double_plus"
android:layout_marginBottom="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginLeft="@dimen/margin_base"/>
<LinearLayout
android:id="@+id/get_direct_link_right_block"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/get_direct_link_image"
android:layout_toEndOf="@id/get_direct_link_image"
android:layout_marginLeft="@dimen/margin_double_plus"
android:layout_marginStart="@dimen/margin_double_plus">
<TextView
android:id="@+id/get_direct_link_text"
android:minHeight="@dimen/height_block_base"
android:text="@string/upload_and_get_direct_link"
android:background="?selectableItemBackground"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoMedium"
android:textStyle="normal"
android:lineSpacingExtra="6sp"
android:textColor="?colorAccent"
android:textAllCaps="true"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
tools:ignore="RtlSymmetry"
tools:targetApi="jelly_bean"/>
<LinearLayout
android:orientation="horizontal"
android:minHeight="@dimen/height_block_base"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:gravity="center_vertical"
android:id="@+id/get_direct_link_completed_status_container"
tools:ignore="RtlSymmetry"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/direct_link_created_text"
android:text="@string/direct_link_success"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoMedium"
android:textColor="?iconTintDisabled"
android:textAllCaps="true"
android:gravity="center_vertical"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"
tools:ignore="RtlSymmetry"
tools:targetApi="jelly_bean"/>
<ImageView
android:id="@+id/share_direct_link_btn"
android:src="@drawable/ic_share"
android:tint="?colorAccent"
android:background="?selectableItemBackgroundBorderless"
android:layout_width="@dimen/rating_view_height_small"
android:layout_height="@dimen/rating_view_height_small"/>
</LinearLayout>
<include layout="@layout/list_divider"/>
<TextView
android:id="@+id/direct_link_description_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/get_direct_link_desc"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:paddingTop="@dimen/margin_half_double_plus"
android:paddingBottom="@dimen/margin_half_double_plus"/>
</LinearLayout>
<include
android:id="@+id/direct_link_update_btn"
android:layout_below="@id/get_direct_link_right_block"
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/update_guide_container"/>
</RelativeLayout>
<include layout="@layout/list_divider"/>
</LinearLayout>
<LinearLayout
android:id="@+id/upload_and_publish_container"
android:orientation="vertical"
@ -132,109 +244,12 @@
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<include layout="@layout/list_divider"/>
<LinearLayout
android:id="@+id/get_direct_link_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:minHeight="@dimen/height_block_base"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/limited_access"
android:paddingStart="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:paddingLeft="@dimen/margin_base"/>
<include layout="@layout/list_divider"/>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/cardBackground">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/get_direct_link_image"
android:layout_width="@dimen/sharing_options_img_size"
android:layout_height="@dimen/sharing_options_img_size"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
app:tint="?accentColorSelector"
app:srcCompat="@drawable/ic_link"
android:layout_marginTop="@dimen/margin_half_double_plus"
android:layout_marginBottom="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginLeft="@dimen/margin_base"/>
<LinearLayout
android:orientation="vertical"
<include
android:id="@+id/upload_and_publish_update_btn"
android:layout_below="@+id/upload_and_publish_desc_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/get_direct_link_image"
android:layout_toEndOf="@id/get_direct_link_image"
android:layout_marginLeft="@dimen/margin_double_plus"
android:layout_marginStart="@dimen/margin_double_plus">
<TextView
android:id="@+id/get_direct_link_text"
android:minHeight="@dimen/height_block_base"
android:text="@string/upload_and_get_direct_link"
android:background="?selectableItemBackground"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoMedium"
android:textStyle="normal"
android:lineSpacingExtra="6sp"
android:textColor="?colorAccent"
android:textAllCaps="true"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
tools:ignore="RtlSymmetry"
tools:targetApi="jelly_bean"/>
<LinearLayout
android:orientation="horizontal"
android:minHeight="@dimen/height_block_base"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:gravity="center_vertical"
android:id="@+id/get_direct_link_completed_status_container"
tools:ignore="RtlSymmetry"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:text="@string/direct_link_success"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoMedium"
android:textColor="?iconTintDisabled"
android:textAllCaps="true"
android:gravity="center_vertical"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"
tools:ignore="RtlSymmetry"
tools:targetApi="jelly_bean"/>
<ImageView
android:id="@+id/share_direct_link_btn"
android:src="@drawable/ic_share"
android:tint="?colorAccent"
android:background="?selectableItemBackgroundBorderless"
android:layout_width="@dimen/rating_view_height_small"
android:layout_height="@dimen/rating_view_height_small"/>
</LinearLayout>
<include layout="@layout/list_divider"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/get_direct_link_desc"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:paddingTop="@dimen/margin_half_double_plus"
android:paddingBottom="@dimen/margin_half_double_plus"/>
</LinearLayout>
layout="@layout/update_guide_container"/>
</RelativeLayout>
<include layout="@layout/list_divider"/>
</LinearLayout>

41
android/res/layout/update_guide_container.xml Normal file
View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground">
<include
layout="@layout/list_divider"
android:id="@+id/top_divider"/>
<ImageView
android:id="@+id/get_direct_link_update_image"
android:layout_width="@dimen/sharing_options_img_size"
android:layout_height="@dimen/sharing_options_img_size"
app:tint="?accentColorSelector"
app:srcCompat="@drawable/ic_undo"
android:layout_below="@id/top_divider"
android:layout_marginTop="@dimen/margin_half_double_plus"
android:layout_marginBottom="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginLeft="@dimen/margin_base"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/upload_and_publish"
android:textAppearance="?android:attr/textAppearance"
android:textColor="?colorAccent"
android:layout_marginStart="@dimen/margin_double_plus"
android:layout_marginLeft="@dimen/margin_double_plus"
android:minHeight="@dimen/height_block_base"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:gravity="center_vertical"
tools:ignore="RtlSymmetry"
android:fontFamily="@string/robotoRegular"
tools:targetApi="jelly_bean"
android:layout_below="@id/top_divider"
android:layout_toEndOf="@id/get_direct_link_update_image"
android:layout_toRightOf="@id/get_direct_link_update_image"/>
</RelativeLayout>

55
android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
View file

@ -96,15 +96,35 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
@SuppressWarnings("NullableProblems")
@NonNull
private View mUploadAndPublishText;
private TextView mUploadAndPublishText;
@SuppressWarnings("NullableProblems")
@NonNull
private View mGetDirectLinkText;
private TextView mGetDirectLinkText;
@Nullable
private BookmarkCategory.AccessRules mCurrentMode;
@SuppressWarnings("NullableProblems")
@NonNull
private View mUpdateGuideDirectLinkBtn;
@SuppressWarnings("NullableProblems")
@NonNull
private View mUpdateGuidePublicAccessBtn;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mDirectLinkCreatedText;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mDirectLinkDescriptionText;
@SuppressWarnings("NullableProblems")
@NonNull
private View mShareDirectLinkBtn;
@Override
public void onCreate(@Nullable Bundle savedInstanceState)
{
@ -139,8 +159,15 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
mGetDirectLinkCompletedStatusContainer = root.findViewById(R.id.get_direct_link_completed_status_container);
mUploadAndPublishText = root.findViewById(R.id.upload_and_publish_text);
mGetDirectLinkText = root.findViewById(R.id.get_direct_link_text);
TextView licenceAgreementText = root.findViewById(R.id.license_agreement_message);
mUpdateGuideDirectLinkBtn = root.findViewById(R.id.direct_link_update_btn);
mUpdateGuidePublicAccessBtn = root.findViewById(R.id.upload_and_publish_update_btn);
mDirectLinkCreatedText = root.findViewById(R.id.direct_link_created_text);
mDirectLinkDescriptionText = root.findViewById(R.id.direct_link_description_text);
mShareDirectLinkBtn = mGetDirectLinkCompletedStatusContainer.findViewById(R.id.share_direct_link_btn);
mUpdateGuideDirectLinkBtn.setSelected(true);
mUpdateGuidePublicAccessBtn.setSelected(true);
TextView licenceAgreementText = root.findViewById(R.id.license_agreement_message);
String src = getResources().getString(R.string.ugc_routes_user_agreement,
Framework.nativeGetPrivacyPolicyLink());
Spanned spanned = Html.fromHtml(src);
@ -151,14 +178,21 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
private void toggleViews()
{
boolean isPublished = mCategory.getAccessRules() == BookmarkCategory.AccessRules.ACCESS_RULES_PUBLIC;
UiUtils.hideIf(isPublished, mUploadAndPublishText, mGetDirectLinkContainer);
UiUtils.showIf(isPublished, mPublishingCompletedStatusContainer);
UiUtils.hideIf(isPublished, mUploadAndPublishText);
UiUtils.showIf(isPublished, mPublishingCompletedStatusContainer, mUpdateGuidePublicAccessBtn);
mPublishCategoryImage.setSelected(!isPublished);
boolean isLinkSuccessFormed = mCategory.getAccessRules() == BookmarkCategory.AccessRules.ACCESS_RULES_DIRECT_LINK;
UiUtils.hideIf(isLinkSuccessFormed, mGetDirectLinkText);
UiUtils.showIf(isLinkSuccessFormed, mGetDirectLinkCompletedStatusContainer);
mGetDirectLinkImage.setSelected(!isLinkSuccessFormed);
UiUtils.hideIf(isLinkSuccessFormed || isPublished, mGetDirectLinkText);
UiUtils.showIf(isLinkSuccessFormed || isPublished, mGetDirectLinkCompletedStatusContainer);
UiUtils.showIf(isLinkSuccessFormed, mUpdateGuideDirectLinkBtn);
mGetDirectLinkImage.setSelected(!isLinkSuccessFormed && !isPublished);
mGetDirectLinkCompletedStatusContainer.setEnabled(!isPublished);
mDirectLinkCreatedText.setText(isPublished ? R.string.upload_and_publish_success : R.string.direct_link_success);
mDirectLinkDescriptionText.setText(isPublished ? R.string.upload_and_publish_success : R.string.get_direct_link_desc);
UiUtils.hideIf(isPublished, mShareDirectLinkBtn);
}
@Nullable
@ -180,10 +214,11 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
{
View getDirectLinkView = root.findViewById(R.id.get_direct_link_text);
getDirectLinkView.setOnClickListener(directLinkListener -> onGetDirectLinkClicked());
mUpdateGuideDirectLinkBtn.setOnClickListener(directLinkListener -> onGetDirectLinkClicked());
View uploadAndPublishView = root.findViewById(R.id.upload_and_publish_text);
uploadAndPublishView.setOnClickListener(uploadListener -> onUploadAndPublishBtnClicked());
View shareDirectLinkBtn = mGetDirectLinkCompletedStatusContainer.findViewById(R.id.share_direct_link_btn);
shareDirectLinkBtn.setOnClickListener(v -> onDirectLinkShared());
mUpdateGuidePublicAccessBtn.setOnClickListener(uploadListener -> onUploadAndPublishBtnClicked());
mShareDirectLinkBtn.setOnClickListener(v -> onDirectLinkShared());
View sharePublishedBtn = mPublishingCompletedStatusContainer.findViewById(R.id.share_published_category_btn);
sharePublishedBtn.setOnClickListener(v -> onPublishedCategoryShared());
View editOnWebBtn = root.findViewById(R.id.edit_on_web_btn);