pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Modified tags screen desc

Browse source
This commit is contained in:
Dmitry Donskoy 2019-02-19 16:33:38 +03:00 • committed by Aleksandr Zatsepin
parent c3b9620254
commit d5e5123ab7
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/res/layout/fragment_ugc_routes.xml
View file

@ -5,21 +5,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:text="@string/ugc_route_tags_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingTop="@dimen/margin_base"
android:paddingBottom="@dimen/margin_base"
android:paddingRight="@dimen/margin_half_double_plus"
android:paddingEnd="@dimen/margin_half_double_plus"
android:paddingLeft="@dimen/margin_half_double_plus"
android:paddingStart="@dimen/margin_half_double_plus"/>
<View
android:background="?android:attr/listDivider"
android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"/>
<LinearLayout
android:id="@+id/progress_container"
android:orientation="vertical"
@ -49,6 +34,16 @@
android:paddingRight="@dimen/margin_base"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/ugc_route_tags_desc"
android:text="@string/ugc_route_tags_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:background="?android:attr/listDivider"
android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler"
android:overScrollMode="never"

9
android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java
View file

@ -16,6 +16,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.adapter.AdapterPositionConverter;
@ -38,6 +39,7 @@ import com.mapswithme.util.UiUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkManager.BookmarksCatalogListener,
@ -66,6 +68,10 @@ public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkMan
@Nullable
private TagsCompositeAdapter mTagsAdapter;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mDescriptionView;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@ -75,6 +81,7 @@ public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkMan
setHasOptionsMenu(true);
mProgress = root.findViewById(R.id.progress_container);
mTagsContainer = root.findViewById(R.id.tags_container);
mDescriptionView = root.findViewById(R.id.ugc_route_tags_desc);
initRecycler(root);
UiUtils.hide(mTagsContainer);
UiUtils.show(mProgress);
@ -224,6 +231,8 @@ public class UgcRouteTagsFragment extends BaseMwmFragment implements BookmarkMan
false);
mRecycler.setLayoutManager(layoutManager);
mRecycler.setAdapter(compositeAdapter);
String description = getString(R.string.ugc_route_tags_desc, String.valueOf(tagsLimit), Locale.US);
mDescriptionView.setText(description);
ActivityCompat.invalidateOptionsMenu(getActivity());
}