Optimize fragments, add filters, fix search and clean up #439
|
@ -4,14 +4,6 @@ import android.app.Activity;
|
||||||
import android.content.ActivityNotFoundException;
|
import android.content.ActivityNotFoundException;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import com.google.android.material.navigation.NavigationView;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.core.view.GravityCompat;
|
|
||||||
import androidx.drawerlayout.widget.DrawerLayout;
|
|
||||||
import androidx.appcompat.app.ActionBarDrawerToggle;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.fragment.app.FragmentManager;
|
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.graphics.Typeface;
|
import android.graphics.Typeface;
|
||||||
|
@ -22,6 +14,14 @@ import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.appcompat.app.ActionBarDrawerToggle;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.core.view.GravityCompat;
|
||||||
|
import androidx.drawerlayout.widget.DrawerLayout;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import com.google.android.material.navigation.NavigationView;
|
||||||
import com.squareup.picasso.NetworkPolicy;
|
import com.squareup.picasso.NetworkPolicy;
|
||||||
import org.mian.gitnex.R;
|
import org.mian.gitnex.R;
|
||||||
import org.mian.gitnex.clients.PicassoService;
|
import org.mian.gitnex.clients.PicassoService;
|
||||||
|
@ -31,19 +31,19 @@ import org.mian.gitnex.fragments.AdministrationFragment;
|
||||||
import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
|
import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
|
||||||
import org.mian.gitnex.fragments.MyRepositoriesFragment;
|
import org.mian.gitnex.fragments.MyRepositoriesFragment;
|
||||||
import org.mian.gitnex.fragments.OrganizationsFragment;
|
import org.mian.gitnex.fragments.OrganizationsFragment;
|
||||||
|
import org.mian.gitnex.fragments.ProfileFragment;
|
||||||
|
import org.mian.gitnex.fragments.RepositoriesFragment;
|
||||||
import org.mian.gitnex.fragments.SettingsFragment;
|
import org.mian.gitnex.fragments.SettingsFragment;
|
||||||
import org.mian.gitnex.fragments.StarredRepositoriesFragment;
|
import org.mian.gitnex.fragments.StarredRepositoriesFragment;
|
||||||
import org.mian.gitnex.helpers.AlertDialogs;
|
import org.mian.gitnex.helpers.AlertDialogs;
|
||||||
import org.mian.gitnex.helpers.Authorization;
|
import org.mian.gitnex.helpers.Authorization;
|
||||||
import org.mian.gitnex.helpers.ChangeLog;
|
import org.mian.gitnex.helpers.ChangeLog;
|
||||||
|
import org.mian.gitnex.helpers.RoundedTransformation;
|
||||||
import org.mian.gitnex.helpers.Toasty;
|
import org.mian.gitnex.helpers.Toasty;
|
||||||
import org.mian.gitnex.models.GiteaVersion;
|
import org.mian.gitnex.models.GiteaVersion;
|
||||||
import org.mian.gitnex.models.UserInfo;
|
import org.mian.gitnex.models.UserInfo;
|
||||||
import org.mian.gitnex.util.AppUtil;
|
import org.mian.gitnex.util.AppUtil;
|
||||||
import org.mian.gitnex.helpers.RoundedTransformation;
|
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import org.mian.gitnex.fragments.ProfileFragment;
|
|
||||||
import org.mian.gitnex.fragments.RepositoriesFragment;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
|
@ -64,6 +64,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayoutResourceId() {
|
protected int getLayoutResourceId() {
|
||||||
|
|
||||||
return R.layout.activity_main;
|
return R.layout.activity_main;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,8 +161,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
navigationView.setNavigationItemSelectedListener(this);
|
navigationView.setNavigationItemSelectedListener(this);
|
||||||
final View hView = navigationView.getHeaderView(0);
|
final View hView = navigationView.getHeaderView(0);
|
||||||
|
|
||||||
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
|
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
|
||||||
R.string.navigation_drawer_open, R.string.navigation_drawer_close);
|
|
||||||
toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
|
toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
|
||||||
drawer.addDrawerListener(toggle);
|
drawer.addDrawerListener(toggle);
|
||||||
|
|
||||||
|
@ -202,9 +202,10 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
}
|
}
|
||||||
|
|
||||||
userAvatar.setOnClickListener(new View.OnClickListener() {
|
userAvatar.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
|
||||||
new ProfileFragment()).commit();
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
||||||
drawer.closeDrawers();
|
drawer.closeDrawers();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -227,38 +228,32 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
if(savedInstanceState == null) {
|
if(savedInstanceState == null) {
|
||||||
if(tinyDb.getInt("homeScreenId") == 0) {
|
if(tinyDb.getInt("homeScreenId") == 0) {
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
|
||||||
new MyRepositoriesFragment()).commit();
|
|
||||||
navigationView.setCheckedItem(R.id.nav_home);
|
navigationView.setCheckedItem(R.id.nav_home);
|
||||||
}
|
}
|
||||||
else if(tinyDb.getInt("homeScreenId") == 1) {
|
else if(tinyDb.getInt("homeScreenId") == 1) {
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
|
||||||
new StarredRepositoriesFragment()).commit();
|
|
||||||
navigationView.setCheckedItem(R.id.nav_starred_repos);
|
navigationView.setCheckedItem(R.id.nav_starred_repos);
|
||||||
}
|
}
|
||||||
else if(tinyDb.getInt("homeScreenId") == 2) {
|
else if(tinyDb.getInt("homeScreenId") == 2) {
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
|
||||||
new OrganizationsFragment()).commit();
|
|
||||||
navigationView.setCheckedItem(R.id.nav_organizations);
|
navigationView.setCheckedItem(R.id.nav_organizations);
|
||||||
}
|
}
|
||||||
else if(tinyDb.getInt("homeScreenId") == 3) {
|
else if(tinyDb.getInt("homeScreenId") == 3) {
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
|
||||||
new RepositoriesFragment()).commit();
|
|
||||||
navigationView.setCheckedItem(R.id.nav_repositories);
|
navigationView.setCheckedItem(R.id.nav_repositories);
|
||||||
}
|
}
|
||||||
else if(tinyDb.getInt("homeScreenId") == 4) {
|
else if(tinyDb.getInt("homeScreenId") == 4) {
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
||||||
new ProfileFragment()).commit();
|
|
||||||
navigationView.setCheckedItem(R.id.nav_profile);
|
navigationView.setCheckedItem(R.id.nav_profile);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
|
||||||
new MyRepositoriesFragment()).commit();
|
|
||||||
navigationView.setCheckedItem(R.id.nav_home);
|
navigationView.setCheckedItem(R.id.nav_home);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -271,7 +266,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
|
|
||||||
tinyDb.putBoolean("noConnection", true);
|
tinyDb.putBoolean("noConnection", true);
|
||||||
|
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
displayUserInfo(instanceUrl, instanceToken, loginUid);
|
displayUserInfo(instanceUrl, instanceToken, loginUid);
|
||||||
giteaVersion(instanceUrl);
|
giteaVersion(instanceUrl);
|
||||||
|
@ -282,8 +278,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
// Changelog popup
|
// Changelog popup
|
||||||
int versionCode = 0;
|
int versionCode = 0;
|
||||||
try {
|
try {
|
||||||
PackageInfo packageInfo = getApplicationContext().getPackageManager()
|
PackageInfo packageInfo = getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0);
|
||||||
.getPackageInfo(getApplicationContext().getPackageName(), 0);
|
|
||||||
versionCode = packageInfo.versionCode;
|
versionCode = packageInfo.versionCode;
|
||||||
}
|
}
|
||||||
catch(PackageManager.NameNotFoundException e) {
|
catch(PackageManager.NameNotFoundException e) {
|
||||||
|
@ -299,6 +294,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setActionBarTitle(@NonNull String title) {
|
public void setActionBarTitle(@NonNull String title) {
|
||||||
|
|
||||||
Objects.requireNonNull(getSupportActionBar()).setTitle(title);
|
Objects.requireNonNull(getSupportActionBar()).setTitle(title);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -320,29 +316,24 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
switch(menuItem.getItemId()) {
|
switch(menuItem.getItemId()) {
|
||||||
case R.id.nav_home:
|
case R.id.nav_home:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
|
||||||
new MyRepositoriesFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_organizations:
|
case R.id.nav_organizations:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
|
||||||
new OrganizationsFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_profile:
|
case R.id.nav_profile:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
||||||
new ProfileFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_repositories:
|
case R.id.nav_repositories:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
|
||||||
new RepositoriesFragment()).commit();
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_settings:
|
case R.id.nav_settings:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
|
||||||
new SettingsFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_logout:
|
case R.id.nav_logout:
|
||||||
logout(this, ctx);
|
logout(this, ctx);
|
||||||
|
@ -350,26 +341,22 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
break;
|
break;
|
||||||
case R.id.nav_about:
|
case R.id.nav_about:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AboutFragment()).commit();
|
||||||
new AboutFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_rate_app:
|
case R.id.nav_rate_app:
|
||||||
rateThisApp();
|
rateThisApp();
|
||||||
break;
|
break;
|
||||||
case R.id.nav_starred_repos:
|
case R.id.nav_starred_repos:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
|
||||||
new StarredRepositoriesFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_explore:
|
case R.id.nav_explore:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreRepositoriesFragment()).commit();
|
||||||
new ExploreRepositoriesFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_administration:
|
case R.id.nav_administration:
|
||||||
toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
|
||||||
new AdministrationFragment()).commit();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -379,12 +366,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
}
|
}
|
||||||
|
|
||||||
public void rateThisApp() {
|
public void rateThisApp() {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
startActivity(new Intent(Intent.ACTION_VIEW,
|
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + getPackageName())));
|
||||||
Uri.parse("market://details?id=" + getPackageName())));
|
}
|
||||||
} catch (ActivityNotFoundException e) {
|
catch(ActivityNotFoundException e) {
|
||||||
startActivity(new Intent(Intent.ACTION_VIEW,
|
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + getPackageName())));
|
||||||
Uri.parse("https://play.google.com/store/apps/details?id=" + getPackageName())));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -406,10 +393,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
|
|
||||||
final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
|
final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
|
||||||
|
|
||||||
Call<GiteaVersion> callVersion = RetrofitClient
|
Call<GiteaVersion> callVersion = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getGiteaVersionWithToken(token);
|
||||||
.getInstance(instanceUrl, getApplicationContext())
|
|
||||||
.getApiInterface()
|
|
||||||
.getGiteaVersionWithToken(token);
|
|
||||||
|
|
||||||
callVersion.enqueue(new Callback<GiteaVersion>() {
|
callVersion.enqueue(new Callback<GiteaVersion>() {
|
||||||
|
|
||||||
|
@ -442,10 +426,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
|
|
||||||
final TinyDB tinyDb = new TinyDB(getApplicationContext());
|
final TinyDB tinyDb = new TinyDB(getApplicationContext());
|
||||||
|
|
||||||
Call<UserInfo> call = RetrofitClient
|
Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getUserInfo(Authorization.returnAuthentication(getApplicationContext(), loginUid, token));
|
||||||
.getInstance(instanceUrl, getApplicationContext())
|
|
||||||
.getApiInterface()
|
|
||||||
.getUserInfo(Authorization.returnAuthentication(getApplicationContext(), loginUid, token));
|
|
||||||
|
|
||||||
NavigationView navigationView = findViewById(R.id.nav_view);
|
NavigationView navigationView = findViewById(R.id.nav_view);
|
||||||
final View hView = navigationView.getHeaderView(0);
|
final View hView = navigationView.getHeaderView(0);
|
||||||
|
@ -480,38 +461,42 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
if(userDetails.getLang() != null) {
|
if(userDetails.getLang() != null) {
|
||||||
tinyDb.putString("userLang", userDetails.getLang());
|
tinyDb.putString("userLang", userDetails.getLang());
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
tinyDb.putString("userLang", "...");
|
tinyDb.putString("userLang", "...");
|
||||||
}
|
}
|
||||||
|
|
||||||
userAvatar = hView.findViewById(R.id.userAvatar);
|
userAvatar = hView.findViewById(R.id.userAvatar);
|
||||||
if(!Objects.requireNonNull(userDetails).getAvatar().equals("")) {
|
if(!Objects.requireNonNull(userDetails).getAvatar().equals("")) {
|
||||||
PicassoService.getInstance(ctx).get().load(userDetails.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
|
PicassoService.getInstance(ctx).get().load(userDetails.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
userAvatar.setImageResource(R.mipmap.app_logo_round);
|
userAvatar.setImageResource(R.mipmap.app_logo_round);
|
||||||
}
|
}
|
||||||
|
|
||||||
userFullName = hView.findViewById(R.id.userFullname);
|
userFullName = hView.findViewById(R.id.userFullname);
|
||||||
if(!userDetails.getFullname().equals("")) {
|
if(!userDetails.getFullname().equals("")) {
|
||||||
userFullName.setText(userDetails.getFullname());
|
userFullName.setText(userDetails.getFullname());
|
||||||
} else if (!userDetails.getLogin().equals("")) {
|
}
|
||||||
|
else if(!userDetails.getLogin().equals("")) {
|
||||||
userFullName.setText(userDetails.getLogin());
|
userFullName.setText(userDetails.getLogin());
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
userFullName.setText("...");
|
userFullName.setText("...");
|
||||||
}
|
}
|
||||||
|
|
||||||
userEmail = hView.findViewById(R.id.userEmail);
|
userEmail = hView.findViewById(R.id.userEmail);
|
||||||
if(!userDetails.getEmail().equals("")) {
|
if(!userDetails.getEmail().equals("")) {
|
||||||
userEmail.setText(userDetails.getEmail());
|
userEmail.setText(userDetails.getEmail());
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
userEmail.setText("...");
|
userEmail.setText("...");
|
||||||
}
|
}
|
||||||
|
|
||||||
userAvatar.setOnClickListener(new View.OnClickListener() {
|
userAvatar.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
|
|
||||||
new ProfileFragment()).commit();
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
||||||
drawer.closeDrawers();
|
drawer.closeDrawers();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -521,10 +506,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
}
|
}
|
||||||
else if(response.code() == 401) {
|
else if(response.code() == 401) {
|
||||||
|
|
||||||
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
|
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
|
||||||
getResources().getString(R.string.alertDialogTokenRevokedMessage),
|
|
||||||
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
|
|
||||||
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -538,6 +520,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
|
public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
Log.e("onFailure", t.toString());
|
Log.e("onFailure", t.toString());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,19 +1,10 @@
|
||||||
package org.mian.gitnex.activities;
|
package org.mian.gitnex.activities;
|
||||||
|
|
||||||
import com.google.android.material.tabs.TabLayout;
|
|
||||||
import com.google.gson.JsonElement;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.fragment.app.FragmentManager;
|
|
||||||
import androidx.fragment.app.FragmentStatePagerAdapter;
|
|
||||||
import androidx.viewpager.widget.ViewPager;
|
|
||||||
import retrofit2.Call;
|
|
||||||
import retrofit2.Callback;
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.res.ColorStateList;
|
import android.content.res.ColorStateList;
|
||||||
import android.graphics.Typeface;
|
import android.graphics.Typeface;
|
||||||
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
@ -23,13 +14,23 @@ import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentStatePagerAdapter;
|
||||||
|
import androidx.viewpager.widget.ViewPager;
|
||||||
|
import com.google.android.material.tabs.TabLayout;
|
||||||
|
import com.google.gson.JsonElement;
|
||||||
import org.mian.gitnex.R;
|
import org.mian.gitnex.R;
|
||||||
import org.mian.gitnex.clients.RetrofitClient;
|
import org.mian.gitnex.clients.RetrofitClient;
|
||||||
|
import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
|
||||||
|
import org.mian.gitnex.fragments.BottomSheetPullRequestFilterFragment;
|
||||||
import org.mian.gitnex.fragments.BottomSheetRepoFragment;
|
import org.mian.gitnex.fragments.BottomSheetRepoFragment;
|
||||||
import org.mian.gitnex.fragments.BranchesFragment;
|
import org.mian.gitnex.fragments.BranchesFragment;
|
||||||
import org.mian.gitnex.fragments.CollaboratorsFragment;
|
import org.mian.gitnex.fragments.CollaboratorsFragment;
|
||||||
import org.mian.gitnex.fragments.FilesFragment;
|
import org.mian.gitnex.fragments.FilesFragment;
|
||||||
import org.mian.gitnex.fragments.IssuesMainFragment;
|
import org.mian.gitnex.fragments.IssuesFragment;
|
||||||
import org.mian.gitnex.fragments.LabelsFragment;
|
import org.mian.gitnex.fragments.LabelsFragment;
|
||||||
import org.mian.gitnex.fragments.MilestonesFragment;
|
import org.mian.gitnex.fragments.MilestonesFragment;
|
||||||
import org.mian.gitnex.fragments.PullRequestsFragment;
|
import org.mian.gitnex.fragments.PullRequestsFragment;
|
||||||
|
@ -42,25 +43,65 @@ import org.mian.gitnex.models.WatchRepository;
|
||||||
import org.mian.gitnex.util.AppUtil;
|
import org.mian.gitnex.util.AppUtil;
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import android.net.Uri;
|
import retrofit2.Call;
|
||||||
|
import retrofit2.Callback;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Author M M Arif
|
* Author M M Arif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener {
|
public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener, BottomSheetIssuesFilterFragment.BottomSheetListener, BottomSheetPullRequestFilterFragment.BottomSheetListener {
|
||||||
|
|
||||||
private TextView textViewBadgeIssue;
|
private TextView textViewBadgeIssue;
|
||||||
private TextView textViewBadgePull;
|
private TextView textViewBadgePull;
|
||||||
private TextView textViewBadgeRelease;
|
private TextView textViewBadgeRelease;
|
||||||
|
|
||||||
|
private FragmentRefreshListener fragmentRefreshListener;
|
||||||
|
private FragmentRefreshListenerPr fragmentRefreshListenerPr;
|
||||||
|
|
||||||
|
// issues interface
|
||||||
|
public FragmentRefreshListener getFragmentRefreshListener() {
|
||||||
|
|
||||||
|
return fragmentRefreshListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFragmentRefreshListener(FragmentRefreshListener fragmentRefreshListener) {
|
||||||
|
|
||||||
|
this.fragmentRefreshListener = fragmentRefreshListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface FragmentRefreshListener {
|
||||||
|
|
||||||
|
void onRefresh(String text);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// pr interface
|
||||||
|
public FragmentRefreshListenerPr getFragmentRefreshListenerPr() {
|
||||||
|
|
||||||
|
return fragmentRefreshListenerPr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFragmentRefreshListenerPr(FragmentRefreshListenerPr fragmentRefreshListenerPr) {
|
||||||
|
|
||||||
|
this.fragmentRefreshListenerPr = fragmentRefreshListenerPr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface FragmentRefreshListenerPr {
|
||||||
|
|
||||||
|
void onRefresh(String text);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayoutResourceId() {
|
protected int getLayoutResourceId() {
|
||||||
|
|
||||||
return R.layout.activity_repo_detail;
|
return R.layout.activity_repo_detail;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(getApplicationContext());
|
TinyDB tinyDb = new TinyDB(getApplicationContext());
|
||||||
|
@ -73,6 +114,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
final String loginUid = tinyDb.getString("loginUid");
|
final String loginUid = tinyDb.getString("loginUid");
|
||||||
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
||||||
|
|
||||||
|
tinyDb.putString("repoIssuesState", "open");
|
||||||
|
tinyDb.putString("repoPrState", "open");
|
||||||
|
|
||||||
String appLocale = tinyDb.getString("locale");
|
String appLocale = tinyDb.getString("locale");
|
||||||
AppUtil.setAppLocale(getResources(), appLocale);
|
AppUtil.setAppLocale(getResources(), appLocale);
|
||||||
|
|
||||||
|
@ -230,6 +274,14 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
|
BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
|
||||||
bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
|
bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
|
||||||
return true;
|
return true;
|
||||||
|
case R.id.filter:
|
||||||
|
BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
|
||||||
|
filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
|
||||||
|
return true;
|
||||||
|
case R.id.filterPr:
|
||||||
|
BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
|
||||||
|
filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
|
||||||
|
return true;
|
||||||
default:
|
default:
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
@ -277,6 +329,26 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
case "newFile":
|
case "newFile":
|
||||||
startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
|
startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
|
||||||
break;
|
break;
|
||||||
|
case "openIssues":
|
||||||
|
if(getFragmentRefreshListener() != null) {
|
||||||
|
getFragmentRefreshListener().onRefresh("open");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "closedIssues":
|
||||||
|
if(getFragmentRefreshListener() != null) {
|
||||||
|
getFragmentRefreshListener().onRefresh("closed");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "openPr":
|
||||||
|
if(getFragmentRefreshListenerPr() != null) {
|
||||||
|
getFragmentRefreshListenerPr().onRefresh("open");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "closedPr":
|
||||||
|
if(getFragmentRefreshListenerPr() != null) {
|
||||||
|
getFragmentRefreshListenerPr().onRefresh("closed");
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -284,6 +356,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
|
public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
|
||||||
|
|
||||||
SectionsPagerAdapter(FragmentManager fm) {
|
SectionsPagerAdapter(FragmentManager fm) {
|
||||||
|
|
||||||
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
|
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -304,7 +377,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
case 1: // files
|
case 1: // files
|
||||||
return FilesFragment.newInstance(repoOwner, repoName);
|
return FilesFragment.newInstance(repoOwner, repoName);
|
||||||
case 2: // issues
|
case 2: // issues
|
||||||
fragment = new IssuesMainFragment();
|
fragment = new IssuesFragment();
|
||||||
break;
|
break;
|
||||||
case 3: // pull requests
|
case 3: // pull requests
|
||||||
fragment = new PullRequestsFragment();
|
fragment = new PullRequestsFragment();
|
||||||
|
@ -326,6 +399,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getCount() {
|
public int getCount() {
|
||||||
|
|
||||||
return 9;
|
return 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -335,10 +409,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(getApplicationContext());
|
TinyDB tinyDb = new TinyDB(getApplicationContext());
|
||||||
|
|
||||||
Call<UserRepositories> call = RetrofitClient
|
Call<UserRepositories> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getUserRepository(token, owner, repo);
|
||||||
.getInstance(instanceUrl, getApplicationContext())
|
|
||||||
.getApiInterface()
|
|
||||||
.getUserRepository(token, owner, repo);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<UserRepositories>() {
|
call.enqueue(new Callback<UserRepositories>() {
|
||||||
|
|
||||||
|
@ -381,6 +452,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
|
public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
Log.e("onFailure", t.toString());
|
Log.e("onFailure", t.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -392,10 +464,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
Call<JsonElement> call;
|
Call<JsonElement> call;
|
||||||
|
|
||||||
call = RetrofitClient
|
call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().checkRepoStarStatus(instanceToken, owner, repo);
|
||||||
.getInstance(instanceUrl, getApplicationContext())
|
|
||||||
.getApiInterface()
|
|
||||||
.checkRepoStarStatus(instanceToken, owner, repo);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<JsonElement>() {
|
call.enqueue(new Callback<JsonElement>() {
|
||||||
|
|
||||||
|
@ -409,6 +478,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
|
public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
Log.e("onFailure", t.toString());
|
Log.e("onFailure", t.toString());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -419,10 +489,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
Call<WatchRepository> call;
|
Call<WatchRepository> call;
|
||||||
|
|
||||||
call = RetrofitClient
|
call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().checkRepoWatchStatus(instanceToken, owner, repo);
|
||||||
.getInstance(instanceUrl, getApplicationContext())
|
|
||||||
.getApiInterface()
|
|
||||||
.checkRepoWatchStatus(instanceToken, owner, repo);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<WatchRepository>() {
|
call.enqueue(new Callback<WatchRepository>() {
|
||||||
|
|
||||||
|
@ -445,6 +512,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
|
public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
Log.e("onFailure", t.toString());
|
Log.e("onFailure", t.toString());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,29 +1,28 @@
|
||||||
package org.mian.gitnex.adapters;
|
package org.mian.gitnex.adapters;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.text.Html;
|
import android.text.Html;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
import com.mikepenz.fastadapter.FastAdapter;
|
|
||||||
import com.mikepenz.fastadapter.items.AbstractItem;
|
|
||||||
import com.mikepenz.fastadapter.listeners.ClickEventHook;
|
|
||||||
import com.mikepenz.fastadapter.utils.EventHookUtil;
|
|
||||||
import org.mian.gitnex.R;
|
import org.mian.gitnex.R;
|
||||||
import org.mian.gitnex.activities.IssueDetailActivity;
|
import org.mian.gitnex.activities.IssueDetailActivity;
|
||||||
import org.mian.gitnex.clients.PicassoService;
|
import org.mian.gitnex.clients.PicassoService;
|
||||||
import org.mian.gitnex.helpers.ClickListener;
|
import org.mian.gitnex.helpers.ClickListener;
|
||||||
import org.mian.gitnex.helpers.RoundedTransformation;
|
import org.mian.gitnex.helpers.RoundedTransformation;
|
||||||
import org.mian.gitnex.helpers.TimeHelper;
|
import org.mian.gitnex.helpers.TimeHelper;
|
||||||
|
import org.mian.gitnex.models.Issues;
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import org.ocpsoft.prettytime.PrettyTime;
|
import org.ocpsoft.prettytime.PrettyTime;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
|
@ -31,112 +30,74 @@ import java.util.Locale;
|
||||||
* Author M M Arif
|
* Author M M Arif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.ViewHolder> {
|
public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
|
||||||
|
|
||||||
final private Context ctx;
|
private Context context;
|
||||||
private String issueTitle;
|
private final int TYPE_LOAD = 0;
|
||||||
private int issueNumber;
|
private List<Issues> issuesList;
|
||||||
private String issueAssigneeAvatar;
|
private OnLoadMoreListener loadMoreListener;
|
||||||
private Date issueCreatedTime;
|
private boolean isLoading = false, isMoreDataAvailable = true;
|
||||||
private int issueCommentsCount;
|
|
||||||
private String userFullname;
|
|
||||||
private String userLogin;
|
|
||||||
|
|
||||||
private boolean isSelectable = true;
|
public IssuesAdapter(Context context, List<Issues> issuesListMain) {
|
||||||
|
|
||||||
public IssuesAdapter(Context ctx) {
|
this.context = context;
|
||||||
this.ctx = ctx;
|
this.issuesList = issuesListMain;
|
||||||
}
|
|
||||||
|
|
||||||
public IssuesAdapter withNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
|
|
||||||
|
|
||||||
this.setNewItems(issueTitle, issueNumber, issueAssigneeAvatar, issueCreatedTime, issueCommentsCount, userFullname, userLogin);
|
|
||||||
return this;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
|
|
||||||
|
|
||||||
this.issueTitle = issueTitle;
|
|
||||||
this.issueNumber = issueNumber;
|
|
||||||
this.issueAssigneeAvatar = issueAssigneeAvatar;
|
|
||||||
this.issueCreatedTime = issueCreatedTime;
|
|
||||||
this.issueCommentsCount = issueCommentsCount;
|
|
||||||
this.userFullname = userFullname;
|
|
||||||
this.userLogin = userLogin;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getIssueNumber() {
|
|
||||||
return issueNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getIssueTitle() {
|
|
||||||
return issueTitle;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getIssueAssigneeAvatar() {
|
|
||||||
return issueAssigneeAvatar;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Date getIssueCreatedTime() {
|
|
||||||
return issueCreatedTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getIssueCommentsCount() {
|
|
||||||
return issueCommentsCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getUserFullname() {
|
|
||||||
return userFullname;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getUserLogin() {
|
|
||||||
return userLogin;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isEnabled() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IssuesAdapter withEnabled(boolean enabled) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSelectable() {
|
|
||||||
return isSelectable;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IssuesAdapter withSelectable(boolean selectable) {
|
|
||||||
this.isSelectable = selectable;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getType() {
|
|
||||||
return R.id.relativeLayoutFrameIssuesList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getLayoutRes() {
|
|
||||||
return R.layout.list_issues;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public IssuesAdapter.ViewHolder getViewHolder(@NonNull View v) {
|
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
return new IssuesAdapter.ViewHolder(v);
|
|
||||||
|
LayoutInflater inflater = LayoutInflater.from(context);
|
||||||
|
|
||||||
|
if(viewType == TYPE_LOAD) {
|
||||||
|
return new IssuesHolder(inflater.inflate(R.layout.list_issues, parent, false));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ViewHolder extends FastAdapter.ViewHolder<IssuesAdapter> {
|
}
|
||||||
|
|
||||||
final TinyDB tinyDb = new TinyDB(ctx);
|
@Override
|
||||||
final String locale = tinyDb.getString("locale");
|
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
|
||||||
final String timeFormat = tinyDb.getString("dateFormat");
|
|
||||||
|
if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
|
||||||
|
|
||||||
|
isLoading = true;
|
||||||
|
loadMoreListener.onLoadMore();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if(getItemViewType(position) == TYPE_LOAD) {
|
||||||
|
|
||||||
|
((IssuesHolder) holder).bindData(issuesList.get(position));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemViewType(int position) {
|
||||||
|
|
||||||
|
if(issuesList.get(position).getTitle() != null) {
|
||||||
|
return TYPE_LOAD;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
|
||||||
|
return issuesList.size();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class IssuesHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
private TextView issueNumber;
|
private TextView issueNumber;
|
||||||
private ImageView issueAssigneeAvatar;
|
private ImageView issueAssigneeAvatar;
|
||||||
|
@ -144,7 +105,7 @@ public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.Vie
|
||||||
private TextView issueCreatedTime;
|
private TextView issueCreatedTime;
|
||||||
private TextView issueCommentsCount;
|
private TextView issueCommentsCount;
|
||||||
|
|
||||||
public ViewHolder(View itemView) {
|
IssuesHolder(View itemView) {
|
||||||
|
|
||||||
super(itemView);
|
super(itemView);
|
||||||
|
|
||||||
|
@ -152,94 +113,124 @@ public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.Vie
|
||||||
issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
|
issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
|
||||||
issueTitle = itemView.findViewById(R.id.issueTitle);
|
issueTitle = itemView.findViewById(R.id.issueTitle);
|
||||||
issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
|
issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
|
||||||
|
LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
|
||||||
issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
|
issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
|
||||||
|
|
||||||
}
|
issueTitle.setOnClickListener(v -> {
|
||||||
|
|
||||||
@Override
|
|
||||||
public void bindView(@NonNull IssuesAdapter item, @NonNull List<Object> payloads) {
|
|
||||||
|
|
||||||
if (!item.getUserFullname().equals("")) {
|
|
||||||
issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserFullname(), ctx));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserLogin(), ctx));
|
|
||||||
}
|
|
||||||
|
|
||||||
PicassoService.getInstance(ctx).get().load(item.getIssueAssigneeAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
|
|
||||||
|
|
||||||
String issueNumber_ = "<font color='" + ctx.getResources().getColor(R.color.lightGray) + "'>" + ctx.getResources().getString(R.string.hash) + item.getIssueNumber() + "</font>";
|
|
||||||
issueTitle.setText(Html.fromHtml(issueNumber_ + " " + item.getIssueTitle()));
|
|
||||||
|
|
||||||
issueNumber.setText(String.valueOf(item.getIssueNumber()));
|
|
||||||
issueCommentsCount.setText(String.valueOf(item.getIssueCommentsCount()));
|
|
||||||
|
|
||||||
switch (timeFormat) {
|
|
||||||
|
|
||||||
case "pretty": {
|
|
||||||
PrettyTime prettyTime = new PrettyTime(new Locale(locale));
|
|
||||||
String createdTime = prettyTime.format(item.getIssueCreatedTime());
|
|
||||||
issueCreatedTime.setText(createdTime);
|
|
||||||
issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getIssueCreatedTime()), ctx));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case "normal": {
|
|
||||||
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
|
|
||||||
String createdTime = formatter.format(item.getIssueCreatedTime());
|
|
||||||
issueCreatedTime.setText(createdTime);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case "normal1": {
|
|
||||||
DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
|
|
||||||
String createdTime = formatter.format(item.getIssueCreatedTime());
|
|
||||||
issueCreatedTime.setText(createdTime);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unbindView(@NonNull IssuesAdapter item) {
|
|
||||||
|
|
||||||
issueTitle.setText(null);
|
|
||||||
issueCommentsCount.setText(null);
|
|
||||||
issueCreatedTime.setText(null);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class IssueTitleClickEvent extends ClickEventHook<IssuesAdapter> {
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public List<View> onBindMany(@NonNull RecyclerView.ViewHolder viewHolder) {
|
|
||||||
|
|
||||||
if (viewHolder instanceof IssuesAdapter.ViewHolder) {
|
|
||||||
return EventHookUtil.toList(((ViewHolder) viewHolder).issueTitle);
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.onBindMany(viewHolder);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View v, int position, @NonNull FastAdapter<IssuesAdapter> fastAdapter, IssuesAdapter item) {
|
|
||||||
|
|
||||||
Context context = v.getContext();
|
Context context = v.getContext();
|
||||||
|
|
||||||
Intent intent = new Intent(context, IssueDetailActivity.class);
|
Intent intent = new Intent(context, IssueDetailActivity.class);
|
||||||
intent.putExtra("issueNumber", item.getIssueNumber());
|
intent.putExtra("issueNumber", issueNumber.getText());
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(context);
|
TinyDB tinyDb = new TinyDB(context);
|
||||||
tinyDb.putString("issueNumber", String.valueOf(item.getIssueNumber()));
|
tinyDb.putString("issueNumber", issueNumber.getText().toString());
|
||||||
tinyDb.putString("issueType", "issue");
|
tinyDb.putString("issueType", "issue");
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
|
|
||||||
|
});
|
||||||
|
frameCommentsCount.setOnClickListener(v -> {
|
||||||
|
|
||||||
|
Context context = v.getContext();
|
||||||
|
|
||||||
|
Intent intent = new Intent(context, IssueDetailActivity.class);
|
||||||
|
intent.putExtra("issueNumber", issueNumber.getText());
|
||||||
|
|
||||||
|
TinyDB tinyDb = new TinyDB(context);
|
||||||
|
tinyDb.putString("issueNumber", issueNumber.getText().toString());
|
||||||
|
tinyDb.putString("issueType", "issue");
|
||||||
|
context.startActivity(intent);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
|
void bindData(Issues issuesModel) {
|
||||||
|
|
||||||
|
final TinyDB tinyDb = new TinyDB(context);
|
||||||
|
final String locale = tinyDb.getString("locale");
|
||||||
|
final String timeFormat = tinyDb.getString("dateFormat");
|
||||||
|
|
||||||
|
if(!issuesModel.getUser().getFull_name().equals("")) {
|
||||||
|
issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
|
||||||
|
}
|
||||||
|
|
||||||
|
PicassoService.getInstance(context).get().load(issuesModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
|
||||||
|
|
||||||
|
String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
|
||||||
|
issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
|
||||||
|
|
||||||
|
issueNumber.setText(String.valueOf(issuesModel.getNumber()));
|
||||||
|
issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
|
||||||
|
|
||||||
|
switch(timeFormat) {
|
||||||
|
case "pretty": {
|
||||||
|
PrettyTime prettyTime = new PrettyTime(new Locale(locale));
|
||||||
|
String createdTime = prettyTime.format(issuesModel.getCreated_at());
|
||||||
|
issueCreatedTime.setText(createdTime);
|
||||||
|
issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "normal": {
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
|
||||||
|
String createdTime = formatter.format(issuesModel.getCreated_at());
|
||||||
|
issueCreatedTime.setText(createdTime);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "normal1": {
|
||||||
|
DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
|
||||||
|
String createdTime = formatter.format(issuesModel.getCreated_at());
|
||||||
|
issueCreatedTime.setText(createdTime);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static class LoadHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
|
LoadHolder(View itemView) {
|
||||||
|
|
||||||
|
super(itemView);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMoreDataAvailable(boolean moreDataAvailable) {
|
||||||
|
|
||||||
|
isMoreDataAvailable = moreDataAvailable;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void notifyDataChanged() {
|
||||||
|
|
||||||
|
notifyDataSetChanged();
|
||||||
|
isLoading = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface OnLoadMoreListener {
|
||||||
|
|
||||||
|
void onLoadMore();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
|
||||||
|
|
||||||
|
this.loadMoreListener = loadMoreListener;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateList(List<Issues> list) {
|
||||||
|
|
||||||
|
issuesList = list;
|
||||||
|
notifyDataSetChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -7,8 +7,6 @@ import android.text.Html;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.Filter;
|
|
||||||
import android.widget.Filterable;
|
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
@ -22,10 +20,6 @@ import org.mian.gitnex.helpers.RoundedTransformation;
|
||||||
import org.mian.gitnex.helpers.TimeHelper;
|
import org.mian.gitnex.helpers.TimeHelper;
|
||||||
import org.mian.gitnex.models.PullRequests;
|
import org.mian.gitnex.models.PullRequests;
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import org.ocpsoft.prettytime.PrettyTime;
|
|
||||||
import java.text.DateFormat;
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
|
@ -33,12 +27,11 @@ import java.util.Locale;
|
||||||
* Author M M Arif
|
* Author M M Arif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
|
public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
|
||||||
|
|
||||||
private Context context;
|
private Context context;
|
||||||
private final int TYPE_LOAD = 0;
|
private final int TYPE_LOAD = 0;
|
||||||
private List<PullRequests> prList;
|
private List<PullRequests> prList;
|
||||||
private List<PullRequests> prListFull;
|
|
||||||
private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
|
private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
|
||||||
private boolean isLoading = false, isMoreDataAvailable = true;
|
private boolean isLoading = false, isMoreDataAvailable = true;
|
||||||
|
|
||||||
|
@ -46,7 +39,6 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
|
|
||||||
this.context = context;
|
this.context = context;
|
||||||
this.prList = prListMain;
|
this.prList = prListMain;
|
||||||
prListFull = new ArrayList<>(prList);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,9 +113,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
|
LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
|
||||||
prCreatedTime = itemView.findViewById(R.id.prCreatedTime);
|
prCreatedTime = itemView.findViewById(R.id.prCreatedTime);
|
||||||
|
|
||||||
prTitle.setOnClickListener(new View.OnClickListener() {
|
prTitle.setOnClickListener(v -> {
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
|
|
||||||
Context context = v.getContext();
|
Context context = v.getContext();
|
||||||
|
|
||||||
|
@ -135,11 +125,8 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
tinyDb.putString("issueType", "pr");
|
tinyDb.putString("issueType", "pr");
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
frameCommentsCount.setOnClickListener(new View.OnClickListener() {
|
frameCommentsCount.setOnClickListener(v -> {
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
|
|
||||||
Context context = v.getContext();
|
Context context = v.getContext();
|
||||||
|
|
||||||
|
@ -151,7 +138,6 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
tinyDb.putString("issueType", "pr");
|
tinyDb.putString("issueType", "pr");
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -165,13 +151,15 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
|
|
||||||
if(!prModel.getUser().getFull_name().equals("")) {
|
if(!prModel.getUser().getFull_name().equals("")) {
|
||||||
assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
|
assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
|
assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(prModel.getUser().getAvatar_url() != null) {
|
if(prModel.getUser().getAvatar_url() != null) {
|
||||||
PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
|
PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
|
PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -194,6 +182,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
static class LoadHolder extends RecyclerView.ViewHolder {
|
static class LoadHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
LoadHolder(View itemView) {
|
LoadHolder(View itemView) {
|
||||||
|
|
||||||
super(itemView);
|
super(itemView);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -224,40 +213,10 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public void updateList(List<PullRequests> list) {
|
||||||
public Filter getFilter() {
|
|
||||||
return prFilter;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Filter prFilter = new Filter() {
|
prList = list;
|
||||||
@Override
|
|
||||||
protected FilterResults performFiltering(CharSequence constraint) {
|
|
||||||
List<PullRequests> filteredList = new ArrayList<>();
|
|
||||||
|
|
||||||
if (constraint == null || constraint.length() == 0) {
|
|
||||||
filteredList.addAll(prList);
|
|
||||||
} else {
|
|
||||||
String filterPattern = constraint.toString().toLowerCase().trim();
|
|
||||||
|
|
||||||
for (PullRequests item : prList) {
|
|
||||||
if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
|
|
||||||
filteredList.add(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FilterResults results = new FilterResults();
|
|
||||||
results.values = filteredList;
|
|
||||||
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void publishResults(CharSequence constraint, FilterResults results) {
|
|
||||||
prList.clear();
|
|
||||||
prList.addAll((List) results.values);
|
|
||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
package org.mian.gitnex.fragments;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
|
||||||
|
import org.mian.gitnex.R;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Author M M Arif
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class BottomSheetIssuesFilterFragment extends BottomSheetDialogFragment {
|
||||||
|
|
||||||
|
private BottomSheetIssuesFilterFragment.BottomSheetListener bmListener;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||||
|
|
||||||
|
View v = inflater.inflate(R.layout.bottom_sheet_issues_filter, container, false);
|
||||||
|
|
||||||
|
TextView openIssues = v.findViewById(R.id.openIssues);
|
||||||
|
TextView closedIssues = v.findViewById(R.id.closedIssues);
|
||||||
|
|
||||||
|
openIssues.setOnClickListener(v1 -> {
|
||||||
|
bmListener.onButtonClicked("openIssues");
|
||||||
|
dismiss();
|
||||||
|
});
|
||||||
|
|
||||||
|
closedIssues.setOnClickListener(v12 -> {
|
||||||
|
bmListener.onButtonClicked("closedIssues");
|
||||||
|
dismiss();
|
||||||
|
});
|
||||||
|
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface BottomSheetListener {
|
||||||
|
|
||||||
|
void onButtonClicked(String text);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(@NonNull Context context) {
|
||||||
|
|
||||||
|
super.onAttach(context);
|
||||||
|
|
||||||
|
try {
|
||||||
|
bmListener = (BottomSheetIssuesFilterFragment.BottomSheetListener) context;
|
||||||
|
}
|
||||||
|
catch(ClassCastException e) {
|
||||||
|
throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,63 @@
|
||||||
|
package org.mian.gitnex.fragments;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
|
||||||
|
import org.mian.gitnex.R;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Author M M Arif
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class BottomSheetPullRequestFilterFragment extends BottomSheetDialogFragment {
|
||||||
|
|
||||||
|
private BottomSheetPullRequestFilterFragment.BottomSheetListener bmListener;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||||
|
|
||||||
|
View v = inflater.inflate(R.layout.bottom_sheet_pull_request_filter, container, false);
|
||||||
|
|
||||||
|
TextView openPr = v.findViewById(R.id.openPr);
|
||||||
|
TextView closedPr = v.findViewById(R.id.closedPr);
|
||||||
|
|
||||||
|
openPr.setOnClickListener(v1 -> {
|
||||||
|
bmListener.onButtonClicked("openPr");
|
||||||
|
dismiss();
|
||||||
|
});
|
||||||
|
|
||||||
|
closedPr.setOnClickListener(v12 -> {
|
||||||
|
bmListener.onButtonClicked("closedPr");
|
||||||
|
dismiss();
|
||||||
|
});
|
||||||
|
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface BottomSheetListener {
|
||||||
|
|
||||||
|
void onButtonClicked(String text);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(@NonNull Context context) {
|
||||||
|
|
||||||
|
super.onAttach(context);
|
||||||
|
|
||||||
|
try {
|
||||||
|
bmListener = (BottomSheetPullRequestFilterFragment.BottomSheetListener) context;
|
||||||
|
}
|
||||||
|
catch(ClassCastException e) {
|
||||||
|
throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,5 +1,7 @@
|
||||||
package org.mian.gitnex.fragments;
|
package org.mian.gitnex.fragments;
|
||||||
|
|
||||||
|
import android.content.ClipData;
|
||||||
|
import android.content.ClipboardManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
@ -7,6 +9,8 @@ import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
|
||||||
import org.mian.gitnex.R;
|
import org.mian.gitnex.R;
|
||||||
import org.mian.gitnex.actions.IssueActions;
|
import org.mian.gitnex.actions.IssueActions;
|
||||||
|
@ -17,10 +21,6 @@ import org.mian.gitnex.activities.FileDiffActivity;
|
||||||
import org.mian.gitnex.activities.MergePullRequestActivity;
|
import org.mian.gitnex.activities.MergePullRequestActivity;
|
||||||
import org.mian.gitnex.helpers.Toasty;
|
import org.mian.gitnex.helpers.Toasty;
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import android.content.ClipboardManager;
|
|
||||||
import android.content.ClipData;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -56,7 +56,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
copyIssueUrl.setText(R.string.copyPrUrlText);
|
copyIssueUrl.setText(R.string.copyPrUrlText);
|
||||||
shareIssue.setText(R.string.sharePr);
|
shareIssue.setText(R.string.sharePr);
|
||||||
|
|
||||||
if(tinyDB.getBoolean("prMerged")) {
|
if(tinyDB.getBoolean("prMerged") || tinyDB.getString("repoPrState").equals("closed")) {
|
||||||
mergePullRequest.setVisibility(View.GONE);
|
mergePullRequest.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -78,6 +78,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
mergePullRequest.setOnClickListener(new View.OnClickListener() {
|
mergePullRequest.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
|
@ -88,6 +89,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
});
|
});
|
||||||
|
|
||||||
openFilesDiff.setOnClickListener(new View.OnClickListener() {
|
openFilesDiff.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
|
@ -98,6 +100,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
});
|
});
|
||||||
|
|
||||||
editIssue.setOnClickListener(new View.OnClickListener() {
|
editIssue.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
|
@ -108,6 +111,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
});
|
});
|
||||||
|
|
||||||
editLabels.setOnClickListener(new View.OnClickListener() {
|
editLabels.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
|
@ -118,6 +122,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
});
|
});
|
||||||
|
|
||||||
addRemoveAssignees.setOnClickListener(new View.OnClickListener() {
|
addRemoveAssignees.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
|
@ -151,6 +156,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
|
||||||
});
|
});
|
||||||
|
|
||||||
copyIssueUrl.setOnClickListener(new View.OnClickListener() {
|
copyIssueUrl.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
|
|
|
@ -4,14 +4,6 @@ import android.annotation.SuppressLint;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.lifecycle.Observer;
|
|
||||||
import androidx.lifecycle.ViewModelProvider;
|
|
||||||
import androidx.recyclerview.widget.DividerItemDecoration;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuInflater;
|
import android.view.MenuInflater;
|
||||||
|
@ -22,12 +14,19 @@ import android.view.inputmethod.EditorInfo;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.lifecycle.Observer;
|
||||||
|
import androidx.lifecycle.ViewModelProvider;
|
||||||
|
import androidx.recyclerview.widget.DividerItemDecoration;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
import org.mian.gitnex.R;
|
import org.mian.gitnex.R;
|
||||||
import org.mian.gitnex.activities.FileViewActivity;
|
import org.mian.gitnex.activities.FileViewActivity;
|
||||||
import org.mian.gitnex.adapters.FilesAdapter;
|
import org.mian.gitnex.adapters.FilesAdapter;
|
||||||
import org.mian.gitnex.helpers.Authorization;
|
import org.mian.gitnex.helpers.Authorization;
|
||||||
import org.mian.gitnex.models.Files;
|
import org.mian.gitnex.models.Files;
|
||||||
import org.mian.gitnex.util.AppUtil;
|
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import org.mian.gitnex.viewmodels.FilesViewModel;
|
import org.mian.gitnex.viewmodels.FilesViewModel;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -60,9 +59,11 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
private OnFragmentInteractionListener mListener;
|
private OnFragmentInteractionListener mListener;
|
||||||
|
|
||||||
public FilesFragment() {
|
public FilesFragment() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static FilesFragment newInstance(String param1, String param2) {
|
public static FilesFragment newInstance(String param1, String param2) {
|
||||||
|
|
||||||
FilesFragment fragment = new FilesFragment();
|
FilesFragment fragment = new FilesFragment();
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putString(repoOwnerF, param1);
|
args.putString(repoOwnerF, param1);
|
||||||
|
@ -73,6 +74,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
if(getArguments() != null) {
|
if(getArguments() != null) {
|
||||||
repoName = getArguments().getString(repoNameF);
|
repoName = getArguments().getString(repoNameF);
|
||||||
|
@ -81,8 +83,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
View v = inflater.inflate(R.layout.fragment_files, container, false);
|
View v = inflater.inflate(R.layout.fragment_files, container, false);
|
||||||
setHasOptionsMenu(true);
|
setHasOptionsMenu(true);
|
||||||
|
@ -100,16 +101,13 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
mRecyclerView.setHasFixedSize(true);
|
mRecyclerView.setHasFixedSize(true);
|
||||||
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
|
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
|
||||||
DividerItemDecoration.VERTICAL);
|
|
||||||
mRecyclerView.addItemDecoration(dividerItemDecoration);
|
mRecyclerView.addItemDecoration(dividerItemDecoration);
|
||||||
|
|
||||||
mProgressBar = v.findViewById(R.id.progress_bar);
|
mProgressBar = v.findViewById(R.id.progress_bar);
|
||||||
|
|
||||||
mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
|
mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
|
||||||
mBreadcrumbsView.setItems(new ArrayList<>(Arrays.asList(
|
mBreadcrumbsView.setItems(new ArrayList<>(Arrays.asList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot)))));
|
||||||
BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot))
|
|
||||||
)));
|
|
||||||
|
|
||||||
fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
|
fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
|
||||||
|
|
||||||
|
@ -118,10 +116,12 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
|
|
||||||
super.onResume();
|
super.onResume();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static BreadcrumbItem createItem(String title) {
|
private static BreadcrumbItem createItem(String title) {
|
||||||
|
|
||||||
List<String> list = new ArrayList<>();
|
List<String> list = new ArrayList<>();
|
||||||
list.add(title);
|
list.add(title);
|
||||||
return new BreadcrumbItem(list);
|
return new BreadcrumbItem(list);
|
||||||
|
@ -148,6 +148,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
mBreadcrumbsView.addItem(createItem(dirName));
|
mBreadcrumbsView.addItem(createItem(dirName));
|
||||||
//noinspection unchecked
|
//noinspection unchecked
|
||||||
mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
|
mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
|
||||||
|
|
||||||
@SuppressLint("SetTextI18n")
|
@SuppressLint("SetTextI18n")
|
||||||
@Override
|
@Override
|
||||||
public void onNavigateBack(BreadcrumbItem item, int position) {
|
public void onNavigateBack(BreadcrumbItem item, int position) {
|
||||||
|
@ -203,8 +204,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
|
FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
|
||||||
|
|
||||||
filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Files>>() {
|
filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Files>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onChanged(@Nullable List<Files> filesListMain) {
|
public void onChanged(@Nullable List<Files> filesListMain) {
|
||||||
|
|
||||||
adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
|
adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
|
||||||
|
|
||||||
mBreadcrumbsView.removeItemAfter(1);
|
mBreadcrumbsView.removeItemAfter(1);
|
||||||
|
@ -236,8 +239,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
|
FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
|
||||||
|
|
||||||
filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, getContext()).observe(this, new Observer<List<Files>>() {
|
filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, getContext()).observe(this, new Observer<List<Files>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onChanged(@Nullable List<Files> filesListMain2) {
|
public void onChanged(@Nullable List<Files> filesListMain2) {
|
||||||
|
|
||||||
adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
|
adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
|
||||||
if(adapter.getItemCount() > 0) {
|
if(adapter.getItemCount() > 0) {
|
||||||
mRecyclerView.setVisibility(View.VISIBLE);
|
mRecyclerView.setVisibility(View.VISIBLE);
|
||||||
|
@ -262,28 +267,24 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
@Override
|
@Override
|
||||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
||||||
|
|
||||||
boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
|
|
||||||
|
|
||||||
inflater.inflate(R.menu.search_menu, menu);
|
inflater.inflate(R.menu.search_menu, menu);
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
|
|
||||||
MenuItem searchItem = menu.findItem(R.id.action_search);
|
MenuItem searchItem = menu.findItem(R.id.action_search);
|
||||||
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
||||||
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
||||||
//searchView.setQueryHint(getContext().getString(R.string.search));
|
|
||||||
|
|
||||||
/*if(!connToInternet) {
|
|
||||||
return;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onQueryTextSubmit(String query) {
|
public boolean onQueryTextSubmit(String query) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onQueryTextChange(String newText) {
|
public boolean onQueryTextChange(String newText) {
|
||||||
|
|
||||||
if(mRecyclerView.getAdapter() != null) {
|
if(mRecyclerView.getAdapter() != null) {
|
||||||
adapter.getFilter().filter(newText);
|
adapter.getFilter().filter(newText);
|
||||||
}
|
}
|
||||||
|
@ -294,6 +295,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onButtonPressed(Uri uri) {
|
public void onButtonPressed(Uri uri) {
|
||||||
|
|
||||||
if(mListener != null) {
|
if(mListener != null) {
|
||||||
mListener.onFragmentInteraction(uri);
|
mListener.onFragmentInteraction(uri);
|
||||||
}
|
}
|
||||||
|
@ -301,11 +303,15 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDetach() {
|
public void onDetach() {
|
||||||
|
|
||||||
super.onDetach();
|
super.onDetach();
|
||||||
mListener = null;
|
mListener = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface OnFragmentInteractionListener {
|
public interface OnFragmentInteractionListener {
|
||||||
|
|
||||||
void onFragmentInteraction(Uri uri);
|
void onFragmentInteraction(Uri uri);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,311 +0,0 @@
|
||||||
package org.mian.gitnex.fragments;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuInflater;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.inputmethod.EditorInfo;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import org.mian.gitnex.R;
|
|
||||||
import org.mian.gitnex.clients.RetrofitClient;
|
|
||||||
import org.mian.gitnex.helpers.StaticGlobalVariables;
|
|
||||||
import org.mian.gitnex.helpers.VersionCheck;
|
|
||||||
import org.mian.gitnex.adapters.IssuesAdapter;
|
|
||||||
import org.mian.gitnex.models.Issues;
|
|
||||||
import org.mian.gitnex.util.TinyDB;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.DefaultItemAnimator;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
|
||||||
import com.mikepenz.fastadapter.IItemAdapter;
|
|
||||||
import com.mikepenz.fastadapter.adapters.ItemAdapter;
|
|
||||||
import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
|
|
||||||
import com.mikepenz.fastadapter.listeners.ItemFilterListener;
|
|
||||||
import com.mikepenz.fastadapter_extensions.items.ProgressItem;
|
|
||||||
import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
|
|
||||||
import retrofit2.Call;
|
|
||||||
import retrofit2.Callback;
|
|
||||||
import retrofit2.Response;
|
|
||||||
import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Author M M Arif
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class IssuesClosedFragment extends Fragment implements ItemFilterListener<IssuesAdapter> {
|
|
||||||
|
|
||||||
private Context ctx;
|
|
||||||
private ProgressBar mProgressBarClosed;
|
|
||||||
private boolean loadNextFlag = false;
|
|
||||||
private String TAG = StaticGlobalVariables.tagIssuesListClosed;
|
|
||||||
private TextView noDataIssuesClosed;
|
|
||||||
private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
|
|
||||||
private String requestType = StaticGlobalVariables.issuesRequestType;
|
|
||||||
private String issueState = StaticGlobalVariables.issueStateClosed;
|
|
||||||
|
|
||||||
private List<IssuesAdapter> items = new ArrayList<>();
|
|
||||||
private FastItemAdapter<IssuesAdapter> fastItemAdapter;
|
|
||||||
private ItemAdapter footerAdapter;
|
|
||||||
private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
final View v = inflater.inflate(R.layout.fragment_issues_closed, container, false);
|
|
||||||
setHasOptionsMenu(true);
|
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(getContext());
|
|
||||||
final String instanceUrl = tinyDb.getString("instanceUrl");
|
|
||||||
final String loginUid = tinyDb.getString("loginUid");
|
|
||||||
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
|
||||||
String repoFullName = tinyDb.getString("repoFullName");
|
|
||||||
String[] parts = repoFullName.split("/");
|
|
||||||
final String repoOwner = parts[0];
|
|
||||||
final String repoName = parts[1];
|
|
||||||
|
|
||||||
if (VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
|
|
||||||
resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
|
|
||||||
}
|
|
||||||
|
|
||||||
noDataIssuesClosed = v.findViewById(R.id.noDataIssuesClosed);
|
|
||||||
mProgressBarClosed = v.findViewById(R.id.progress_barClosed);
|
|
||||||
final SwipeRefreshLayout swipeRefreshLayout = v.findViewById(R.id.pullToRefreshClosed);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = v.findViewById(R.id.recyclerViewClosed);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
recyclerView.setHasFixedSize(true);
|
|
||||||
|
|
||||||
fastItemAdapter = new FastItemAdapter<>();
|
|
||||||
fastItemAdapter.withSelectable(true);
|
|
||||||
|
|
||||||
footerAdapter = items();
|
|
||||||
//noinspection unchecked
|
|
||||||
fastItemAdapter.addAdapter(StaticGlobalVariables.issuesPageInit, footerAdapter);
|
|
||||||
|
|
||||||
fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<IssuesAdapter>) (item, constraint) -> item.getIssueTitle().toLowerCase().contains(constraint.toString().toLowerCase()));
|
|
||||||
|
|
||||||
fastItemAdapter.getItemFilter().withItemFilterListener(this);
|
|
||||||
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
recyclerView.setItemAnimator(new DefaultItemAnimator());
|
|
||||||
recyclerView.setAdapter(fastItemAdapter);
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLoadMore(final int currentPage) {
|
|
||||||
|
|
||||||
loadNext(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, issueState, requestType, currentPage);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
swipeRefreshLayout.setOnRefreshListener(() -> {
|
|
||||||
|
|
||||||
mProgressBarClosed.setVisibility(View.VISIBLE);
|
|
||||||
fastItemAdapter.clear();
|
|
||||||
endlessRecyclerOnScrollListener.resetPageCount();
|
|
||||||
swipeRefreshLayout.setRefreshing(false);
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
|
|
||||||
|
|
||||||
loadInitial(instanceUrl, instanceToken, repoOwner, repoName, issueState, resultLimit, requestType);
|
|
||||||
|
|
||||||
fastItemAdapter.withEventHook(new IssuesAdapter.IssueTitleClickEvent());
|
|
||||||
|
|
||||||
assert savedInstanceState != null;
|
|
||||||
fastItemAdapter.withSavedInstanceState(savedInstanceState);
|
|
||||||
|
|
||||||
return v;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
|
|
||||||
super.onResume();
|
|
||||||
TinyDB tinyDb = new TinyDB(getContext());
|
|
||||||
|
|
||||||
if(tinyDb.getBoolean("resumeClosedIssues")) {
|
|
||||||
|
|
||||||
mProgressBarClosed.setVisibility(View.VISIBLE);
|
|
||||||
fastItemAdapter.clear();
|
|
||||||
endlessRecyclerOnScrollListener.resetPageCount();
|
|
||||||
tinyDb.putBoolean("resumeClosedIssues", false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, String issueState, int resultLimit, String requestType) {
|
|
||||||
|
|
||||||
Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getClosedIssues(token, repoOwner, repoName, 1, issueState, resultLimit, requestType);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<List<Issues>>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
|
|
||||||
|
|
||||||
if(response.isSuccessful()) {
|
|
||||||
|
|
||||||
assert response.body() != null;
|
|
||||||
if(response.body().size() > 0) {
|
|
||||||
|
|
||||||
if(response.body().size() == resultLimit) {
|
|
||||||
loadNextFlag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(int i = 0; i < response.body().size(); i++) {
|
|
||||||
items.add(new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
|
|
||||||
}
|
|
||||||
|
|
||||||
fastItemAdapter.add(items);
|
|
||||||
noDataIssuesClosed.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
noDataIssuesClosed.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
mProgressBarClosed.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Log.i(TAG, String.valueOf(response.code()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
|
|
||||||
|
|
||||||
Log.e(TAG, t.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String issueState, String requestType, final int currentPage) {
|
|
||||||
|
|
||||||
footerAdapter.clear();
|
|
||||||
//noinspection unchecked
|
|
||||||
footerAdapter.add(new ProgressItem().withEnabled(false));
|
|
||||||
Handler handler = new Handler();
|
|
||||||
|
|
||||||
handler.postDelayed(() -> {
|
|
||||||
|
|
||||||
Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getClosedIssues(token, repoOwner, repoName, currentPage + 1, issueState, resultLimit, requestType);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<List<Issues>>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
|
|
||||||
|
|
||||||
if(response.isSuccessful()) {
|
|
||||||
|
|
||||||
assert response.body() != null;
|
|
||||||
|
|
||||||
if(response.body().size() > 0) {
|
|
||||||
|
|
||||||
loadNextFlag = response.body().size() == resultLimit;
|
|
||||||
|
|
||||||
for(int i = 0; i < response.body().size(); i++) {
|
|
||||||
|
|
||||||
fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
footerAdapter.clear();
|
|
||||||
mProgressBarClosed.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
footerAdapter.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
mProgressBarClosed.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Log.i(TAG, String.valueOf(response.code()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
|
|
||||||
|
|
||||||
Log.i(TAG, t.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
if(!loadNextFlag) {
|
|
||||||
footerAdapter.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
|
||||||
|
|
||||||
inflater.inflate(R.menu.search_menu, menu);
|
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
|
||||||
|
|
||||||
MenuItem searchItem = menu.findItem(R.id.action_search);
|
|
||||||
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
|
||||||
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
|
||||||
|
|
||||||
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onQueryTextSubmit(String query) {
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onQueryTextChange(String newText) {
|
|
||||||
|
|
||||||
fastItemAdapter.filter(newText);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener.enable();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<IssuesAdapter> results) {
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener.disable();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onReset() {
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener.enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
312
app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
Normal file
312
app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
Normal file
|
@ -0,0 +1,312 @@
|
||||||
|
package org.mian.gitnex.fragments;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.view.inputmethod.EditorInfo;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||||
|
import org.mian.gitnex.R;
|
||||||
|
import org.mian.gitnex.activities.RepoDetailActivity;
|
||||||
|
import org.mian.gitnex.adapters.IssuesAdapter;
|
||||||
|
import org.mian.gitnex.clients.IssuesService;
|
||||||
|
import org.mian.gitnex.helpers.Authorization;
|
||||||
|
import org.mian.gitnex.helpers.StaticGlobalVariables;
|
||||||
|
import org.mian.gitnex.helpers.Toasty;
|
||||||
|
import org.mian.gitnex.helpers.VersionCheck;
|
||||||
|
import org.mian.gitnex.interfaces.ApiInterface;
|
||||||
|
import org.mian.gitnex.models.Issues;
|
||||||
|
import org.mian.gitnex.util.TinyDB;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import retrofit2.Call;
|
||||||
|
import retrofit2.Callback;
|
||||||
|
import retrofit2.Response;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Author M M Arif
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class IssuesFragment extends Fragment {
|
||||||
|
|
||||||
|
private Menu menu;
|
||||||
|
private RecyclerView recyclerView;
|
||||||
|
private List<Issues> issuesList;
|
||||||
|
private IssuesAdapter adapter;
|
||||||
|
private ApiInterface api;
|
||||||
|
private Context context;
|
||||||
|
private int pageSize = StaticGlobalVariables.issuesPageInit;
|
||||||
|
private ProgressBar mProgressBar;
|
||||||
|
private String TAG = StaticGlobalVariables.tagIssuesList;
|
||||||
|
private TextView noDataIssues;
|
||||||
|
private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
|
||||||
|
private String requestType = StaticGlobalVariables.issuesRequestType;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||||
|
|
||||||
|
final View v = inflater.inflate(R.layout.fragment_issues, container, false);
|
||||||
|
setHasOptionsMenu(true);
|
||||||
|
context = getContext();
|
||||||
|
|
||||||
|
TinyDB tinyDb = new TinyDB(getContext());
|
||||||
|
String repoFullName = tinyDb.getString("repoFullName");
|
||||||
|
String[] parts = repoFullName.split("/");
|
||||||
|
final String repoOwner = parts[0];
|
||||||
|
final String repoName = parts[1];
|
||||||
|
final String instanceUrl = tinyDb.getString("instanceUrl");
|
||||||
|
final String loginUid = tinyDb.getString("loginUid");
|
||||||
|
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
||||||
|
|
||||||
|
final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
|
||||||
|
|
||||||
|
// if gitea is 1.12 or higher use the new limit
|
||||||
|
if(VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
|
||||||
|
resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
|
||||||
|
}
|
||||||
|
|
||||||
|
recyclerView = v.findViewById(R.id.recyclerView);
|
||||||
|
issuesList = new ArrayList<>();
|
||||||
|
|
||||||
|
mProgressBar = v.findViewById(R.id.progress_bar);
|
||||||
|
noDataIssues = v.findViewById(R.id.noDataIssues);
|
||||||
|
|
||||||
|
swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
|
||||||
|
|
||||||
|
swipeRefresh.setRefreshing(false);
|
||||||
|
loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
|
||||||
|
adapter.notifyDataChanged();
|
||||||
|
|
||||||
|
}, 200));
|
||||||
|
|
||||||
|
adapter = new IssuesAdapter(getContext(), issuesList);
|
||||||
|
adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
|
||||||
|
|
||||||
|
if(issuesList.size() == resultLimit || pageSize == resultLimit) {
|
||||||
|
|
||||||
|
int page = (issuesList.size() + resultLimit) / resultLimit;
|
||||||
|
loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
recyclerView.setHasFixedSize(true);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(context));
|
||||||
|
recyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
|
((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListener(issueState -> {
|
||||||
|
|
||||||
|
if(issueState.equals("closed")) {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
issuesList.clear();
|
||||||
|
adapter = new IssuesAdapter(getContext(), issuesList);
|
||||||
|
tinyDb.putString("repoIssuesState", issueState);
|
||||||
|
mProgressBar.setVisibility(View.VISIBLE);
|
||||||
|
noDataIssues.setVisibility(View.GONE);
|
||||||
|
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, issueState);
|
||||||
|
recyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
|
||||||
|
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
|
||||||
|
|
||||||
|
return v;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
|
||||||
|
super.onResume();
|
||||||
|
TinyDB tinyDb = new TinyDB(getContext());
|
||||||
|
final String loginUid = tinyDb.getString("loginUid");
|
||||||
|
String repoFullName = tinyDb.getString("repoFullName");
|
||||||
|
String[] parts = repoFullName.split("/");
|
||||||
|
final String repoOwner = parts[0];
|
||||||
|
final String repoName = parts[1];
|
||||||
|
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
||||||
|
|
||||||
|
if(tinyDb.getBoolean("resumeIssues")) {
|
||||||
|
|
||||||
|
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
|
||||||
|
tinyDb.putBoolean("resumeIssues", false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String requestType, String issueState) {
|
||||||
|
|
||||||
|
Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, 1, resultLimit, requestType, issueState);
|
||||||
|
|
||||||
|
call.enqueue(new Callback<List<Issues>>() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
|
||||||
|
|
||||||
|
if(response.isSuccessful()) {
|
||||||
|
|
||||||
|
assert response.body() != null;
|
||||||
|
if(response.body().size() > 0) {
|
||||||
|
|
||||||
|
issuesList.clear();
|
||||||
|
issuesList.addAll(response.body());
|
||||||
|
adapter.notifyDataChanged();
|
||||||
|
noDataIssues.setVisibility(View.GONE);
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
issuesList.clear();
|
||||||
|
adapter.notifyDataChanged();
|
||||||
|
noDataIssues.setVisibility(View.VISIBLE);
|
||||||
|
}
|
||||||
|
mProgressBar.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Log.e(TAG, String.valueOf(response.code()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
|
Log.e(TAG, t.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType, String issueState) {
|
||||||
|
|
||||||
|
//add loading progress view
|
||||||
|
issuesList.add(new Issues("load"));
|
||||||
|
adapter.notifyItemInserted((issuesList.size() - 1));
|
||||||
|
|
||||||
|
Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page, resultLimit, requestType, issueState);
|
||||||
|
|
||||||
|
call.enqueue(new Callback<List<Issues>>() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
|
||||||
|
|
||||||
|
if(response.isSuccessful()) {
|
||||||
|
|
||||||
|
//remove loading view
|
||||||
|
issuesList.remove(issuesList.size() - 1);
|
||||||
|
|
||||||
|
List<Issues> result = response.body();
|
||||||
|
|
||||||
|
assert result != null;
|
||||||
|
if(result.size() > 0) {
|
||||||
|
|
||||||
|
pageSize = result.size();
|
||||||
|
issuesList.addAll(result);
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
Toasty.info(context, getString(R.string.noMoreData));
|
||||||
|
adapter.setMoreDataAvailable(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
adapter.notifyDataChanged();
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
Log.e(TAG, String.valueOf(response.code()));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
|
Log.e(TAG, t.toString());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
||||||
|
|
||||||
|
this.menu = menu;
|
||||||
|
inflater.inflate(R.menu.search_menu, menu);
|
||||||
|
inflater.inflate(R.menu.filter_menu, menu);
|
||||||
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
|
|
||||||
|
TinyDB tinyDb = new TinyDB(context);
|
||||||
|
|
||||||
|
if(tinyDb.getString("repoIssuesState").equals("closed")) {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
MenuItem searchItem = menu.findItem(R.id.action_search);
|
||||||
|
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
||||||
|
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
||||||
|
|
||||||
|
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onQueryTextSubmit(String query) {
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onQueryTextChange(String newText) {
|
||||||
|
|
||||||
|
filter(newText);
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void filter(String text) {
|
||||||
|
|
||||||
|
List<Issues> arr = new ArrayList<>();
|
||||||
|
|
||||||
|
for(Issues d : issuesList) {
|
||||||
|
if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text)) {
|
||||||
|
arr.add(d);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
adapter.updateList(arr);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,155 +0,0 @@
|
||||||
package org.mian.gitnex.fragments;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.Typeface;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.fragment.app.FragmentManager;
|
|
||||||
import androidx.fragment.app.FragmentStatePagerAdapter;
|
|
||||||
import androidx.viewpager.widget.ViewPager;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuInflater;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import com.google.android.material.tabs.TabLayout;
|
|
||||||
import org.mian.gitnex.R;
|
|
||||||
import org.mian.gitnex.util.TinyDB;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Author M M Arif
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class IssuesMainFragment extends Fragment {
|
|
||||||
|
|
||||||
private Context ctx;
|
|
||||||
|
|
||||||
public IssuesMainFragment() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
View v = inflater.inflate(R.layout.fragment_issues_main, container, false);
|
|
||||||
setHasOptionsMenu(true);
|
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(getContext());
|
|
||||||
|
|
||||||
SectionsPagerAdapter mSectionsPagerAdapter = new IssuesMainFragment.SectionsPagerAdapter(getChildFragmentManager());
|
|
||||||
|
|
||||||
ViewPager mViewPager = v.findViewById(R.id.issuesContainer);
|
|
||||||
mViewPager.setAdapter(mSectionsPagerAdapter);
|
|
||||||
|
|
||||||
Typeface myTypeface;
|
|
||||||
if(tinyDb.getInt("customFontId") == 0) {
|
|
||||||
|
|
||||||
myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
|
|
||||||
|
|
||||||
}
|
|
||||||
else if (tinyDb.getInt("customFontId") == 1) {
|
|
||||||
|
|
||||||
myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
|
|
||||||
|
|
||||||
}
|
|
||||||
else if (tinyDb.getInt("customFontId") == 2) {
|
|
||||||
|
|
||||||
myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
TabLayout tabLayout = v.findViewById(R.id.tabs);
|
|
||||||
|
|
||||||
ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
|
|
||||||
int tabsCount = vg.getChildCount();
|
|
||||||
|
|
||||||
for (int j = 0; j < tabsCount; j++) {
|
|
||||||
|
|
||||||
ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
|
|
||||||
int tabChildCount = vgTab.getChildCount();
|
|
||||||
|
|
||||||
for (int i = 0; i < tabChildCount; i++) {
|
|
||||||
|
|
||||||
View tabViewChild = vgTab.getChildAt(i);
|
|
||||||
if (tabViewChild instanceof TextView) {
|
|
||||||
((TextView) tabViewChild).setTypeface(myTypeface);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
|
|
||||||
tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
|
|
||||||
|
|
||||||
return v;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
|
|
||||||
|
|
||||||
SectionsPagerAdapter(FragmentManager fm) {
|
|
||||||
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public Fragment getItem(int position) {
|
|
||||||
|
|
||||||
Fragment fragment = null;
|
|
||||||
switch (position) {
|
|
||||||
case 0: // open issues
|
|
||||||
fragment = new IssuesOpenFragment();
|
|
||||||
break;
|
|
||||||
case 1: // closed issues
|
|
||||||
fragment = new IssuesClosedFragment();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
assert fragment != null;
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getCount() {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
|
||||||
|
|
||||||
menu.clear();
|
|
||||||
Objects.requireNonNull(getActivity()).getMenuInflater().inflate(R.menu.repo_dotted_menu, menu);
|
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
|
|
||||||
int id = item.getItemId();
|
|
||||||
|
|
||||||
switch (id) {
|
|
||||||
case android.R.id.home:
|
|
||||||
return true;
|
|
||||||
case R.id.repoMenu:
|
|
||||||
BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
|
|
||||||
bottomSheet.show(getChildFragmentManager(), "repoBottomSheet");
|
|
||||||
return true;
|
|
||||||
default:
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,308 +0,0 @@
|
||||||
package org.mian.gitnex.fragments;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.DefaultItemAnimator;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
|
||||||
import retrofit2.Call;
|
|
||||||
import retrofit2.Callback;
|
|
||||||
import retrofit2.Response;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuInflater;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.inputmethod.EditorInfo;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import com.mikepenz.fastadapter.IItemAdapter;
|
|
||||||
import com.mikepenz.fastadapter.adapters.ItemAdapter;
|
|
||||||
import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
|
|
||||||
import com.mikepenz.fastadapter.listeners.ItemFilterListener;
|
|
||||||
import com.mikepenz.fastadapter_extensions.items.ProgressItem;
|
|
||||||
import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
|
|
||||||
import org.mian.gitnex.R;
|
|
||||||
import org.mian.gitnex.clients.RetrofitClient;
|
|
||||||
import org.mian.gitnex.helpers.StaticGlobalVariables;
|
|
||||||
import org.mian.gitnex.helpers.VersionCheck;
|
|
||||||
import org.mian.gitnex.adapters.IssuesAdapter;
|
|
||||||
import org.mian.gitnex.models.Issues;
|
|
||||||
import org.mian.gitnex.util.TinyDB;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Author M M Arif
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class IssuesOpenFragment extends Fragment implements ItemFilterListener<IssuesAdapter> {
|
|
||||||
|
|
||||||
private ProgressBar mProgressBar;
|
|
||||||
private boolean loadNextFlag = false;
|
|
||||||
private String TAG = StaticGlobalVariables.tagIssuesListOpen;
|
|
||||||
private TextView noDataIssues;
|
|
||||||
private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
|
|
||||||
private String requestType = StaticGlobalVariables.issuesRequestType;
|
|
||||||
|
|
||||||
private List<IssuesAdapter> items = new ArrayList<>();
|
|
||||||
private FastItemAdapter<IssuesAdapter> fastItemAdapter;
|
|
||||||
private ItemAdapter footerAdapter;
|
|
||||||
private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
final View v = inflater.inflate(R.layout.fragment_issues, container, false);
|
|
||||||
setHasOptionsMenu(true);
|
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(getContext());
|
|
||||||
final String instanceUrl = tinyDb.getString("instanceUrl");
|
|
||||||
final String loginUid = tinyDb.getString("loginUid");
|
|
||||||
final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
|
||||||
String repoFullName = tinyDb.getString("repoFullName");
|
|
||||||
String[] parts = repoFullName.split("/");
|
|
||||||
final String repoOwner = parts[0];
|
|
||||||
final String repoName = parts[1];
|
|
||||||
|
|
||||||
if (VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
|
|
||||||
resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
|
|
||||||
}
|
|
||||||
|
|
||||||
noDataIssues = v.findViewById(R.id.noDataIssues);
|
|
||||||
mProgressBar = v.findViewById(R.id.progress_bar);
|
|
||||||
final SwipeRefreshLayout swipeRefreshLayout = v.findViewById(R.id.pullToRefresh);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = v.findViewById(R.id.recyclerView);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
recyclerView.setHasFixedSize(true);
|
|
||||||
|
|
||||||
fastItemAdapter = new FastItemAdapter<>();
|
|
||||||
fastItemAdapter.withSelectable(true);
|
|
||||||
|
|
||||||
footerAdapter = items();
|
|
||||||
//noinspection unchecked
|
|
||||||
fastItemAdapter.addAdapter(StaticGlobalVariables.issuesPageInit, footerAdapter);
|
|
||||||
|
|
||||||
fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<IssuesAdapter>) (item, constraint) -> item.getIssueTitle().toLowerCase().contains(constraint.toString().toLowerCase()));
|
|
||||||
|
|
||||||
fastItemAdapter.getItemFilter().withItemFilterListener(this);
|
|
||||||
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
recyclerView.setItemAnimator(new DefaultItemAnimator());
|
|
||||||
recyclerView.setAdapter(fastItemAdapter);
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLoadMore(final int currentPage) {
|
|
||||||
|
|
||||||
loadNext(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, requestType, currentPage);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
swipeRefreshLayout.setOnRefreshListener(() -> {
|
|
||||||
|
|
||||||
mProgressBar.setVisibility(View.VISIBLE);
|
|
||||||
fastItemAdapter.clear();
|
|
||||||
endlessRecyclerOnScrollListener.resetPageCount();
|
|
||||||
swipeRefreshLayout.setRefreshing(false);
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
|
|
||||||
|
|
||||||
loadInitial(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, requestType);
|
|
||||||
|
|
||||||
fastItemAdapter.withEventHook(new IssuesAdapter.IssueTitleClickEvent());
|
|
||||||
|
|
||||||
assert savedInstanceState != null;
|
|
||||||
fastItemAdapter.withSavedInstanceState(savedInstanceState);
|
|
||||||
|
|
||||||
return v;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
|
|
||||||
super.onResume();
|
|
||||||
TinyDB tinyDb = new TinyDB(getContext());
|
|
||||||
|
|
||||||
if(tinyDb.getBoolean("resumeIssues")) {
|
|
||||||
|
|
||||||
mProgressBar.setVisibility(View.VISIBLE);
|
|
||||||
fastItemAdapter.clear();
|
|
||||||
endlessRecyclerOnScrollListener.resetPageCount();
|
|
||||||
tinyDb.putBoolean("resumeIssues", false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String requestType) {
|
|
||||||
|
|
||||||
Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getIssues(token, repoOwner, repoName, 1, resultLimit, requestType);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<List<Issues>>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
|
|
||||||
|
|
||||||
if(response.isSuccessful()) {
|
|
||||||
|
|
||||||
assert response.body() != null;
|
|
||||||
if(response.body().size() > 0) {
|
|
||||||
|
|
||||||
if(response.body().size() == resultLimit) {
|
|
||||||
loadNextFlag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(int i = 0; i < response.body().size(); i++) {
|
|
||||||
items.add(new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
|
|
||||||
}
|
|
||||||
|
|
||||||
fastItemAdapter.add(items);
|
|
||||||
noDataIssues.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
noDataIssues.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
mProgressBar.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Log.i(TAG, String.valueOf(response.code()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
|
|
||||||
|
|
||||||
Log.e(TAG, t.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String requestType, final int currentPage) {
|
|
||||||
|
|
||||||
footerAdapter.clear();
|
|
||||||
//noinspection unchecked
|
|
||||||
footerAdapter.add(new ProgressItem().withEnabled(false));
|
|
||||||
Handler handler = new Handler();
|
|
||||||
|
|
||||||
handler.postDelayed(() -> {
|
|
||||||
|
|
||||||
Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getIssues(token, repoOwner, repoName, currentPage + 1, resultLimit, requestType);
|
|
||||||
|
|
||||||
call.enqueue(new Callback<List<Issues>>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
|
|
||||||
|
|
||||||
if(response.isSuccessful()) {
|
|
||||||
|
|
||||||
assert response.body() != null;
|
|
||||||
|
|
||||||
if(response.body().size() > 0) {
|
|
||||||
|
|
||||||
loadNextFlag = response.body().size() == resultLimit;
|
|
||||||
|
|
||||||
for(int i = 0; i < response.body().size(); i++) {
|
|
||||||
|
|
||||||
fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
footerAdapter.clear();
|
|
||||||
noDataIssues.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
footerAdapter.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
mProgressBar.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Log.i(TAG, String.valueOf(response.code()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
|
|
||||||
|
|
||||||
Log.i(TAG, t.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
if(!loadNextFlag) {
|
|
||||||
footerAdapter.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
|
||||||
|
|
||||||
inflater.inflate(R.menu.search_menu, menu);
|
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
|
||||||
|
|
||||||
MenuItem searchItem = menu.findItem(R.id.action_search);
|
|
||||||
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
|
||||||
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
|
||||||
|
|
||||||
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onQueryTextSubmit(String query) {
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onQueryTextChange(String newText) {
|
|
||||||
|
|
||||||
fastItemAdapter.filter(newText);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener.enable();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<IssuesAdapter> results) {
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener.disable();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onReset() {
|
|
||||||
|
|
||||||
endlessRecyclerOnScrollListener.enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -2,13 +2,6 @@ package org.mian.gitnex.fragments;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.DividerItemDecoration;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
@ -20,14 +13,23 @@ import android.view.ViewGroup;
|
||||||
import android.view.inputmethod.EditorInfo;
|
import android.view.inputmethod.EditorInfo;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.DividerItemDecoration;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||||
import org.mian.gitnex.R;
|
import org.mian.gitnex.R;
|
||||||
|
import org.mian.gitnex.activities.RepoDetailActivity;
|
||||||
import org.mian.gitnex.adapters.PullRequestsAdapter;
|
import org.mian.gitnex.adapters.PullRequestsAdapter;
|
||||||
import org.mian.gitnex.clients.PullRequestsService;
|
import org.mian.gitnex.clients.PullRequestsService;
|
||||||
import org.mian.gitnex.helpers.Authorization;
|
import org.mian.gitnex.helpers.Authorization;
|
||||||
|
import org.mian.gitnex.helpers.StaticGlobalVariables;
|
||||||
import org.mian.gitnex.helpers.Toasty;
|
import org.mian.gitnex.helpers.Toasty;
|
||||||
|
import org.mian.gitnex.helpers.VersionCheck;
|
||||||
import org.mian.gitnex.interfaces.ApiInterface;
|
import org.mian.gitnex.interfaces.ApiInterface;
|
||||||
import org.mian.gitnex.models.PullRequests;
|
import org.mian.gitnex.models.PullRequests;
|
||||||
import org.mian.gitnex.util.AppUtil;
|
|
||||||
import org.mian.gitnex.util.TinyDB;
|
import org.mian.gitnex.util.TinyDB;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -42,17 +44,17 @@ import retrofit2.Response;
|
||||||
|
|
||||||
public class PullRequestsFragment extends Fragment {
|
public class PullRequestsFragment extends Fragment {
|
||||||
|
|
||||||
|
private Menu menu;
|
||||||
private ProgressBar mProgressBar;
|
private ProgressBar mProgressBar;
|
||||||
private RecyclerView recyclerView;
|
private RecyclerView recyclerView;
|
||||||
private List<PullRequests> prList;
|
private List<PullRequests> prList;
|
||||||
private PullRequestsAdapter adapter;
|
private PullRequestsAdapter adapter;
|
||||||
private ApiInterface apiPR;
|
private ApiInterface apiPR;
|
||||||
private String TAG = "PullRequestsListFragment - ";
|
private String TAG = StaticGlobalVariables.tagPullRequestsList;
|
||||||
private Context context;
|
private Context context;
|
||||||
private int pageSize = 1;
|
private int pageSize = StaticGlobalVariables.prPageInit;
|
||||||
private TextView noData;
|
private TextView noData;
|
||||||
private String prState = "open";
|
private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
|
||||||
private int resultLimit = 50;
|
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
|
@ -60,10 +62,10 @@ public class PullRequestsFragment extends Fragment {
|
||||||
|
|
||||||
final View v = inflater.inflate(R.layout.fragment_pull_requests, container, false);
|
final View v = inflater.inflate(R.layout.fragment_pull_requests, container, false);
|
||||||
setHasOptionsMenu(true);
|
setHasOptionsMenu(true);
|
||||||
|
context = getContext();
|
||||||
|
|
||||||
TinyDB tinyDb = new TinyDB(getContext());
|
TinyDB tinyDb = new TinyDB(getContext());
|
||||||
String repoFullName = tinyDb.getString("repoFullName");
|
String repoFullName = tinyDb.getString("repoFullName");
|
||||||
//Log.i("repoFullName", tinyDb.getString("repoFullName"));
|
|
||||||
String[] parts = repoFullName.split("/");
|
String[] parts = repoFullName.split("/");
|
||||||
final String repoOwner = parts[0];
|
final String repoOwner = parts[0];
|
||||||
final String repoName = parts[1];
|
final String repoName = parts[1];
|
||||||
|
@ -73,63 +75,64 @@ public class PullRequestsFragment extends Fragment {
|
||||||
|
|
||||||
final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
|
final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
|
||||||
|
|
||||||
context = getContext();
|
// if gitea is 1.12 or higher use the new limit
|
||||||
|
if(VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
|
||||||
|
resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
|
||||||
|
}
|
||||||
|
|
||||||
recyclerView = v.findViewById(R.id.recyclerView);
|
recyclerView = v.findViewById(R.id.recyclerView);
|
||||||
prList = new ArrayList<>();
|
prList = new ArrayList<>();
|
||||||
|
|
||||||
mProgressBar = v.findViewById(R.id.progress_bar);
|
mProgressBar = v.findViewById(R.id.progress_bar);
|
||||||
noData = v.findViewById(R.id.noData);
|
noData = v.findViewById(R.id.noData);
|
||||||
|
|
||||||
swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
|
swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
|
||||||
@Override
|
|
||||||
public void onRefresh() {
|
|
||||||
new Handler().postDelayed(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
|
|
||||||
swipeRefresh.setRefreshing(false);
|
swipeRefresh.setRefreshing(false);
|
||||||
loadInitial(instanceToken, repoOwner, repoName, pageSize, prState, resultLimit);
|
loadInitial(instanceToken, repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit);
|
||||||
adapter.notifyDataChanged();
|
adapter.notifyDataChanged();
|
||||||
|
|
||||||
}
|
}, 200));
|
||||||
}, 200);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
adapter = new PullRequestsAdapter(getContext(), prList);
|
adapter = new PullRequestsAdapter(getContext(), prList);
|
||||||
adapter.setLoadMoreListener(new PullRequestsAdapter.OnLoadMoreListener() {
|
adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
|
||||||
@Override
|
|
||||||
public void onLoadMore() {
|
|
||||||
|
|
||||||
recyclerView.post(new Runnable() {
|
if(prList.size() == 10 || pageSize == resultLimit) {
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
if(prList.size() == 10 || pageSize == 10) {
|
|
||||||
|
|
||||||
int page = (prList.size() + 10) / 10;
|
int page = (prList.size() + resultLimit) / resultLimit;
|
||||||
loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState, resultLimit);
|
loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, tinyDb.getString("repoPrState"), resultLimit);
|
||||||
|
|
||||||
}
|
}
|
||||||
/*else {
|
|
||||||
|
|
||||||
Toasty.info(context, getString(R.string.noMoreData));
|
}));
|
||||||
|
|
||||||
}*/
|
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
|
|
||||||
DividerItemDecoration.VERTICAL);
|
|
||||||
recyclerView.setHasFixedSize(true);
|
recyclerView.setHasFixedSize(true);
|
||||||
recyclerView.addItemDecoration(dividerItemDecoration);
|
recyclerView.addItemDecoration(dividerItemDecoration);
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(context));
|
recyclerView.setLayoutManager(new LinearLayoutManager(context));
|
||||||
recyclerView.setAdapter(adapter);
|
recyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, getContext());
|
((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerPr(prState -> {
|
||||||
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
|
|
||||||
|
if(prState.equals("closed")) {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
prList.clear();
|
||||||
|
adapter = new PullRequestsAdapter(context, prList);
|
||||||
|
tinyDb.putString("repoPrState", prState);
|
||||||
|
mProgressBar.setVisibility(View.VISIBLE);
|
||||||
|
noData.setVisibility(View.GONE);
|
||||||
|
loadInitial(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
|
||||||
|
recyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, context);
|
||||||
|
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit);
|
||||||
|
|
||||||
return v;
|
return v;
|
||||||
|
|
||||||
|
@ -149,7 +152,7 @@ public class PullRequestsFragment extends Fragment {
|
||||||
|
|
||||||
if(tinyDb.getBoolean("resumePullRequests")) {
|
if(tinyDb.getBoolean("resumePullRequests")) {
|
||||||
|
|
||||||
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
|
loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit);
|
||||||
tinyDb.putBoolean("resumePullRequests", false);
|
tinyDb.putBoolean("resumePullRequests", false);
|
||||||
tinyDb.putBoolean("prMerged", false);
|
tinyDb.putBoolean("prMerged", false);
|
||||||
|
|
||||||
|
@ -188,12 +191,13 @@ public class PullRequestsFragment extends Fragment {
|
||||||
Log.i(TAG, String.valueOf(response.code()));
|
Log.i(TAG, String.valueOf(response.code()));
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.i("http", String.valueOf(response.code()));
|
Log.i(TAG, String.valueOf(response.code()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(@NonNull Call<List<PullRequests>> call, @NonNull Throwable t) {
|
public void onFailure(@NonNull Call<List<PullRequests>> call, @NonNull Throwable t) {
|
||||||
|
|
||||||
Log.e(TAG, t.toString());
|
Log.e(TAG, t.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,31 +263,36 @@ public class PullRequestsFragment extends Fragment {
|
||||||
@Override
|
@Override
|
||||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
||||||
|
|
||||||
boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
|
this.menu = menu;
|
||||||
|
|
||||||
inflater.inflate(R.menu.search_menu, menu);
|
inflater.inflate(R.menu.search_menu, menu);
|
||||||
|
inflater.inflate(R.menu.filter_menu_pr, menu);
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
|
|
||||||
|
TinyDB tinyDb = new TinyDB(context);
|
||||||
|
|
||||||
|
if(tinyDb.getString("repoPrState").equals("closed")) {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter_closed);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
menu.getItem(1).setIcon(R.drawable.ic_filter);
|
||||||
|
}
|
||||||
|
|
||||||
MenuItem searchItem = menu.findItem(R.id.action_search);
|
MenuItem searchItem = menu.findItem(R.id.action_search);
|
||||||
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
|
||||||
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
|
||||||
//searchView.setQueryHint(getContext().getString(R.string.strFilter));
|
|
||||||
|
|
||||||
/*if(!connToInternet) {
|
|
||||||
return;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onQueryTextSubmit(String query) {
|
public boolean onQueryTextSubmit(String query) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onQueryTextChange(String newText) {
|
public boolean onQueryTextChange(String newText) {
|
||||||
|
|
||||||
adapter.getFilter().filter(newText);
|
filter(newText);
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -292,4 +301,17 @@ public class PullRequestsFragment extends Fragment {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void filter(String text) {
|
||||||
|
|
||||||
|
List<PullRequests> arr = new ArrayList<>();
|
||||||
|
|
||||||
|
for(PullRequests d : prList) {
|
||||||
|
if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text)) {
|
||||||
|
arr.add(d);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
adapter.updateList(arr);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,13 +6,17 @@ package org.mian.gitnex.helpers;
|
||||||
|
|
||||||
public interface StaticGlobalVariables {
|
public interface StaticGlobalVariables {
|
||||||
|
|
||||||
// issues variables
|
// generic values
|
||||||
String tagIssuesListOpen = "IssuesListOpenFragment - ";
|
|
||||||
String tagIssuesListClosed = "IssuesListClosedFragment - ";
|
|
||||||
int issuesPageInit = 1;
|
|
||||||
int resultLimitNewGiteaInstances = 25; // Gitea 1.12 and above
|
int resultLimitNewGiteaInstances = 25; // Gitea 1.12 and above
|
||||||
int resultLimitOldGiteaInstances = 10; // Gitea 1.11 and below
|
int resultLimitOldGiteaInstances = 10; // Gitea 1.11 and below
|
||||||
|
|
||||||
|
// issues variables
|
||||||
|
String tagIssuesList = "IssuesListFragment";
|
||||||
|
int issuesPageInit = 1;
|
||||||
String issuesRequestType = "issues";
|
String issuesRequestType = "issues";
|
||||||
String issueStateClosed = "closed";
|
|
||||||
|
// pull request
|
||||||
|
String tagPullRequestsList = "PullRequestsListFragment";
|
||||||
|
int prPageInit = 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,10 +97,7 @@ public interface ApiInterface {
|
||||||
Call<UserRepositories> getUserRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
|
Call<UserRepositories> getUserRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
|
||||||
|
|
||||||
@GET("repos/{owner}/{repo}/issues") // get issues by repo
|
@GET("repos/{owner}/{repo}/issues") // get issues by repo
|
||||||
Call<List<Issues>> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("limit") int limit, @Query("type") String requestType);
|
Call<List<Issues>> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("limit") int limit, @Query("type") String requestType, @Query("state") String issueState);
|
||||||
|
|
||||||
@GET("repos/{owner}/{repo}/issues") // get closed issues by repo
|
|
||||||
Call<List<Issues>> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState, @Query("limit") int limit, @Query("type") String requestType);
|
|
||||||
|
|
||||||
@GET("repos/{owner}/{repo}/issues/{index}") // get issue by id
|
@GET("repos/{owner}/{repo}/issues/{index}") // get issue by id
|
||||||
Call<Issues> getIssueByIndex(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int issueIndex);
|
Call<Issues> getIssueByIndex(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int issueIndex);
|
||||||
|
|
5
app/src/main/res/drawable/ic_filter_closed.xml
Normal file
5
app/src/main/res/drawable/ic_filter_closed.xml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
<vector android:autoMirrored="true" android:height="24dp"
|
||||||
|
android:tint="#AF4242" android:viewportHeight="24.0"
|
||||||
|
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
|
||||||
|
</vector>
|
48
app/src/main/res/layout/bottom_sheet_issues_filter.xml
Normal file
48
app/src/main/res/layout/bottom_sheet_issues_filter.xml
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:paddingBottom="8dp"
|
||||||
|
android:background="?attr/primaryBackgroundColor"
|
||||||
|
android:paddingTop="8dp">
|
||||||
|
|
||||||
|
<androidx.core.widget.NestedScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/openIssues"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/tabIssueOpen"
|
||||||
|
android:drawableStart="@drawable/ic_issue_open"
|
||||||
|
android:drawablePadding="24dp"
|
||||||
|
android:textColor="?attr/primaryTextColor"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:padding="16dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/closedIssues"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/tabIssueClosed"
|
||||||
|
android:drawableStart="@drawable/ic_done"
|
||||||
|
android:drawablePadding="24dp"
|
||||||
|
android:textColor="?attr/primaryTextColor"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:padding="16dp" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
48
app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
Normal file
48
app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:paddingBottom="8dp"
|
||||||
|
android:background="?attr/primaryBackgroundColor"
|
||||||
|
android:paddingTop="8dp">
|
||||||
|
|
||||||
|
<androidx.core.widget.NestedScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/openPr"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/tabIssueOpen"
|
||||||
|
android:drawableStart="@drawable/ic_merge"
|
||||||
|
android:drawablePadding="24dp"
|
||||||
|
android:textColor="?attr/primaryTextColor"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:padding="16dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/closedPr"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/tabIssueClosed"
|
||||||
|
android:drawableStart="@drawable/ic_done"
|
||||||
|
android:drawablePadding="24dp"
|
||||||
|
android:textColor="?attr/primaryTextColor"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:padding="16dp" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
12
app/src/main/res/menu/filter_menu.xml
Normal file
12
app/src/main/res/menu/filter_menu.xml
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/filter"
|
||||||
|
android:icon="@drawable/ic_filter"
|
||||||
|
android:title="@string/strFilter"
|
||||||
|
android:orderInCategory="0"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
|
</menu>
|
12
app/src/main/res/menu/filter_menu_pr.xml
Normal file
12
app/src/main/res/menu/filter_menu_pr.xml
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/filterPr"
|
||||||
|
android:icon="@drawable/ic_filter"
|
||||||
|
android:title="@string/strFilter"
|
||||||
|
android:orderInCategory="0"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
|
</menu>
|
Reference in New Issue
Block a user