From 91c5bdf7f5d122905a213ce83e764bd4133b7cfd Mon Sep 17 00:00:00 2001 From: M M Arif Date: Fri, 12 Aug 2022 20:14:40 +0500 Subject: [PATCH] More UI revamps + some refactors --- .../activities/AddNewTeamMemberActivity.java | 6 +- .../activities/AddNewTeamRepoActivity.java | 6 +- .../activities/AdminCronTasksActivity.java | 5 - .../activities/AdminGetUsersActivity.java | 4 - .../AdminUnadoptedReposActivity.java | 4 - .../activities/CreateTeamByOrgActivity.java | 4 +- .../OrganizationDetailActivity.java | 8 +- .../adapters/AdminCronTasksAdapter.java | 2 +- ...ganizationAddUserToTeamMemberAdapter.java} | 10 +- ...rganizationTeamMembersPreviewAdapter.java} | 4 +- ... OrganizationTeamRepositoriesAdapter.java} | 12 +- ...ter.java => OrganizationTeamsAdapter.java} | 16 +- .../database/models/DraftWithRepository.java | 8 + .../fragments/OrganizationLabelsFragment.java | 5 - ... => OrganizationRepositoriesFragment.java} | 8 +- ...nt.java => OrganizationTeamsFragment.java} | 23 +- .../gitnex/fragments/ReleasesFragment.java | 4 - .../res/layout/activity_admin_cron_tasks.xml | 42 +- .../res/layout/activity_admin_get_users.xml | 36 +- ...rg.xml => fragment_organization_teams.xml} | 24 +- app/src/main/res/layout/fragment_releases.xml | 24 +- .../main/res/layout/list_admin_cron_tasks.xml | 79 ++- .../res/layout/list_admin_unadopted_repos.xml | 36 +- app/src/main/res/layout/list_admin_users.xml | 143 +++-- .../res/layout/list_organization_teams.xml | 79 +++ app/src/main/res/layout/list_releases.xml | 547 +++++++++--------- .../res/layout/list_releases_downloads.xml | 12 +- app/src/main/res/layout/list_teams_by_org.xml | 58 -- 28 files changed, 652 insertions(+), 557 deletions(-) rename app/src/main/java/org/mian/gitnex/adapters/{UserSearchForTeamMemberAdapter.java => OrganizationAddUserToTeamMemberAdapter.java} (89%) rename app/src/main/java/org/mian/gitnex/adapters/{TeamMembersByOrgPreviewAdapter.java => OrganizationTeamMembersPreviewAdapter.java} (87%) rename app/src/main/java/org/mian/gitnex/adapters/{TeamRepositoriesAdapter.java => OrganizationTeamRepositoriesAdapter.java} (86%) rename app/src/main/java/org/mian/gitnex/adapters/{TeamsByOrgAdapter.java => OrganizationTeamsAdapter.java} (87%) rename app/src/main/java/org/mian/gitnex/fragments/{RepositoriesByOrgFragment.java => OrganizationRepositoriesFragment.java} (94%) rename app/src/main/java/org/mian/gitnex/fragments/{TeamsByOrgFragment.java => OrganizationTeamsFragment.java} (83%) rename app/src/main/res/layout/{fragment_teams_by_org.xml => fragment_organization_teams.xml} (66%) create mode 100644 app/src/main/res/layout/list_organization_teams.xml delete mode 100644 app/src/main/res/layout/list_teams_by_org.xml diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java index bf745132..a6293918 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java @@ -16,7 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import org.gitnex.tea4j.v2.models.InlineResponse2001; import org.gitnex.tea4j.v2.models.User; -import org.mian.gitnex.adapters.UserSearchForTeamMemberAdapter; +import org.mian.gitnex.adapters.OrganizationAddUserToTeamMemberAdapter; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.ActivityAddNewTeamMemberBinding; import java.util.ArrayList; @@ -38,7 +38,7 @@ public class AddNewTeamMemberActivity extends BaseActivity { private RecyclerView mRecyclerView; private List dataList; - private UserSearchForTeamMemberAdapter adapter; + private OrganizationAddUserToTeamMemberAdapter adapter; private long teamId; @@ -82,7 +82,7 @@ public class AddNewTeamMemberActivity extends BaseActivity { if(!addNewTeamMember.getText().toString().equals("") && addNewTeamMember.getText().toString().length() > 1) { - adapter = new UserSearchForTeamMemberAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName")); + adapter = new OrganizationAddUserToTeamMemberAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName")); loadUserSearchList(addNewTeamMember.getText().toString()); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java index 1ad9ad74..ec1c8345 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamRepoActivity.java @@ -7,7 +7,7 @@ import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import org.gitnex.tea4j.v2.models.Repository; import org.mian.gitnex.R; -import org.mian.gitnex.adapters.TeamRepositoriesAdapter; +import org.mian.gitnex.adapters.OrganizationTeamRepositoriesAdapter; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.AddNewTeamRepositoryBinding; import org.mian.gitnex.helpers.Constants; @@ -27,7 +27,7 @@ public class AddNewTeamRepoActivity extends BaseActivity { private AddNewTeamRepositoryBinding addNewTeamRepositoryBinding; private View.OnClickListener onClickListener; private List dataList; - private TeamRepositoriesAdapter adapter; + private OrganizationTeamRepositoriesAdapter adapter; private int resultLimit; private long teamId; @@ -78,7 +78,7 @@ public class AddNewTeamRepoActivity extends BaseActivity { dataList.clear(); dataList.addAll(response.body()); - adapter = new TeamRepositoriesAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName"), teamName); + adapter = new OrganizationTeamRepositoriesAdapter(dataList, ctx, Math.toIntExact(teamId), getIntent().getStringExtra("orgName"), teamName); addNewTeamRepositoryBinding.recyclerViewTeamRepos.setAdapter(adapter); addNewTeamRepositoryBinding.noData.setVisibility(View.GONE); diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java index ecbdfa65..53b5bfe8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java @@ -7,7 +7,6 @@ import android.os.Looper; import android.view.View; import androidx.appcompat.widget.Toolbar; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import org.mian.gitnex.adapters.AdminCronTasksAdapter; import org.mian.gitnex.databinding.ActivityAdminCronTasksBinding; @@ -48,10 +47,6 @@ public class AdminCronTasksActivity extends BaseActivity { activityAdminCronTasksBinding.recyclerView.setHasFixedSize(true); activityAdminCronTasksBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx)); - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminCronTasksBinding.recyclerView.getContext(), - DividerItemDecoration.VERTICAL); - activityAdminCronTasksBinding.recyclerView.addItemDecoration(dividerItemDecoration); - activityAdminCronTasksBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> { activityAdminCronTasksBinding.progressBar.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java index defd9111..ada76788 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java @@ -12,7 +12,6 @@ import android.view.inputmethod.EditorInfo; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import org.mian.gitnex.R; import org.mian.gitnex.adapters.AdminGetUsersAdapter; @@ -55,9 +54,6 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetLi activityAdminGetUsersBinding.recyclerView.setHasFixedSize(true); activityAdminGetUsersBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx)); - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminGetUsersBinding.recyclerView.getContext(), - DividerItemDecoration.VERTICAL); - activityAdminGetUsersBinding.recyclerView.addItemDecoration(dividerItemDecoration); activityAdminGetUsersBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> { diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java index b297ef2c..a691c1fd 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminUnadoptedReposActivity.java @@ -55,10 +55,6 @@ public class AdminUnadoptedReposActivity extends BaseActivity { binding.recyclerView.setHasFixedSize(true); binding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx)); - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(binding.recyclerView.getContext(), - DividerItemDecoration.VERTICAL); - binding.recyclerView.addItemDecoration(dividerItemDecoration); - binding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> { binding.pullToRefresh.setRefreshing(false); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java index 826c03d5..acca2d16 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java @@ -17,7 +17,7 @@ import org.gitnex.tea4j.v2.models.Team; import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.ActivityCreateTeamByOrgBinding; -import org.mian.gitnex.fragments.TeamsByOrgFragment; +import org.mian.gitnex.fragments.OrganizationTeamsFragment; import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.AppUtil; import org.mian.gitnex.helpers.Toasty; @@ -305,7 +305,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic if(response2.code() == 201) { - TeamsByOrgFragment.resumeTeams = true; + OrganizationTeamsFragment.resumeTeams = true; Toasty.success(ctx, getString(R.string.teamCreated)); finish(); diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java index 26734563..5af0af82 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java @@ -24,8 +24,8 @@ import org.mian.gitnex.fragments.BottomSheetOrganizationFragment; import org.mian.gitnex.fragments.MembersByOrgFragment; import org.mian.gitnex.fragments.OrganizationInfoFragment; import org.mian.gitnex.fragments.OrganizationLabelsFragment; -import org.mian.gitnex.fragments.RepositoriesByOrgFragment; -import org.mian.gitnex.fragments.TeamsByOrgFragment; +import org.mian.gitnex.fragments.OrganizationRepositoriesFragment; +import org.mian.gitnex.fragments.OrganizationTeamsFragment; import org.mian.gitnex.helpers.AppUtil; import org.mian.gitnex.structs.BottomSheetListener; import java.util.Objects; @@ -237,14 +237,14 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh return OrganizationInfoFragment.newInstance(orgName); case 1: // repos - return RepositoriesByOrgFragment.newInstance(orgName); + return OrganizationRepositoriesFragment.newInstance(orgName); case 2: // labels return OrganizationLabelsFragment.newInstance(orgName); case 3: // teams / members if(isMember) { - return TeamsByOrgFragment.newInstance(orgName, permissions); + return OrganizationTeamsFragment.newInstance(orgName, permissions); } else { return MembersByOrgFragment.newInstance(orgName); } diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java index 8297ecc4..4d8484a8 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java @@ -77,7 +77,7 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter { +public class OrganizationAddUserToTeamMemberAdapter extends RecyclerView.Adapter { private final List usersSearchList; private final Context context; private final int teamId; private final String orgName; - public UserSearchForTeamMemberAdapter(List dataList, Context ctx, int teamId, String orgName) { + public OrganizationAddUserToTeamMemberAdapter(List dataList, Context ctx, int teamId, String orgName) { this.context = ctx; this.usersSearchList = dataList; this.teamId = teamId; @@ -87,13 +87,13 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter { +public class OrganizationTeamMembersPreviewAdapter extends RecyclerView.Adapter { private final Context context; private final List userData; - public TeamMembersByOrgPreviewAdapter(Context context, List userInfo) { + public OrganizationTeamMembersPreviewAdapter(Context context, List userInfo) { this.context = context; this.userData = userInfo; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java similarity index 86% rename from app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java rename to app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java index a6cf34ca..95643622 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationTeamRepositoriesAdapter.java @@ -31,7 +31,7 @@ import retrofit2.Response; * @author M M Arif */ -public class TeamRepositoriesAdapter extends RecyclerView.Adapter { +public class OrganizationTeamRepositoriesAdapter extends RecyclerView.Adapter { private final List reposList; private final Context context; @@ -40,7 +40,7 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter reposArr; - public TeamRepositoriesAdapter(List dataList, Context ctx, int teamId, String orgName, String teamName) { + public OrganizationTeamRepositoriesAdapter(List dataList, Context ctx, int teamId, String orgName, String teamName) { this.context = ctx; this.reposList = dataList; this.teamId = teamId; @@ -68,7 +68,7 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter { @@ -97,13 +97,13 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter implements Filterable { +public class OrganizationTeamsAdapter extends RecyclerView.Adapter implements Filterable { private final List teamList; private final Context context; @@ -47,7 +47,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter userInfos; - private final TeamMembersByOrgPreviewAdapter adapter; + private final OrganizationTeamMembersPreviewAdapter adapter; private String orgName; private OrgTeamsViewHolder(View itemView) { @@ -60,7 +60,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter(); - adapter = new TeamMembersByOrgPreviewAdapter(itemView.getContext(), userInfos); + adapter = new OrganizationTeamMembersPreviewAdapter(itemView.getContext(), userInfos); membersPreview.setLayoutManager(new LinearLayoutManager(itemView.getContext(), RecyclerView.HORIZONTAL, false)); membersPreview.setAdapter(adapter); @@ -77,7 +77,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter teamListMain, OrganizationPermissions permissions, String orgName) { + public OrganizationTeamsAdapter(Context ctx, List teamListMain, OrganizationPermissions permissions, String orgName) { this.context = ctx; this.teamList = teamListMain; this.permissions = permissions; @@ -87,13 +87,13 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter new Handler(Looper.getMainLooper()).postDelayed(() -> { diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java similarity index 94% rename from app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java index 530a19a7..e8a07580 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationRepositoriesFragment.java @@ -26,7 +26,7 @@ import org.mian.gitnex.viewmodels.RepositoriesViewModel; * @author M M Arif */ -public class RepositoriesByOrgFragment extends Fragment { +public class OrganizationRepositoriesFragment extends Fragment { private RepositoriesViewModel repositoriesViewModel; private FragmentRepositoriesBinding fragmentRepositoriesBinding; @@ -36,10 +36,10 @@ public class RepositoriesByOrgFragment extends Fragment { private static final String getOrgName = null; private String orgName; - public RepositoriesByOrgFragment() { } + public OrganizationRepositoriesFragment() { } - public static RepositoriesByOrgFragment newInstance(String orgName) { - RepositoriesByOrgFragment fragment = new RepositoriesByOrgFragment(); + public static OrganizationRepositoriesFragment newInstance(String orgName) { + OrganizationRepositoriesFragment fragment = new OrganizationRepositoriesFragment(); Bundle args = new Bundle(); args.putString(getOrgName, orgName); fragment.setArguments(args); diff --git a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java similarity index 83% rename from app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java index 17884a7c..0af23cb3 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamsFragment.java @@ -15,21 +15,20 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.gitnex.tea4j.v2.models.OrganizationPermissions; import org.mian.gitnex.R; -import org.mian.gitnex.adapters.TeamsByOrgAdapter; -import org.mian.gitnex.databinding.FragmentTeamsByOrgBinding; +import org.mian.gitnex.adapters.OrganizationTeamsAdapter; +import org.mian.gitnex.databinding.FragmentOrganizationTeamsBinding; import org.mian.gitnex.viewmodels.TeamsByOrgViewModel; /** * @author M M Arif */ -public class TeamsByOrgFragment extends Fragment { +public class OrganizationTeamsFragment extends Fragment { private TeamsByOrgViewModel teamsByOrgViewModel; public static boolean resumeTeams = false; @@ -40,13 +39,13 @@ public class TeamsByOrgFragment extends Fragment { private static final String orgNameF = "param2"; private String orgName; private OrganizationPermissions permissions; - private TeamsByOrgAdapter adapter; + private OrganizationTeamsAdapter adapter; - public TeamsByOrgFragment() { + public OrganizationTeamsFragment() { } - public static TeamsByOrgFragment newInstance(String param1, OrganizationPermissions permissions) { - TeamsByOrgFragment fragment = new TeamsByOrgFragment(); + public static OrganizationTeamsFragment newInstance(String param1, OrganizationPermissions permissions) { + OrganizationTeamsFragment fragment = new OrganizationTeamsFragment(); Bundle args = new Bundle(); args.putString(orgNameF, param1); args.putSerializable("permissions", permissions); @@ -67,7 +66,7 @@ public class TeamsByOrgFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - FragmentTeamsByOrgBinding fragmentTeamsByOrgBinding = FragmentTeamsByOrgBinding.inflate(inflater, container, false); + FragmentOrganizationTeamsBinding fragmentTeamsByOrgBinding = FragmentOrganizationTeamsBinding.inflate(inflater, container, false); setHasOptionsMenu(true); teamsByOrgViewModel = new ViewModelProvider(this).get(TeamsByOrgViewModel.class); @@ -79,10 +78,6 @@ public class TeamsByOrgFragment extends Fragment { mRecyclerView.setHasFixedSize(true); mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), - DividerItemDecoration.VERTICAL); - mRecyclerView.addItemDecoration(dividerItemDecoration); - mProgressBar = fragmentTeamsByOrgBinding.progressBar; swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> { @@ -109,7 +104,7 @@ public class TeamsByOrgFragment extends Fragment { private void fetchDataAsync(String owner) { teamsByOrgViewModel.getTeamsByOrg(owner, getContext(), noDataTeams, mProgressBar).observe(getViewLifecycleOwner(), orgTeamsListMain -> { - adapter = new TeamsByOrgAdapter(getContext(), orgTeamsListMain, permissions, orgName); + adapter = new OrganizationTeamsAdapter(getContext(), orgTeamsListMain, permissions, orgName); if(adapter.getItemCount() > 0) { mRecyclerView.setAdapter(adapter); noDataTeams.setVisibility(View.GONE); diff --git a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java index 1f60cdd6..57e937cb 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java @@ -19,7 +19,6 @@ import androidx.annotation.NonNull; import androidx.core.app.NotificationCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import org.gitnex.tea4j.v2.auth.ApiKeyAuth; import org.gitnex.tea4j.v2.models.Release; @@ -93,9 +92,6 @@ public class ReleasesFragment extends Fragment { fragmentReleasesBinding.recyclerView.setHasFixedSize(true); fragmentReleasesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentReleasesBinding.recyclerView.getContext(), - DividerItemDecoration.VERTICAL); - fragmentReleasesBinding.recyclerView.addItemDecoration(dividerItemDecoration); fragmentReleasesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> { diff --git a/app/src/main/res/layout/activity_admin_cron_tasks.xml b/app/src/main/res/layout/activity_admin_cron_tasks.xml index 241fca2a..eaa2221b 100644 --- a/app/src/main/res/layout/activity_admin_cron_tasks.xml +++ b/app/src/main/res/layout/activity_admin_cron_tasks.xml @@ -4,7 +4,6 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primaryBackgroundColor" - android:fitsSystemWindows="true" android:orientation="vertical"> + + + + + + + + + + - - - - - - + + + + + + + + + + - - - - - - - + android:layout_height="match_parent" + android:background="?attr/primaryBackgroundColor" + android:padding="@dimen/dimen8dp"> - + android:layout_height="wrap_content"> - + + + + + - + android:layout_height="match_parent" + android:background="?attr/primaryBackgroundColor" + android:padding="@dimen/dimen8dp"> - + android:layout_height="wrap_content"> - + + + + + - + xmlns:app="http://schemas.android.com/apk/res-auto" + android:paddingTop="@dimen/dimen4dp" + android:paddingBottom="@dimen/dimen4dp"> - + style="?attr/materialCardViewFilledStyle" + app:cardElevation="@dimen/dimen0dp"> - + android:foreground="?android:attr/selectableItemBackground" + android:background="?attr/materialCardBackgroundColor" + android:padding="@dimen/dimen12dp" + android:orientation="horizontal"> - + - + - + - + + + + + + + + + diff --git a/app/src/main/res/layout/list_admin_unadopted_repos.xml b/app/src/main/res/layout/list_admin_unadopted_repos.xml index 2834afad..5ac8533f 100644 --- a/app/src/main/res/layout/list_admin_unadopted_repos.xml +++ b/app/src/main/res/layout/list_admin_unadopted_repos.xml @@ -1,17 +1,35 @@ - + xmlns:app="http://schemas.android.com/apk/res-auto" + android:paddingTop="@dimen/dimen4dp" + android:paddingBottom="@dimen/dimen4dp"> - + style="?attr/materialCardViewFilledStyle" + app:cardElevation="@dimen/dimen0dp"> + + + + + + + + diff --git a/app/src/main/res/layout/list_admin_users.xml b/app/src/main/res/layout/list_admin_users.xml index 9854714d..8899655b 100644 --- a/app/src/main/res/layout/list_admin_users.xml +++ b/app/src/main/res/layout/list_admin_users.xml @@ -3,79 +3,96 @@ android:layout_width="match_parent" android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" - android:padding="@dimen/dimen16dp" - android:background="?android:attr/selectableItemBackground"> + android:paddingTop="@dimen/dimen4dp" + android:paddingBottom="@dimen/dimen4dp"> - + style="?attr/materialCardViewFilledStyle" + app:cardElevation="@dimen/dimen0dp"> - - - - - - - + android:foreground="?android:attr/selectableItemBackground" + android:background="?attr/materialCardBackgroundColor" + android:padding="@dimen/dimen12dp" + android:orientation="horizontal"> - + - + - + - + - + - + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/list_organization_teams.xml b/app/src/main/res/layout/list_organization_teams.xml new file mode 100644 index 00000000..2e854c7f --- /dev/null +++ b/app/src/main/res/layout/list_organization_teams.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/list_releases.xml b/app/src/main/res/layout/list_releases.xml index 985c38f4..20be9e0c 100644 --- a/app/src/main/res/layout/list_releases.xml +++ b/app/src/main/res/layout/list_releases.xml @@ -5,307 +5,326 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="16dp"> + android:paddingTop="@dimen/dimen4dp" + android:paddingBottom="@dimen/dimen4dp"> - + android:layout_height="wrap_content" + style="?attr/materialCardViewFilledStyle" + app:cardElevation="@dimen/dimen0dp"> - - - - - - - - - - - - - - - - - - - - + android:foreground="?android:attr/selectableItemBackground" + android:background="?attr/materialCardBackgroundColor" + android:padding="@dimen/dimen12dp" + android:orientation="vertical"> + android:layout_weight="1" + android:singleLine="true" + android:textColor="?attr/primaryTextColor" + android:textSize="@dimen/dimen16sp" + android:textStyle="bold" /> + + + android:orientation="horizontal"> - - - + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="@dimen/dimen10dp" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/app/src/main/res/layout/list_releases_downloads.xml b/app/src/main/res/layout/list_releases_downloads.xml index 9981fbae..01e72456 100644 --- a/app/src/main/res/layout/list_releases_downloads.xml +++ b/app/src/main/res/layout/list_releases_downloads.xml @@ -6,13 +6,13 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dimen8dp" + android:layout_marginTop="@dimen/dimen8dp" tools:ignore="UseCompoundDrawables"> @@ -20,9 +20,9 @@ android:id="@+id/downloadName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="@dimen/dimen8dp" android:textColor="?attr/primaryTextColor" - android:textSize="12sp" + android:textSize="@dimen/dimen12sp" tools:text="Source code (ZIP)" /> diff --git a/app/src/main/res/layout/list_teams_by_org.xml b/app/src/main/res/layout/list_teams_by_org.xml deleted file mode 100644 index 36fb54b2..00000000 --- a/app/src/main/res/layout/list_teams_by_org.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - -