From 3364b4738ac20e307c702d341adfa2ed0a298c99 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Fri, 12 Aug 2022 19:04:14 +0500
Subject: [PATCH] Move other listing screens to Material cards view

---
 .../mian/gitnex/activities/MainActivity.java  |   2 +-
 .../gitnex/adapters/UserAccountsAdapter.java  |   2 +-
 .../mian/gitnex/adapters/WikiListAdapter.java |   2 +-
 .../mian/gitnex/fragments/DraftsFragment.java |   5 -
 .../ExplorePublicOrganizationsFragment.java   |   3 -
 .../fragments/ExploreUsersFragment.java       |   3 -
 .../gitnex/fragments/MilestonesFragment.java  |   3 -
 .../fragments/MostVisitedReposFragment.java   |   5 -
 .../fragments/NotificationsFragment.java      |   4 -
 .../mian/gitnex/fragments/WikiFragment.java   |   7 -
 .../layout/custom_user_accounts_dialog.xml    |   6 +-
 app/src/main/res/layout/fragment_drafts.xml   |  24 +-
 .../res/layout/fragment_explore_users.xml     |  24 +-
 .../main/res/layout/fragment_milestones.xml   |  24 +-
 .../res/layout/fragment_notifications.xml     |  24 +-
 .../main/res/layout/fragment_repo_info.xml    | 178 +++++------
 app/src/main/res/layout/fragment_wiki.xml     |  24 +-
 app/src/main/res/layout/list_drafts.xml       | 117 ++++---
 app/src/main/res/layout/list_milestones.xml   | 286 +++++++++---------
 .../res/layout/list_most_visited_repos.xml    | 139 +++++----
 .../main/res/layout/list_notifications.xml    | 145 ++++-----
 .../main/res/layout/list_user_accounts.xml    | 114 ++++---
 app/src/main/res/layout/list_wiki.xml         | 145 +++++----
 23 files changed, 684 insertions(+), 602 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index bbda8be3..11a61f67 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -223,7 +223,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 					if(!userAvatarNav.equals("")) {
 
-						int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
+						int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 60);
 
 						PicassoService.getInstance(ctx).get().load(userAvatarNav).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(avatarRadius, 0)).resize(160, 160).centerCrop().into(userAvatar);
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
index 2095609b..8150c016 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
@@ -204,7 +204,7 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 			holder.accountUrl.setText(context.getString(R.string.notLoggedIn, url));
 		}
 
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
 
 		PicassoService.getInstance(context).get()
 			.load(url + "assets/img/favicon.png")
diff --git a/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
index eb3cc190..702dde78 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
@@ -155,7 +155,7 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 			int color = generator.getColor(wikiPageMetaData.getTitle());
 			String firstCharacter = String.valueOf(wikiPageMetaData.getTitle().charAt(0));
 
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
+			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 14);
 			avatar.setImageDrawable(drawable);
 
 			if(!((RepoDetailActivity) ctx).repository.getPermissions().isPush()) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
index a977487c..99547d68 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java
@@ -15,7 +15,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
 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;
@@ -69,10 +68,6 @@ public class DraftsFragment extends Fragment {
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
-
 	    adapter = new DraftsAdapter(getContext(), getChildFragmentManager(), draftsList_);
 	    currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
         swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
index 5239868b..e0d32f7e 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExplorePublicOrganizationsFragment.java
@@ -11,7 +11,6 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.gitnex.tea4j.v2.models.Organization;
 import org.mian.gitnex.R;
@@ -71,9 +70,7 @@ public class ExplorePublicOrganizationsFragment extends Fragment {
 			}
 		});
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPublicOrgBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		fragmentPublicOrgBinding.recyclerView.setHasFixedSize(true);
-		fragmentPublicOrgBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 		fragmentPublicOrgBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		fragmentPublicOrgBinding.recyclerView.setAdapter(adapter);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
index 5a1d97ce..dad7b6ca 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
@@ -13,7 +13,6 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.gitnex.tea4j.v2.models.InlineResponse2001;
 import org.gitnex.tea4j.v2.models.User;
@@ -69,9 +68,7 @@ public class ExploreUsersFragment extends Fragment {
 			}
 		}));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, DividerItemDecoration.VERTICAL);
 		viewBinding.recyclerViewExploreUsers.setHasFixedSize(true);
