Skip to content

Commit

Permalink
feedback: refactor using viewbinding (fixes #2491) (#2497)
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 Sep 21, 2023
1 parent c51584b commit e5e4851
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 134 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 1047
versionName "0.10.47"
versionCode 1048
versionName "0.10.48"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
57 changes: 25 additions & 32 deletions app/src/main/java/org/ole/planet/myplanet/ui/feedback/AdapterFeedback.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,23 @@

import android.content.Context;
import android.content.Intent;
import android.view.LayoutInflater;
import android.view.ViewGroup;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import org.ole.planet.myplanet.R;
import org.ole.planet.myplanet.databinding.RowFeedbackBinding;
import org.ole.planet.myplanet.model.RealmFeedback;
import org.ole.planet.myplanet.utilities.TimeUtils;

import java.util.List;

import io.realm.RealmResults;

public class AdapterFeedback extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
public class AdapterFeedback extends RecyclerView.Adapter<AdapterFeedback.ViewHolderFeedback> {
private RowFeedbackBinding rowFeedbackBinding;
private Context context;
private List<RealmFeedback> list;

Expand All @@ -35,43 +34,37 @@ public void updateData(RealmResults<RealmFeedback> newData) {

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.row_feedback, parent, false);
return new ViewHolderFeedback(v);
public ViewHolderFeedback onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
rowFeedbackBinding = RowFeedbackBinding.inflate(LayoutInflater.from(context), parent, false);
return new ViewHolderFeedback(rowFeedbackBinding);
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof ViewHolderFeedback) {
((ViewHolderFeedback) holder).tvTitle.setText(list.get(position).getTitle());
((ViewHolderFeedback) holder).tvType.setText(list.get(position).getType());
((ViewHolderFeedback) holder).tvPriority.setText(list.get(position).getPriority());
((ViewHolderFeedback) holder).tvStatus.setText(list.get(position).getStatus());
if ("yes".equalsIgnoreCase(list.get(position).getPriority()))
((ViewHolderFeedback) holder).tvPriority.setBackground(context.getResources().getDrawable(R.drawable.bg_primary));
else
((ViewHolderFeedback) holder).tvPriority.setBackground(context.getResources().getDrawable(R.drawable.bg_grey));
((ViewHolderFeedback) holder).tvStatus.setBackground(context.getResources().getDrawable("open".equalsIgnoreCase(list.get(position).getStatus()) ? R.drawable.bg_primary : R.drawable.bg_grey));
((ViewHolderFeedback) holder).tvOpenDate.setText(TimeUtils.getFormatedDate(Long.parseLong(list.get(position).getOpenTime())));
holder.itemView.setOnClickListener(v -> context.startActivity(new Intent(context, FeedbackDetailActivity.class).putExtra("id", list.get(position).getId())));
}
public void onBindViewHolder(@NonNull ViewHolderFeedback holder, int position) {
rowFeedbackBinding.tvTitle.setText(list.get(position).getTitle());
rowFeedbackBinding.tvType.setText(list.get(position).getType());
rowFeedbackBinding.tvPriority.setText(list.get(position).getPriority());
rowFeedbackBinding.tvStatus.setText(list.get(position).getStatus());
if ("yes".equalsIgnoreCase(list.get(position).getPriority()))
rowFeedbackBinding.tvPriority.setBackground(context.getResources().getDrawable(R.drawable.bg_primary));
else
rowFeedbackBinding.tvPriority.setBackground(context.getResources().getDrawable(R.drawable.bg_grey));
rowFeedbackBinding.tvStatus.setBackground(context.getResources().getDrawable("open".equalsIgnoreCase(list.get(position).getStatus()) ? R.drawable.bg_primary : R.drawable.bg_grey));
rowFeedbackBinding.tvOpenDate.setText(TimeUtils.getFormatedDate(Long.parseLong(list.get(position).getOpenTime())));
rowFeedbackBinding.getRoot().setOnClickListener(v -> context.startActivity(new Intent(context, FeedbackDetailActivity.class).putExtra("id", list.get(position).getId())));
}

@Override
public int getItemCount() {
return list.size();
}

class ViewHolderFeedback extends RecyclerView.ViewHolder {
TextView tvTitle, tvType, tvPriority, tvStatus, tvOpenDate;
public static class ViewHolderFeedback extends RecyclerView.ViewHolder {
RowFeedbackBinding rowFeedbackBinding;

public ViewHolderFeedback(View itemView) {
super(itemView);
tvPriority = itemView.findViewById(R.id.tv_priority);
tvStatus = itemView.findViewById(R.id.tv_status);
tvType = itemView.findViewById(R.id.tv_type);
tvTitle = itemView.findViewById(R.id.tv_title);
tvOpenDate = itemView.findViewById(R.id.tv_open_date);
public ViewHolderFeedback(RowFeedbackBinding rowFeedbackBinding) {
super(rowFeedbackBinding.getRoot());
this.rowFeedbackBinding = rowFeedbackBinding;
}
}
}
101 changes: 45 additions & 56 deletions app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
package org.ole.planet.myplanet.ui.feedback;

import android.content.Context;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
Expand All @@ -16,15 +9,19 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

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.ActivityFeedbackDetailBinding;
import org.ole.planet.myplanet.databinding.RowFeedbackReplyBinding;
import org.ole.planet.myplanet.datamanager.DatabaseService;
import org.ole.planet.myplanet.model.FeedbackReply;
import org.ole.planet.myplanet.model.RealmFeedback;
Expand All @@ -37,44 +34,36 @@
import io.realm.Realm;

public class FeedbackDetailActivity extends AppCompatActivity {

private RecyclerView rv_feedback_reply;
private ActivityFeedbackDetailBinding activityFeedbackDetailBinding;
private RecyclerView.Adapter mAdapter;
private RecyclerView.LayoutManager layoutManager;
Button closeButton, replyButton;
EditText editText;
RealmFeedback feedback;
Realm realm;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_feedback_detail);
activityFeedbackDetailBinding = ActivityFeedbackDetailBinding.inflate(getLayoutInflater());
setContentView(activityFeedbackDetailBinding.getRoot());
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(R.string.feedback);
realm = new DatabaseService(this).getRealmInstance();
feedback = realm.where(RealmFeedback.class).equalTo("id", getIntent().getStringExtra("id")).findFirst();
TextView tvMessage = findViewById(R.id.tv_message);
TextView tvDate = findViewById(R.id.tv_date);
if (!TextUtils.isEmpty(feedback.getOpenTime()))
tvDate.setText(TimeUtils.getFormatedDateWithTime(Long.parseLong(feedback.getOpenTime())));
else tvDate.setText(R.string.date_n_a);
tvMessage.setText(TextUtils.isEmpty(feedback.getMessage()) ? "N/A" : feedback.getMessage());
closeButton = findViewById(R.id.close_feedback);
replyButton = findViewById(R.id.reply_feedback);
editText = findViewById(R.id.feedback_reply_edit_text);
activityFeedbackDetailBinding.tvDate.setText(TimeUtils.getFormatedDateWithTime(Long.parseLong(feedback.getOpenTime())));
else activityFeedbackDetailBinding.tvDate.setText(R.string.date_n_a);
activityFeedbackDetailBinding.tvMessage.setText(TextUtils.isEmpty(feedback.getMessage()) ? "N/A" : feedback.getMessage());
setUpReplies();
}

public void setUpReplies() {
rv_feedback_reply = (RecyclerView) findViewById(R.id.rv_feedback_reply);
rv_feedback_reply.setHasFixedSize(true);
activityFeedbackDetailBinding.rvFeedbackReply.setHasFixedSize(true);
layoutManager = new LinearLayoutManager(this);
rv_feedback_reply.setLayoutManager(layoutManager);
activityFeedbackDetailBinding.rvFeedbackReply.setLayoutManager(layoutManager);
mAdapter = new RvFeedbackAdapter(feedback.getMessageList(), getApplicationContext());
rv_feedback_reply.setAdapter(mAdapter);
closeButton.setOnClickListener(view -> {
activityFeedbackDetailBinding.rvFeedbackReply.setAdapter(mAdapter);
activityFeedbackDetailBinding.closeFeedback.setOnClickListener(view -> {
realm.executeTransactionAsync(realm1 -> {
RealmFeedback feedback1 = realm1.where(RealmFeedback.class).equalTo("id", getIntent().getStringExtra("id")).findFirst();
feedback1.setStatus("Closed");
Expand All @@ -83,30 +72,30 @@ public void setUpReplies() {
});
});

replyButton.setOnClickListener(r -> {
if (TextUtils.isEmpty(editText.getText().toString().trim())) {
editText.setError("Kindly enter reply message");
activityFeedbackDetailBinding.replyFeedback.setOnClickListener(r -> {
if (TextUtils.isEmpty(activityFeedbackDetailBinding.feedbackReplyEditText.getText().toString().trim())) {
activityFeedbackDetailBinding.feedbackReplyEditText.setError("Kindly enter reply message");
} else {
String message = editText.getText().toString().trim();
String message = activityFeedbackDetailBinding.feedbackReplyEditText.getText().toString().trim();
JsonObject object = new JsonObject();
object.addProperty("message", message);
object.addProperty("time", new Date().getTime() + "");
object.addProperty("user", feedback.getOwner() + "");
String id = feedback.getId();
addReply(object, id);
mAdapter = new RvFeedbackAdapter(feedback.getMessageList(), getApplicationContext());
rv_feedback_reply.setAdapter(mAdapter);
editText.setText("");
editText.clearFocus();
activityFeedbackDetailBinding.rvFeedbackReply.setAdapter(mAdapter);
activityFeedbackDetailBinding.feedbackReplyEditText.setText("");
activityFeedbackDetailBinding.feedbackReplyEditText.clearFocus();
}
});
}

public void updateForClosed() {
if (feedback.getStatus().equalsIgnoreCase("Closed")) {
closeButton.setEnabled(false);
replyButton.setEnabled(false);
editText.setVisibility(View.INVISIBLE);
activityFeedbackDetailBinding.closeFeedback.setEnabled(false);
activityFeedbackDetailBinding.replyFeedback.setEnabled(false);
activityFeedbackDetailBinding.feedbackReplyEditText.setVisibility(View.INVISIBLE);
navigateToFeedbackListFragment();
}
}
Expand All @@ -131,7 +120,7 @@ public void addReply(JsonObject obj, String id) {
}, () -> {
updateForClosed();
mAdapter = new RvFeedbackAdapter(feedback.getMessageList(), getApplicationContext());
rv_feedback_reply.setAdapter(mAdapter);
activityFeedbackDetailBinding.rvFeedbackReply.setAdapter(mAdapter);
});
}

Expand All @@ -142,42 +131,42 @@ public boolean onOptionsItemSelected(MenuItem item) {
}

public class RvFeedbackAdapter extends RecyclerView.Adapter<RvFeedbackAdapter.ReplyViewHolder> {
private RowFeedbackReplyBinding rowFeedbackReplyBinding;
private List<FeedbackReply> replyList;
Context context;

public class ReplyViewHolder extends RecyclerView.ViewHolder {
public TextView tv_message, tv_date, tv_user;

public ReplyViewHolder(View v) {
super(v);
tv_message = v.findViewById(R.id.tv_message);
tv_user = v.findViewById(R.id.tv_user);
tv_date = v.findViewById(R.id.tv_date);
}
}

public RvFeedbackAdapter(List<FeedbackReply> replyList, Context context) {
this.replyList = replyList;
this.context = context;
}

@NonNull
@Override
public RvFeedbackAdapter.ReplyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.row_feedback_reply, parent, false);
return new RvFeedbackAdapter.ReplyViewHolder(v);
public ReplyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
rowFeedbackReplyBinding = RowFeedbackReplyBinding.inflate(LayoutInflater.from(context), parent, false);
return new ReplyViewHolder(rowFeedbackReplyBinding);
}

@Override
public void onBindViewHolder(@NonNull ReplyViewHolder holder, int position) {
holder.tv_date.setText(TimeUtils.getFormatedDateWithTime(Long.parseLong(replyList.get(position).getDate())));
holder.tv_user.setText(replyList.get(position).getUser());
holder.tv_message.setText(replyList.get(position).getMessage());
rowFeedbackReplyBinding.tvDate.setText(TimeUtils.getFormatedDateWithTime(Long.parseLong(replyList.get(position).getDate())));
rowFeedbackReplyBinding.tvUser.setText(replyList.get(position).getUser());
rowFeedbackReplyBinding.tvMessage.setText(replyList.get(position).getMessage());
}

@Override
public int getItemCount() {
return replyList.size();
}

public class ReplyViewHolder extends RecyclerView.ViewHolder {
RowFeedbackReplyBinding rowFeedbackReplyBinding;

public ReplyViewHolder(RowFeedbackReplyBinding rowFeedbackReplyBinding) {
super(rowFeedbackReplyBinding.getRoot());
this.rowFeedbackReplyBinding = rowFeedbackReplyBinding;
}
}
}
}

Loading

0 comments on commit e5e4851

Please sign in to comment.