Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

Release 1.5.0

This commit is contained in:
Thomas 2020-10-16 18:03:41 +02:00
parent 967f11ddb4
commit 017bd5a6a2
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -11,7 +11,7 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 18 versionCode 19
versionName "1.5.0" versionName "1.5.0"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

9
app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsListAdapter.java
View File

@ -48,10 +48,10 @@ import es.dmoral.toasty.Toasty;
public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
public AllAccountsRemoved allAccountsRemoved; public AllAccountsRemoved allAccountsRemoved;
private List<Account> accounts; private final List<Account> accounts;
private Context context; private Context context;
private AccountsListAdapter accountsListAdapter; private final AccountsListAdapter accountsListAdapter;
private RetrofitPeertubeAPI.DataType type; private final RetrofitPeertubeAPI.DataType type;
public AccountsListAdapter(RetrofitPeertubeAPI.DataType type, List<Account> accounts) { public AccountsListAdapter(RetrofitPeertubeAPI.DataType type, List<Account> accounts) {
this.accounts = accounts; this.accounts = accounts;
@ -96,7 +96,8 @@ public class AccountsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
holder.account_pp.setOnClickListener(v -> { holder.account_pp.setOnClickListener(v -> {
Intent intent = new Intent(context, ShowAccountActivity.class); Intent intent = new Intent(context, ShowAccountActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putParcelable("channel", account); b.putParcelable("account", account);
b.putString("accountAcct", account.getAcct());
intent.putExtras(b); intent.putExtras(b);
context.startActivity(intent); context.startActivity(intent);
}); });

12
app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
View File

@ -18,7 +18,9 @@ import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.text.Html; import android.text.Html;
@ -52,6 +54,8 @@ import java.util.regex.Pattern;
import app.fedilab.fedilabtube.PeertubeActivity; import app.fedilab.fedilabtube.PeertubeActivity;
import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.ShowAccountActivity;
import app.fedilab.fedilabtube.ShowChannelActivity;
import app.fedilab.fedilabtube.client.APIResponse; import app.fedilab.fedilabtube.client.APIResponse;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI; import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.CommentData.Comment; import app.fedilab.fedilabtube.client.data.CommentData.Comment;
@ -253,6 +257,14 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
Helper.loadGiF(context, comment.getAccount().getAvatar() != null ? comment.getAccount().getAvatar().getPath() : null, holder.comment_account_profile); Helper.loadGiF(context, comment.getAccount().getAvatar() != null ? comment.getAccount().getAvatar().getPath() : null, holder.comment_account_profile);
holder.comment_account_profile.setOnClickListener(v->{
Bundle b = new Bundle();
Intent intent = new Intent(context, ShowAccountActivity.class);
b.putParcelable("account", comment.getAccount());
b.putString("accountAcct", comment.getAccount().getAcct());
intent.putExtras(b);
context.startActivity(intent);
});
if(comment.isReply()) { if(comment.isReply()) {
holder.replyButton.setVisibility(View.VISIBLE); holder.replyButton.setVisibility(View.VISIBLE);
}else{ }else{