Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

actions: refactor FeedbackReply model to kotlin (fixes #2742) #2746

Merged
merged 3 commits into from
Nov 29, 2023
Merged

actions: refactor FeedbackReply model to kotlin (fixes #2742) #2746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c6589
conver feedback reply to kotlin
Okuro3499 Nov 29, 2023
bf88e71
Update build.gradle
dogi Nov 29, 2023
20a8a1f
Merge branch 'master' into 2742-migrate-feedback-reply-model-class-to…
dogi Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1163
versionName "0.11.63"
versionCode 1164
versionName "0.11.64"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
35 changes: 0 additions & 35 deletions app/src/main/java/org/ole/planet/myplanet/model/FeedbackReply.java
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/model/FeedbackReply.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package org.ole.planet.myplanet.model

class FeedbackReply(@JvmField var message: String, @JvmField var user: String, @JvmField var date: String)
6 changes: 3 additions & 3 deletions app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackDetailActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ public ReplyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewTyp

@Override
public void onBindViewHolder(@NonNull ReplyViewHolder holder, int position) {
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());
rowFeedbackReplyBinding.tvDate.setText(TimeUtils.getFormatedDateWithTime(Long.parseLong(replyList.get(position).date)));
rowFeedbackReplyBinding.tvUser.setText(replyList.get(position).user);
rowFeedbackReplyBinding.tvMessage.setText(replyList.get(position).message);
}

@Override
Expand Down