Skip to content

Commit

Permalink
news: implement viewbinding (fixes #2535) (#2598)
Browse files Browse the repository at this point in the history 
Co-authored-by: dogi <[email protected]>
  • Loading branch information
@Okuro3499 @dogi
Okuro3499 and dogi authored Oct 13, 2023
1 parent 6e7f4f2 commit b7304db
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 141 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1094
versionName "0.10.94"
versionCode 1095
versionName "0.10.95"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
123 changes: 59 additions & 64 deletions app/src/main/java/org/ole/planet/myplanet/ui/news/AdapterNews.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,22 @@
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupMenu;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.Glide;
import com.google.android.flexbox.FlexboxLayout;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;

import org.ole.planet.myplanet.R;
import org.ole.planet.myplanet.databinding.RowNewsBinding;
import org.ole.planet.myplanet.model.RealmMyLibrary;
import org.ole.planet.myplanet.model.RealmNews;
import org.ole.planet.myplanet.model.RealmUserModel;
Expand All @@ -34,7 +31,6 @@
import org.ole.planet.myplanet.utilities.Utilities;

import java.io.File;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
Expand All @@ -47,6 +43,7 @@
import io.realm.Sort;

public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private RowNewsBinding rowNewsBinding;
private List<RealmNews> list;
private OnNewsItemClickListener listener;
private RealmNews parentNews;
Expand Down Expand Up @@ -91,33 +88,35 @@ public void setmRealm(Realm mRealm) {
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.row_news, parent, false);
return new ViewHolderNews(v);
rowNewsBinding = RowNewsBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
return new ViewHolderNews(rowNewsBinding);
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof ViewHolderNews) {
ViewHolderNews viewHolder = (ViewHolderNews) holder;
viewHolder.bind(position);
RealmNews news = getNews(holder, position);
if (news.isValid()) {
RealmUserModel userModel = mRealm.where(RealmUserModel.class).equalTo("id", news.getUserId()).findFirst();
if (userModel != null && currentUser != null) {
((ViewHolderNews) holder).tvName.setText(userModel.toString());
Utilities.loadImage(userModel.getUserImage(), ((ViewHolderNews) holder).imgUser);
viewHolder.rowNewsBinding.tvName.setText(userModel.toString());
Utilities.loadImage(userModel.getUserImage(), viewHolder.rowNewsBinding.imgUser);
showHideButtons(userModel, holder);
} else {
((ViewHolderNews) holder).tvName.setText(news.getUserName());
((ViewHolderNews) holder).llEditDelete.setVisibility(View.GONE);
viewHolder.rowNewsBinding.tvName.setText(news.getUserName());
viewHolder.rowNewsBinding.llEditDelete.setVisibility(View.GONE);
}

showShareButton(holder, news);
((ViewHolderNews) holder).tvMessage.setText(news.getMessageWithoutMarkdown());
((ViewHolderNews) holder).tvDate.setText(TimeUtils.formatDate(news.getTime()));
((ViewHolderNews) holder).imgDelete.setOnClickListener(view -> new AlertDialog.Builder(context).setMessage(R.string.delete_record).setPositiveButton(R.string.ok, (dialogInterface, i) -> deletePost(news)).setNegativeButton(R.string.cancel, null).show());
((ViewHolderNews) holder).imgEdit.setOnClickListener(view -> showEditAlert(news.getId(), true));
((ViewHolderNews) holder).llEditDelete.setVisibility(fromLogin ? View.GONE : View.VISIBLE);
((ViewHolderNews) holder).btnAddLabel.setVisibility(fromLogin ? View.GONE : View.VISIBLE);
((ViewHolderNews) holder).btnReply.setVisibility(fromLogin ? View.GONE : View.VISIBLE);
viewHolder.rowNewsBinding.tvMessage.setText(news.getMessageWithoutMarkdown());
viewHolder.rowNewsBinding.tvDate.setText(TimeUtils.formatDate(news.getTime()));
viewHolder.rowNewsBinding.imgDelete.setOnClickListener(view -> new AlertDialog.Builder(context).setMessage(R.string.delete_record).setPositiveButton(R.string.ok, (dialogInterface, i) -> deletePost(news)).setNegativeButton(R.string.cancel, null).show());
viewHolder.rowNewsBinding.imgEdit.setOnClickListener(view -> showEditAlert(news.getId(), true));
viewHolder.rowNewsBinding.llEditDelete.setVisibility(fromLogin ? View.GONE : View.VISIBLE);
viewHolder.rowNewsBinding.btnAddLabel.setVisibility(fromLogin ? View.GONE : View.VISIBLE);
viewHolder.rowNewsBinding.btnReply.setVisibility(fromLogin ? View.GONE : View.VISIBLE);
loadImage(holder, news);
showReplyButton(holder, news, position);
if(news.isCommunityNews()) {
Expand All @@ -130,8 +129,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
}

private void addLabels(RecyclerView.ViewHolder holder, RealmNews news) {
((ViewHolderNews) holder).btnAddLabel.setOnClickListener(view -> {
PopupMenu menu = new PopupMenu(context, ((ViewHolderNews) holder).btnAddLabel);
ViewHolderNews viewHolder = (ViewHolderNews) holder;
viewHolder.rowNewsBinding.btnAddLabel.setOnClickListener(view -> {
PopupMenu menu = new PopupMenu(context, viewHolder.rowNewsBinding.btnAddLabel);
MenuInflater inflater = menu.getMenuInflater();
inflater.inflate(R.menu.menu_add_label, menu.getMenu());
menu.setOnMenuItemClickListener(menuItem -> {
Expand All @@ -147,27 +147,29 @@ private void addLabels(RecyclerView.ViewHolder holder, RealmNews news) {
}

private void showChips(RecyclerView.ViewHolder holder, RealmNews news) {
((ViewHolderNews) holder).fbChips.removeAllViews();
final ChipCloud chipCloud = new ChipCloud(context, ((ViewHolderNews) holder).fbChips, config);
ViewHolderNews viewHolder = (ViewHolderNews) holder;
viewHolder.rowNewsBinding.fbChips.removeAllViews();
final ChipCloud chipCloud = new ChipCloud(context, viewHolder.rowNewsBinding.fbChips, config);

for (String s : news.getLabels()) {
chipCloud.addChip(getLabel(s));
chipCloud.setDeleteListener((i, s1) -> {
if (!mRealm.isInTransaction()) mRealm.beginTransaction();
news.getLabels().remove(Constants.LABELS.get(s1));
mRealm.commitTransaction();
((ViewHolderNews) holder).btnAddLabel.setEnabled(news.getLabels().size() < 3);
viewHolder.rowNewsBinding.btnAddLabel.setEnabled(news.getLabels().size() < 3);
});
}
((ViewHolderNews) holder).btnAddLabel.setEnabled(news.getLabels().size() < 3);
viewHolder.rowNewsBinding.btnAddLabel.setEnabled(news.getLabels().size() < 3);
}

private void loadImage(RecyclerView.ViewHolder holder, RealmNews news) {
ViewHolderNews viewHolder = (ViewHolderNews) holder;
if (news.getImageUrls() != null && news.getImageUrls().size() > 0) {
try {
JsonObject imgObject = new Gson().fromJson(news.getImageUrls().get(0), JsonObject.class);
((ViewHolderNews) holder).newsImage.setVisibility(View.VISIBLE);
Glide.with(context).load(new File(JsonUtils.getString("imageUrl", imgObject))).into(((ViewHolderNews) holder).newsImage);
viewHolder.rowNewsBinding.imgNews.setVisibility(View.VISIBLE);
Glide.with(context).load(new File(JsonUtils.getString("imageUrl", imgObject))).into(viewHolder.rowNewsBinding.imgNews);
} catch (Exception e) {
e.printStackTrace();
}
Expand All @@ -177,6 +179,7 @@ private void loadImage(RecyclerView.ViewHolder holder, RealmNews news) {
}

private void loadRemoteImage(RecyclerView.ViewHolder holder, RealmNews news) {
ViewHolderNews viewHolder = (ViewHolderNews) holder;
Utilities.log(news.getImages());
if (news.getImagesArray().size() > 0) {
JsonObject ob = news.getImagesArray().get(0).getAsJsonObject();
Expand All @@ -187,26 +190,27 @@ private void loadRemoteImage(RecyclerView.ViewHolder holder, RealmNews news) {
File imageFile = new File(basePath, "ole/" + library.getId() + "/" + library.getResourceLocalAddress());

if (imageFile.exists()) {
Glide.with(context).load(imageFile).into(((ViewHolderNews) holder).newsImage);
((ViewHolderNews) holder).newsImage.setVisibility(View.VISIBLE);
Glide.with(context).load(imageFile).into(viewHolder.rowNewsBinding.imgNews);
viewHolder.rowNewsBinding.imgNews.setVisibility(View.VISIBLE);
return;
}
}
}
((ViewHolderNews) holder).newsImage.setVisibility(View.GONE);
viewHolder.rowNewsBinding.imgNews.setVisibility(View.GONE);
}

private void showReplyButton(RecyclerView.ViewHolder holder, RealmNews finalNews, int position) {
ViewHolderNews viewHolder = (ViewHolderNews) holder;
if (this.listener == null || this.fromLogin)
((ViewHolderNews) holder).btnShowReply.setVisibility(View.GONE);
((ViewHolderNews) holder).btnReply.setOnClickListener(view -> showEditAlert(finalNews.getId(), false));
viewHolder.rowNewsBinding.btnShowReply.setVisibility(View.GONE);
viewHolder.rowNewsBinding.btnReply.setOnClickListener(view -> showEditAlert(finalNews.getId(), false));
List<RealmNews> replies = mRealm.where(RealmNews.class).sort("time", Sort.DESCENDING).equalTo("replyTo", finalNews.getId(), Case.INSENSITIVE).findAll();
((ViewHolderNews) holder).btnShowReply.setText(String.format(context.getString(R.string.show_replies) + " (%d)", replies.size()));
((ViewHolderNews) holder).btnShowReply.setVisibility(replies.size() > 0 ? View.VISIBLE : View.GONE);
viewHolder.rowNewsBinding.btnShowReply.setText(String.format(context.getString(R.string.show_replies) + " (%d)", replies.size()));
viewHolder.rowNewsBinding.btnShowReply.setVisibility(replies.size() > 0 ? View.VISIBLE : View.GONE);
if (position == 0 && parentNews != null)
((ViewHolderNews) holder).btnShowReply.setVisibility(View.GONE);
viewHolder.rowNewsBinding.btnShowReply.setVisibility(View.GONE);

((ViewHolderNews) holder).btnShowReply.setOnClickListener(view -> {
viewHolder.rowNewsBinding.btnShowReply.setOnClickListener(view -> {
if (listener != null) {
listener.showReply(finalNews, fromLogin);
}
Expand Down Expand Up @@ -272,12 +276,13 @@ private RealmNews getNews(RecyclerView.ViewHolder holder, int position) {
}

private void showHideButtons(RealmUserModel userModel, RecyclerView.ViewHolder holder) {
ViewHolderNews viewHolder = (ViewHolderNews) holder;
if (currentUser.getId().equals(userModel.getId())) {
((ViewHolderNews) holder).llEditDelete.setVisibility(View.VISIBLE);
((ViewHolderNews) holder).btnAddLabel.setVisibility(View.VISIBLE);
viewHolder.rowNewsBinding.llEditDelete.setVisibility(View.VISIBLE);
viewHolder.rowNewsBinding.btnAddLabel.setVisibility(View.VISIBLE);
} else {
((ViewHolderNews) holder).llEditDelete.setVisibility(View.GONE);
((ViewHolderNews) holder).btnAddLabel.setVisibility(View.GONE);
viewHolder.rowNewsBinding.llEditDelete.setVisibility(View.GONE);
viewHolder.rowNewsBinding.btnAddLabel.setVisibility(View.GONE);
}
}

Expand Down Expand Up @@ -316,8 +321,9 @@ public String getLabel(String s) {
}

public void showShareButton(RecyclerView.ViewHolder holder, RealmNews news) {
((ViewHolderNews) holder).btnShare.setVisibility((news.isCommunityNews() || fromLogin) ? View.GONE : View.VISIBLE);
((ViewHolderNews) holder).btnShare.setOnClickListener(view -> {
ViewHolderNews viewHolder = (ViewHolderNews) holder;
viewHolder.rowNewsBinding.btnShare.setVisibility((news.isCommunityNews() || fromLogin) ? View.GONE : View.VISIBLE);
viewHolder.rowNewsBinding.btnShare.setOnClickListener(view -> {
JsonArray array = new Gson().fromJson(news.getViewIn(), JsonArray.class);
JsonObject ob = new JsonObject();
ob.addProperty("section", "community");
Expand All @@ -328,32 +334,21 @@ public void showShareButton(RecyclerView.ViewHolder holder, RealmNews news) {
news.setViewIn(new Gson().toJson(array));
mRealm.commitTransaction();
Utilities.toast(context, context.getString(R.string.shared_to_community));
((ViewHolderNews) holder).btnShare.setVisibility(View.GONE);
viewHolder.rowNewsBinding.btnShare.setVisibility(View.GONE);
});
}

public class ViewHolderNews extends RecyclerView.ViewHolder {
public TextView tvName, tvDate, tvMessage;
public ImageView imgEdit, imgDelete, imgUser, newsImage;
public LinearLayout llEditDelete;
public FlexboxLayout fbChips;
public Button btnReply, btnShowReply, btnAddLabel, btnShare;

public ViewHolderNews(View itemView) {
super(itemView);
tvDate = itemView.findViewById(R.id.tv_date);
tvName = itemView.findViewById(R.id.tv_name);
tvMessage = itemView.findViewById(R.id.tv_message);
imgDelete = itemView.findViewById(R.id.img_delete);
imgEdit = itemView.findViewById(R.id.img_edit);
imgUser = itemView.findViewById(R.id.img_user);
llEditDelete = itemView.findViewById(R.id.ll_edit_delete);
btnReply = itemView.findViewById(R.id.btn_reply);
btnShowReply = itemView.findViewById(R.id.btn_show_reply);
btnAddLabel = itemView.findViewById(R.id.btn_add_label);
btnShare = itemView.findViewById(R.id.btn_share);
newsImage = itemView.findViewById(R.id.img_news);
fbChips = itemView.findViewById(R.id.fb_chips);
class ViewHolderNews extends RecyclerView.ViewHolder {
private final RowNewsBinding rowNewsBinding;
private int adapterPosition;

public ViewHolderNews(RowNewsBinding rowNewsBinding) {
super(rowNewsBinding.getRoot());
this.rowNewsBinding = rowNewsBinding;
}

public void bind(int position) {
adapterPosition = position;
}
}
}
24 changes: 12 additions & 12 deletions app/src/main/java/org/ole/planet/myplanet/ui/news/NewsDetailActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ import com.bumptech.glide.Glide
import com.google.gson.Gson
import com.google.gson.JsonObject
import io.realm.Realm
import kotlinx.android.synthetic.main.activity_news_detail.img
import kotlinx.android.synthetic.main.activity_news_detail.toolbar
import kotlinx.android.synthetic.main.content_news_detail.tv_detail
import org.ole.planet.myplanet.R
import org.ole.planet.myplanet.base.BaseActivity
import org.ole.planet.myplanet.databinding.ActivityNewsDetailBinding
import org.ole.planet.myplanet.datamanager.DatabaseService
import org.ole.planet.myplanet.model.RealmMyLibrary
import org.ole.planet.myplanet.model.RealmNews
Expand All @@ -25,12 +23,14 @@ import java.util.Date
import java.util.UUID

class NewsDetailActivity : BaseActivity() {
lateinit var activityNewsDetailBinding: ActivityNewsDetailBinding
var news: RealmNews? = null
lateinit var realm: Realm
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_news_detail)
setSupportActionBar(toolbar)
activityNewsDetailBinding = ActivityNewsDetailBinding.inflate(layoutInflater)
setContentView(activityNewsDetailBinding.root)
setSupportActionBar(activityNewsDetailBinding.toolbar)
initActionBar()
realm = DatabaseService(this).realmInstance
var id = intent.getStringExtra("newsId")
Expand Down Expand Up @@ -78,8 +78,8 @@ class NewsDetailActivity : BaseActivity() {
"\n",
"<div/><br/><div style=\" word-wrap: break-word;page-break-after: always; word-spacing: 2px;\" >"
)
tv_detail.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN;
tv_detail.loadDataWithBaseURL(
activityNewsDetailBinding.tvDetail.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN;
activityNewsDetailBinding.tvDetail.loadDataWithBaseURL(
null,
"<html><body><div style=\" word-wrap: break-word; word-spacing: 2px;\" >$msg</div></body></html>",
"text/html",
Expand All @@ -92,9 +92,9 @@ class NewsDetailActivity : BaseActivity() {
var msg: String = news!!.message
try {
val imgObject = Gson().fromJson(news!!.imageUrls[0], JsonObject::class.java)
img.visibility = View.VISIBLE
activityNewsDetailBinding.img.visibility = View.VISIBLE
Glide.with(this@NewsDetailActivity)
.load(File(JsonUtils.getString("imageUrl", imgObject))).into(img)
.load(File(JsonUtils.getString("imageUrl", imgObject))).into(activityNewsDetailBinding.img)
news!!.imageUrls.forEach {
val imageObject = Gson().fromJson(it, JsonObject::class.java)
msg += "<br/><img width=\"50%\" src=\"file://" + JsonUtils.getString(
Expand All @@ -116,11 +116,11 @@ class NewsDetailActivity : BaseActivity() {
if (library != null) {
Glide.with(this)
.load(File(Utilities.SD_PATH, library.id + "/" + library.resourceLocalAddress))
.into(img)
img.visibility = View.VISIBLE
.into(activityNewsDetailBinding.img)
activityNewsDetailBinding.img.visibility = View.VISIBLE
return
}
}
img.visibility = View.GONE
activityNewsDetailBinding.img.visibility = View.GONE
}
}
Loading

0 comments on commit b7304db

Please sign in to comment.