-		viewBinding.recyclerViewExploreUsers.addItemDecoration(dividerItemDecoration);
 		viewBinding.recyclerViewExploreUsers.setLayoutManager(new LinearLayoutManager(context));
 		viewBinding.recyclerViewExploreUsers.setAdapter(adapter);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
index f861efe9..69722ffd 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@@ -15,7 +15,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.gitnex.tea4j.v2.models.Milestone;
 import org.mian.gitnex.R;
@@ -71,8 +70,6 @@ public class MilestonesFragment extends Fragment {
 
         dataList = new ArrayList<>();
 
-	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
-	    viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
         viewBinding.recyclerView.setHasFixedSize(true);
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java
index eb32ca1d..bdd1879d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MostVisitedReposFragment.java
@@ -10,7 +10,6 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 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;
@@ -63,10 +62,6 @@ public class MostVisitedReposFragment extends Fragment {
 		mRecyclerView.setHasFixedSize(true);
 		mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
-
 		adapter = new MostVisitedReposAdapter(mostVisitedReposList);
 		currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
 		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
index 692e92d9..bb1e118a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
@@ -13,7 +13,6 @@ import android.view.ViewGroup;
 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 org.apache.commons.lang3.StringUtils;
@@ -76,12 +75,9 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 
 		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.notifications.getContext(), DividerItemDecoration.VERTICAL);
-
 		viewBinding.notifications.setHasFixedSize(true);
 		viewBinding.notifications.setLayoutManager(linearLayoutManager);
 		viewBinding.notifications.setAdapter(notificationsAdapter);
-		viewBinding.notifications.addItemDecoration(dividerItemDecoration);
 
 		viewBinding.notifications.addOnScrollListener(new RecyclerView.OnScrollListener() {
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java b/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
index 4f573c90..cc7fa850 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/WikiFragment.java
@@ -7,16 +7,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.WikiListAdapter;
 import org.mian.gitnex.databinding.FragmentWikiBinding;
 import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.DividerItemDecorator;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.viewmodels.WikiViewModel;
 
@@ -60,9 +56,6 @@ public class WikiFragment extends Fragment {
 		fragmentWikiBinding.recyclerView.setHasFixedSize(true);
 		fragmentWikiBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
-		fragmentWikiBinding.recyclerView.addItemDecoration(dividerItemDecoration);
-
 		fragmentWikiBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			page = 1;
diff --git a/app/src/main/res/layout/custom_user_accounts_dialog.xml b/app/src/main/res/layout/custom_user_accounts_dialog.xml
index 311ec30c..fb9a71b2 100644
--- a/app/src/main/res/layout/custom_user_accounts_dialog.xml
+++ b/app/src/main/res/layout/custom_user_accounts_dialog.xml
@@ -10,14 +10,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/dimen16dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/accountsList"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_drafts.xml b/app/src/main/res/layout/fragment_drafts.xml
index 25c2f14d..ae7f80a6 100644
--- a/app/src/main/res/layout/fragment_drafts.xml
+++ b/app/src/main/res/layout/fragment_drafts.xml
@@ -6,19 +6,25 @@
     android:id="@+id/draftsFrame"
     android:background="?attr/primaryBackgroundColor">
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/pullToRefresh"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:padding="@dimen/dimen8dp">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/pullToRefresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:layout_height="wrap_content">
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </FrameLayout>
 
     <TextView
         android:id="@+id/noData"
diff --git a/app/src/main/res/layout/fragment_explore_users.xml b/app/src/main/res/layout/fragment_explore_users.xml
index 4bb7dc8e..8368119c 100644
--- a/app/src/main/res/layout/fragment_explore_users.xml
+++ b/app/src/main/res/layout/fragment_explore_users.xml
@@ -25,18 +25,24 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/pullToRefresh"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:padding="@dimen/dimen8dp">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerViewExploreUsers"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/pullToRefresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:layout_height="match_parent">
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerViewExploreUsers"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml
index ae477874..00a5e3bc 100644
--- a/app/src/main/res/layout/fragment_milestones.xml
+++ b/app/src/main/res/layout/fragment_milestones.xml
@@ -6,19 +6,25 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/pullToRefresh"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:padding="@dimen/dimen8dp">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/pullToRefresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:layout_height="wrap_content">
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </FrameLayout>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
index 6ac933ae..9516fa6a 100644
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -8,19 +8,25 @@
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/pullToRefresh"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:padding="@dimen/dimen8dp">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/notifications"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/pullToRefresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:layout_height="match_parent">
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/notifications"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </FrameLayout>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progressBar"
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index c86ea62b..7580373f 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -125,6 +125,7 @@
                     app:strokeWidth="@dimen/dimen0dp"
                     android:layout_marginTop="@dimen/dimen12dp"
                     android:layout_marginBottom="@dimen/dimen12dp"
+                    app:cardBackgroundColor="?attr/materialCardBackgroundColor"
                     style="@style/CustomMaterialCardStyle">
 
                     <LinearLayout
@@ -135,105 +136,106 @@
                         android:baselineAligned="false"
                         android:orientation="horizontal">
 
-                    <LinearLayout
-                        android:id="@+id/repoMetaStarsFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
-                        android:clickable="true"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:id="@+id/repoMetaStarsFrame"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:contentDescription="@string/repoStargazersInMenu"
-                            app:srcCompat="@drawable/ic_star_unfilled" />
+                            android:layout_weight="1"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:focusable="true"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:orientation="vertical">
 
-                        <TextView
-                            android:id="@+id/repoMetaStars"
-                            android:layout_width="wrap_content"
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:contentDescription="@string/repoStargazersInMenu"
+                                app:srcCompat="@drawable/ic_star_unfilled" />
+
+                            <TextView
+                                android:id="@+id/repoMetaStars"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="?attr/primaryTextColor"
+                                android:textSize="14sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/repoMetaPullRequestsFrame"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
-                    </LinearLayout>
+                            android:layout_weight="1"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:focusable="true"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/repoMetaPullRequestsFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
-                        android:clickable="true"
-                        android:gravity="center"
-                        android:orientation="vertical">
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:contentDescription="@string/tabPullRequests"
+                                app:srcCompat="@drawable/ic_pull_request" />
 
-                        <ImageView
-                            android:layout_width="wrap_content"
+                            <TextView
+                                android:id="@+id/repoMetaPullRequests"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="?attr/primaryTextColor"
+                                android:textSize="14sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/repoMetaForksFrame"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:contentDescription="@string/tabPullRequests"
-                            app:srcCompat="@drawable/ic_pull_request" />
+                            android:layout_weight="1"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:focusable="true"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:orientation="vertical">
 
-                        <TextView
-                            android:id="@+id/repoMetaPullRequests"
-                            android:layout_width="wrap_content"
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:contentDescription="@string/infoTabRepoForksCount"
+                                app:srcCompat="@drawable/ic_fork" />
+
+                            <TextView
+                                android:id="@+id/repoMetaForks"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="?attr/primaryTextColor"
+                                android:textSize="14sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/repoMetaWatchersFrame"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
-                    </LinearLayout>
+                            android:layout_weight="1"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:focusable="true"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/repoMetaForksFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
-                        android:clickable="true"
-                        android:gravity="center"
-                        android:orientation="vertical">
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:contentDescription="@string/repoWatchersInMenu"
+                                app:srcCompat="@drawable/ic_unwatch" />
 
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:contentDescription="@string/infoTabRepoForksCount"
-                            app:srcCompat="@drawable/ic_fork" />
+                            <TextView
+                                android:id="@+id/repoMetaWatchers"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="?attr/primaryTextColor"
+                                android:textSize="14sp" />
+                        </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/repoMetaForks"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/repoMetaWatchersFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:focusable="true"
-                        android:clickable="true"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:contentDescription="@string/repoWatchersInMenu"
-                            app:srcCompat="@drawable/ic_unwatch" />
-
-                        <TextView
-                            android:id="@+id/repoMetaWatchers"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="?attr/primaryTextColor"
-                            android:textSize="14sp" />
-                    </LinearLayout>
                 </LinearLayout>
 
                 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/fragment_wiki.xml b/app/src/main/res/layout/fragment_wiki.xml
index 53b50e5e..685b03d1 100644
--- a/app/src/main/res/layout/fragment_wiki.xml
+++ b/app/src/main/res/layout/fragment_wiki.xml
@@ -6,19 +6,25 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activities.RepoDetailActivity">
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/pull_to_refresh"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBackgroundColor"
+        android:padding="@dimen/dimen8dp">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/pull_to_refresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
-            android:scrollbars="vertical" />
+            android:layout_height="wrap_content">
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </FrameLayout>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
diff --git a/app/src/main/res/layout/list_drafts.xml b/app/src/main/res/layout/list_drafts.xml
index 60b71407..7c94f825 100644
--- a/app/src/main/res/layout/list_drafts.xml
+++ b/app/src/main/res/layout/list_drafts.xml
@@ -1,69 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layoutDraftsFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:focusable="true"
-    tools:context=".activities.MainActivity">
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp">
 
-    <LinearLayout
-        android:id="@+id/frameDraftInfo"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        tools:ignore="UseCompoundDrawables">
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
-        <TextView
-            android:id="@+id/repoInfo"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp" />
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/editCommentStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:contentDescription="@string/menuDeleteText"
-            android:src="@drawable/ic_edit" />
+            <LinearLayout
+                android:id="@+id/frameDraftInfo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dimen10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
 
-        <ImageView
-            android:id="@+id/deleteDraft"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:contentDescription="@string/menuDeleteText"
-            android:src="@drawable/ic_delete" />
+                <TextView
+                    android:id="@+id/repoInfo"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen16sp" />
 
-    </LinearLayout>
+                <ImageView
+                    android:id="@+id/editCommentStatus"
+                    android:layout_width="@dimen/dimen20dp"
+                    android:layout_height="@dimen/dimen20dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
+                    android:contentDescription="@string/menuDeleteText"
+                    android:src="@drawable/ic_edit" />
 
-    <LinearLayout
-        android:id="@+id/frameDraftInfo1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginBottom="10dp"
-        tools:ignore="UseCompoundDrawables">
+                <ImageView
+                    android:id="@+id/deleteDraft"
+                    android:layout_width="@dimen/dimen20dp"
+                    android:layout_height="@dimen/dimen20dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:contentDescription="@string/menuDeleteText"
+                    android:src="@drawable/ic_delete" />
 
-        <TextView
-            android:id="@+id/draftText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="0dp"
-            android:layout_weight=".95"
-            android:text="@string/noDataFound"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
+            </LinearLayout>
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/frameDraftInfo1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginBottom="@dimen/dimen10dp"
+                tools:ignore="UseCompoundDrawables">
+
+                <TextView
+                    android:id="@+id/draftText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/dimen0dp"
+                    android:layout_weight=".95"
+                    android:text="@string/noDataFound"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen14sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index a4bb13ec..aa278012 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -6,166 +6,174 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/milestoneFrame"
-    android:background="?attr/primaryBackgroundColor"
-    android:padding="16dp"
-    android:orientation="vertical">
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp">
 
-    <LinearLayout
-        android:id="@+id/mainFrame"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:orientation="vertical">
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
-            android:id="@+id/frameTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/milestoneTitle"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/frameTitle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:textColor="?attr/primaryTextColor"
-                android:textIsSelectable="true"
-                android:textSize="16sp" />
-
-            <ProgressBar
-                android:id="@+id/milestoneProgress"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="0dp"
-                android:layout_height="10dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="10dp"
-                android:layout_weight="1"
-                android:indeterminate="false"
-                android:progress="50"
-                android:progressDrawable="@drawable/progress_bar"
-                android:progressTint="@color/btnBackground" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="15dp"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="5dp"
-                    android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_calendar" />
-
-                <TextView
-                    android:id="@+id/milestoneDueDate"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/dueDate"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="15dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="5dp"
-                    android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue" />
-
-                <TextView
-                    android:id="@+id/milestoneIssuesOpen"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/repoStars"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="5dp"
-                    android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_closed" />
-
-                <TextView
-                    android:id="@+id/milestoneIssuesClosed"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/repoWatchers"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/milestoneDateMenuFrame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:id="@+id/dueDateFrame"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:layout_weight=".90"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/milestoneDescription"
-                    android:layout_width="match_parent"
+                    android:id="@+id/milestoneTitle"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/repoDescription"
+                    android:layout_weight="0"
                     android:textColor="?attr/primaryTextColor"
                     android:textIsSelectable="true"
-                    android:textSize="14sp"
-                    android:visibility="visible" />
+                    android:textSize="16sp" />
 
-            </RelativeLayout>
+                <ProgressBar
+                    android:id="@+id/milestoneProgress"
+                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    android:layout_width="0dp"
+                    android:layout_height="10dp"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_weight="1"
+                    android:indeterminate="false"
+                    android:progress="50"
+                    android:progressDrawable="@drawable/progress_bar"
+                    android:progressTint="@color/btnBackground" />
 
-            <ImageView
-                android:id="@+id/milestonesMenu"
-                android:layout_width="wrap_content"
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:contentDescription="@string/menuContentDesc"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:scaleType="fitEnd"
-                android:src="@drawable/ic_dotted_menu_horizontal" />
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="15dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    tools:ignore="UseCompoundDrawables">
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="5dp"
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_calendar" />
+
+                    <TextView
+                        android:id="@+id/milestoneDueDate"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dueDate"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="15dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    tools:ignore="UseCompoundDrawables">
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="5dp"
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_issue" />
+
+                    <TextView
+                        android:id="@+id/milestoneIssuesOpen"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/repoStars"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    tools:ignore="UseCompoundDrawables">
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="5dp"
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_issue_closed" />
+
+                    <TextView
+                        android:id="@+id/milestoneIssuesClosed"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/repoWatchers"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/milestoneDateMenuFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:orientation="horizontal">
+
+                <RelativeLayout
+                    android:id="@+id/dueDateFrame"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:layout_weight=".90"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/milestoneDescription"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/repoDescription"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textIsSelectable="true"
+                        android:textSize="14sp"
+                        android:visibility="visible" />
+
+                </RelativeLayout>
+
+                <ImageView
+                    android:id="@+id/milestonesMenu"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|bottom"
+                    android:contentDescription="@string/menuContentDesc"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:scaleType="fitEnd"
+                    android:src="@drawable/ic_dotted_menu_horizontal" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_most_visited_repos.xml b/app/src/main/res/layout/list_most_visited_repos.xml
index a1c57fb0..ceb0b83b 100644
--- a/app/src/main/res/layout/list_most_visited_repos.xml
+++ b/app/src/main/res/layout/list_most_visited_repos.xml
@@ -4,80 +4,97 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:focusable="true"
     android:orientation="vertical"
-    android:padding="@dimen/dimen16dp">
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp">
 
-    <LinearLayout
-        android:id="@+id/org_info_frame"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen8dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        tools:ignore="UseCompoundDrawables">
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="@dimen/dimen24dp"
-            android:layout_height="@dimen/dimen24dp"
-            android:layout_marginStart="@dimen/dimen0dp"
-            android:layout_marginEnd="@dimen/dimen10dp"
-            android:contentDescription="@string/repoContentAvatar"
-            android:src="@drawable/ic_android" />
-
-        <TextView
-            android:id="@+id/org_name"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen14sp"
-            tools:text="@string/orgName" />
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="vertical">
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/org_info_frame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dimen8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
 
-    <TextView
-        android:id="@+id/repo_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/repoName"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="@dimen/dimen16sp"
-        android:textStyle="bold" />
+                <ImageView
+                    android:id="@+id/image"
+                    android:layout_width="@dimen/dimen24dp"
+                    android:layout_height="@dimen/dimen24dp"
+                    android:layout_marginStart="@dimen/dimen0dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
+                    android:contentDescription="@string/repoContentAvatar"
+                    android:src="@drawable/ic_android" />
 
-    <View
-        android:id="@+id/spacer_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/dimen8dp" />
+                <TextView
+                    android:id="@+id/org_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen14sp"
+                    tools:text="@string/orgName" />
 
-    <LinearLayout
-        android:id="@+id/repo_info_stars_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|start"
-        android:orientation="horizontal"
-        tools:ignore="UseCompoundDrawables">
+            </LinearLayout>
 
-        <ImageView
-            android:layout_width="@dimen/dimen18dp"
-            android:layout_height="@dimen/dimen18dp"
-            android:layout_marginStart="@dimen/dimen0dp"
-            android:layout_marginEnd="@dimen/dimen6dp"
-            android:contentDescription="@string/generalImgContentText"
-            app:srcCompat="@drawable/ic_trending"
-            app:tint="?attr/iconsColor" />
+            <TextView
+                android:id="@+id/repo_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/repoName"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen16sp"
+                android:textStyle="bold" />
 
-        <TextView
-            android:id="@+id/most_visited"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen14sp"
-            tools:text="@string/repoStars" />
+            <View
+                android:id="@+id/spacer_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/dimen8dp" />
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/repo_info_stars_frame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical|start"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="@dimen/dimen18dp"
+                    android:layout_height="@dimen/dimen18dp"
+                    android:layout_marginStart="@dimen/dimen0dp"
+                    android:layout_marginEnd="@dimen/dimen6dp"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_trending"
+                    app:tint="?attr/iconsColor" />
+
+                <TextView
+                    android:id="@+id/most_visited"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen14sp"
+                    tools:text="@string/repoStars" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_notifications.xml b/app/src/main/res/layout/list_notifications.xml
index 522c4108..ad9ffa63 100644
--- a/app/src/main/res/layout/list_notifications.xml
+++ b/app/src/main/res/layout/list_notifications.xml
@@ -4,100 +4,105 @@
     android:id="@+id/frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:padding="16dp"
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp"
     android:orientation="horizontal">
 
-    <LinearLayout
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="20dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <ImageView
-                android:id="@+id/type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:contentDescription="@string/generalImgContentText"
-                app:srcCompat="@drawable/ic_pull_request" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/subject"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="20dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_pull_request" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/repository"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:textColor="?attr/primaryTextColor" />
+                <TextView
+                    android:id="@+id/subject"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp" />
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/repository"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:textColor="?attr/primaryTextColor" />
 
-        <ImageView
-            android:id="@+id/pinnedVertical"
-            android:layout_width="wrap_content"
-            android:visibility="gone"
-            android:layout_height="match_parent"
-            android:layout_gravity="top"
-            android:layout_marginStart="10dp"
-            android:background="@android:color/transparent"
-            android:contentDescription="@string/generalImgContentText"
-            app:srcCompat="@drawable/ic_pin" />
-
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
+            </LinearLayout>
 
             <ImageView
-                android:id="@+id/pinned"
+                android:id="@+id/pinnedVertical"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="0.5"
+                android:visibility="gone"
+                android:layout_height="match_parent"
                 android:layout_gravity="top"
                 android:layout_marginStart="10dp"
                 android:background="@android:color/transparent"
                 android:contentDescription="@string/generalImgContentText"
                 app:srcCompat="@drawable/ic_pin" />
 
-            <ImageView
-                android:id="@+id/more"
+            <LinearLayout
+                android:orientation="vertical"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="0.5"
-                android:layout_gravity="bottom"
-                android:layout_marginStart="10dp"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/generalImgContentText"
-                app:srcCompat="@drawable/ic_dotted_menu_horizontal" />
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/pinned"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"
+                    android:layout_gravity="top"
+                    android:layout_marginStart="10dp"
+                    android:background="@android:color/transparent"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_pin" />
+
+                <ImageView
+                    android:id="@+id/more"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="10dp"
+                    android:background="@android:color/transparent"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_dotted_menu_horizontal" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/dividerColor" />
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_user_accounts.xml b/app/src/main/res/layout/list_user_accounts.xml
index e181c8b0..19ac214f 100644
--- a/app/src/main/res/layout/list_user_accounts.xml
+++ b/app/src/main/res/layout/list_user_accounts.xml
@@ -1,73 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:background="?android:attr/selectableItemBackground"
-    android:focusable="true"
-    android:padding="16dp">
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp">
 
-    <ImageView
-        android:id="@+id/repoAvatar"
-        android:layout_width="@dimen/dimen24dp"
-        android:layout_height="@dimen/dimen24dp"
-        android:layout_marginEnd="10dp"
-        android:contentDescription="@string/generalImgContentText"
-        android:visibility="visible" />
-
-    <LinearLayout
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
-            android:id="@+id/frameAccountsInfo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/userId"
+            <ImageView
+                android:id="@+id/repoAvatar"
+                android:layout_width="@dimen/dimen24dp"
+                android:layout_height="@dimen/dimen24dp"
+                android:layout_marginEnd="10dp"
+                android:contentDescription="@string/generalImgContentText"
+                android:visibility="visible" />
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/activeAccount"
-                android:layout_width="20dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:contentDescription="@string/menuContentDesc"
-                android:src="@drawable/ic_check"
-                android:visibility="gone"
-                tools:visibility="visible" />
+                <LinearLayout
+                    android:id="@+id/frameAccountsInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/deleteAccount"
-                android:layout_width="20dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:contentDescription="@string/menuDeleteText"
-                android:src="@drawable/ic_delete"
-                android:visibility="gone"
-                tools:visibility="visible" />
+                    <TextView
+                        android:id="@+id/userId"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <ImageView
+                        android:id="@+id/activeAccount"
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:contentDescription="@string/menuContentDesc"
+                        android:src="@drawable/ic_check"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                    <ImageView
+                        android:id="@+id/deleteAccount"
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:contentDescription="@string/menuDeleteText"
+                        android:src="@drawable/ic_delete"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/accountUrl"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/accountUrl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
-
-    </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_wiki.xml b/app/src/main/res/layout/list_wiki.xml
index 346600f3..173ee803 100644
--- a/app/src/main/res/layout/list_wiki.xml
+++ b/app/src/main/res/layout/list_wiki.xml
@@ -4,81 +4,98 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:focusable="true"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:paddingTop="@dimen/dimen4dp"
+    android:paddingBottom="@dimen/dimen4dp">
 
-    <LinearLayout
-        android:id="@+id/wiki_info_frame"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        tools:ignore="UseCompoundDrawables">
-
-        <ImageView
-            android:id="@+id/image_avatar"
-            android:layout_width="@dimen/dimen24dp"
-            android:layout_height="@dimen/dimen24dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="10dp"
-            android:contentDescription="@string/wiki"
-            android:src="@drawable/ic_android" />
-
-        <TextView
-            android:id="@+id/page_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="16sp"
-            android:text="@string/wiki" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/spacerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="8dp" />
-
-    <LinearLayout
-        android:id="@+id/wiki_detail_info_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/wiki_last_updated_by"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?attr/hintColor"
-            android:textSize="13sp"
-            android:text="@string/wikiAuthor" />
+        style="?attr/materialCardViewFilledStyle"
+        app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
-            android:id="@+id/wiki_menu_frame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:gravity="center_vertical|end"
-            android:orientation="horizontal"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp">
+            android:foreground="?android:attr/selectableItemBackground"
+            android:background="?attr/materialCardBackgroundColor"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/wiki_menu"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="3dp"
-                android:layout_marginEnd="0dp"
-                android:contentDescription="@string/generalImgContentText"
-                app:srcCompat="@drawable/ic_dotted_menu_horizontal"
-                app:tint="?attr/iconsColor" />
+            <LinearLayout
+                android:id="@+id/wiki_info_frame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:id="@+id/image_avatar"
+                    android:layout_width="@dimen/dimen24dp"
+                    android:layout_height="@dimen/dimen24dp"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="10dp"
+                    android:contentDescription="@string/wiki"
+                    android:src="@drawable/ic_android" />
+
+                <TextView
+                    android:id="@+id/page_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="16sp"
+                    android:text="@string/wiki" />
+
+            </LinearLayout>
+
+            <View
+                android:id="@+id/spacerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="8dp" />
+
+            <LinearLayout
+                android:id="@+id/wiki_detail_info_frame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/wiki_last_updated_by"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/hintColor"
+                    android:textSize="13sp"
+                    android:text="@string/wikiAuthor" />
+
+                <LinearLayout
+                    android:id="@+id/wiki_menu_frame"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:gravity="center_vertical|end"
+                    android:orientation="horizontal"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp">
+
+                    <ImageView
+                        android:id="@+id/wiki_menu"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginStart="3dp"
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_dotted_menu_horizontal"
+                        app:tint="?attr/iconsColor" />
+
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>