diff --git a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java index cb2d59d2..bf61939d 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java @@ -205,10 +205,6 @@ public class PullRequestsAdapter extends RecyclerView.Adapter" + context.getResources().getString(R.string.hash) + pullRequest.getNumber() + ""; diff --git a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java index 838fb2fa..14500078 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java @@ -15,7 +15,6 @@ import android.view.inputmethod.EditorInfo; 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.swiperefreshlayout.widget.SwipeRefreshLayout; import org.gitnex.tea4j.v2.models.PullRequest; @@ -89,9 +88,7 @@ public class PullRequestsFragment extends Fragment { })); - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPullRequestsBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL); fragmentPullRequestsBinding.recyclerView.setHasFixedSize(true); - fragmentPullRequestsBinding.recyclerView.addItemDecoration(dividerItemDecoration); fragmentPullRequestsBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context)); fragmentPullRequestsBinding.recyclerView.setAdapter(adapter); diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index f1b3afa9..8323dbb4 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -150,6 +150,7 @@ app:tabMode="fixed" app:tabIndicatorColor="?attr/colorPrimary" app:tabIndicatorFullWidth="true" + android:background="?attr/primaryBackgroundColor" app:tabSelectedTextColor="@android:color/white" app:tabTextColor="?attr/colorPrimary"> diff --git a/app/src/main/res/layout/fragment_pull_requests.xml b/app/src/main/res/layout/fragment_pull_requests.xml index dfb16287..fd590e1e 100644 --- a/app/src/main/res/layout/fragment_pull_requests.xml +++ b/app/src/main/res/layout/fragment_pull_requests.xml @@ -6,19 +6,25 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".activities.RepoDetailActivity"> - + android:layout_height="match_parent" + android:background="?attr/primaryBackgroundColor" + android:padding="@dimen/dimen8dp"> - + android:layout_height="wrap_content"> - + + + + + - - - - - - - - + android:orientation="horizontal"> - + - + + + + + + + + + diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml index 3ee04226..225096a0 100644 --- a/app/src/main/res/layout/list_pr.xml +++ b/app/src/main/res/layout/list_pr.xml @@ -6,64 +6,98 @@ android:id="@+id/relativeLayoutFrame" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="16dp" - android:orientation="vertical" - android:background="?android:attr/selectableItemBackground" - android:focusable="true"> + android:paddingTop="@dimen/dimen4dp" + android:paddingBottom="@dimen/dimen4dp" + android:orientation="vertical"> - - - - - - - + style="?attr/materialCardViewFilledStyle" + app:cardElevation="@dimen/dimen0dp"> - + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + android:orientation="horizontal"> + + + + + + + + + + + + - +