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

[android] Implemented passing ratings to editor

Browse source
This commit is contained in:
Александр Зацепин 2017-06-21 17:06:01 +03:00 • committed by Yuri Gorshenin
parent 00d2363b63
commit 7a57513d08
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/src/com/mapswithme/maps/ugc/UGC.java
View file

@ -76,7 +76,7 @@ public class UGC implements Serializable
{
@NonNull
private final String mName;
private final float mValue;
private float mValue;
private Rating(@NonNull String name, float value)
{
@ -94,6 +94,11 @@ public class UGC implements Serializable
{
return mName;
}
public void setValue(float value)
{
mValue = value;
}
}
public static class Review implements Serializable

4
android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java
View file

@ -16,14 +16,16 @@ public class UGCEditorActivity extends BaseToolbarActivity
private static final String EXTRA_FEATURE_INDEX = "extra_feature_index";
static final String EXTRA_UGC = "extra_ugc";
static final String EXTRA_TITLE = "extra_title";
static final String EXTRA_AVG_RATING = "extra_avg_rating";
public static void start(@NonNull Activity activity, @NonNull String title,
int featureIndex, @NonNull UGC ugc)
int featureIndex, @NonNull UGC ugc, @UGC.UGCRating int rating)
{
final Intent i = new Intent(activity, UGCEditorActivity.class);
i.putExtra(EXTRA_FEATURE_INDEX, featureIndex);
i.putExtra(EXTRA_UGC, ugc);
i.putExtra(EXTRA_TITLE, title);
i.putExtra(EXTRA_AVG_RATING, rating);
activity.startActivity(i);
}

19
android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java
View file

@ -12,6 +12,8 @@ import android.view.ViewGroup;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import java.util.ArrayList;
import java.util.List;
public class UGCEditorFragment extends BaseMwmFragment
{
@ -32,7 +34,22 @@ public class UGCEditorFragment extends BaseMwmFragment
//TODO: use parcelable instead of seriliazable
UGC ugc = (UGC) getActivity().getIntent().getSerializableExtra(UGCEditorActivity.EXTRA_UGC);
mUGCRatingAdapter.setItems(ugc.getRatings());
List<UGC.Rating> avgRatings = new ArrayList<>(ugc.getRatings());
for (UGC.Rating rating: avgRatings)
rating.setValue(getActivity().getIntent().getIntExtra(UGCEditorActivity.EXTRA_AVG_RATING, 3));
mUGCRatingAdapter.setItems(avgRatings);
View submit = root.findViewById(R.id.submit);
submit.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
getActivity().finish();
}
});
return root;
}
}

2
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -278,7 +278,7 @@ public class PlacePageView extends RelativeLayout
return;
UGCEditorActivity.start(getActivity(), mMapObject.getTitle(), mMapObject.getFeatureIndex(),
mUgc);
mUgc, rating);
}
@Override