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

Add the ability to open full description

Browse source
This commit is contained in:
Alex Sytnyk 2018-06-11 13:01:35 +03:00
parent 73a8b1f005
commit 91cd5f4b42
2 changed files with 75 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
OsmAnd/src/net/osmand/plus/myplaces/GpxDescriptionDialogFragment.java Normal file
View file

@ -0,0 +1,66 @@
package net.osmand.plus.myplaces;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebView;
import android.widget.LinearLayout;
import net.osmand.AndroidUtils;
import net.osmand.plus.R;
import net.osmand.plus.base.BaseOsmAndDialogFragment;
public class GpxDescriptionDialogFragment extends BaseOsmAndDialogFragment {
public static final String TAG = GpxDescriptionDialogFragment.class.getSimpleName();
public static final String CONTENT_KEY = "content_key";
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
Context ctx = getContext();
final Toolbar topBar = new Toolbar(ctx);
topBar.setClickable(true);
Drawable back = getMyApplication().getUIUtilities().getIcon(R.drawable.ic_arrow_back);
topBar.setNavigationIcon(back);
topBar.setNavigationContentDescription(R.string.access_shared_string_navigate_up);
topBar.setTitle(R.string.description);
topBar.setBackgroundColor(ContextCompat.getColor(ctx, AndroidUtils.resolveAttribute(ctx, R.attr.pstsTabBackground)));
topBar.setTitleTextColor(ContextCompat.getColor(ctx, AndroidUtils.resolveAttribute(ctx, R.attr.pstsTextColor)));
topBar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View v) {
dismiss();
}
});
AppBarLayout appBar = new AppBarLayout(ctx);
appBar.addView(topBar);
WebView webView = new WebView(ctx);
webView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
Bundle args = getArguments();
if (args != null) {
String content = args.getString(CONTENT_KEY);
if (content != null) {
webView.loadData(content, "text/html", "UTF-8");
}
}
LinearLayout mainLl = new LinearLayout(ctx);
mainLl.setOrientation(LinearLayout.VERTICAL);
mainLl.addView(appBar);
mainLl.addView(webView);
return mainLl;
}
}

12
OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
View file

@ -27,7 +27,6 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.squareup.picasso.Callback;
import com.squareup.picasso.Picasso;
@ -524,7 +523,7 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
return card;
}
private View createDescriptionCard(final Context context, @NonNull String descHtml) {
private View createDescriptionCard(final Context context, @NonNull final String descHtml) {
String desc = Html.fromHtml(descHtml).toString().trim();
if (!TextUtils.isEmpty(desc)) {
View card = LayoutInflater.from(context).inflate(R.layout.gpx_description_card, null);
@ -534,7 +533,14 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
readBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(context, "Read", Toast.LENGTH_SHORT).show(); // FIXME
TrackActivity activity = getTrackActivity();
if (activity != null) {
Bundle args = new Bundle();
args.putString(GpxDescriptionDialogFragment.CONTENT_KEY, descHtml);
GpxDescriptionDialogFragment fragment = new GpxDescriptionDialogFragment();
fragment.setArguments(args);
fragment.show(activity.getSupportFragmentManager(), GpxDescriptionDialogFragment.TAG);
}
}
});
return card;