From 4f0091f151ec84b8e088925443c798a4e5f23e0b Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 1 Jun 2020 15:53:56 +0000
Subject: [PATCH] Improve layouts (#524)

make release checkboxes unchecked

admin users layout update

update commits and releases layout

profile fragments layout updates

improve labels

Merge branch 'master' into improve-layouts

branches and milestones layout update. Fix milestone infinite pagination loop for lower versions

layout updates for issues, pr. Fix pr nullable objects for lower versions

improve files layout

improve org info and list orgs

improve teams list layout by org

Fix repo layouts

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/524
Reviewed-by: opyale <opyale@noreply.gitea.io>
---
 .../gitnex/adapters/PullRequestsAdapter.java  |   8 +-
 .../gitnex/fragments/MilestonesFragment.java  |  38 +--
 .../fragments/OrganizationInfoFragment.java   |  24 +-
 .../res/layout/activity_admin_get_users.xml   |   3 +-
 app/src/main/res/layout/activity_commits.xml  |   3 +-
 .../res/layout/activity_create_release.xml    |   6 +-
 .../layout/activity_create_team_by_org.xml    |  32 +--
 app/src/main/res/layout/fragment_branches.xml |   3 +-
 app/src/main/res/layout/fragment_files.xml    |   3 +-
 app/src/main/res/layout/fragment_issues.xml   |   3 +-
 app/src/main/res/layout/fragment_labels.xml   |   3 +-
 .../main/res/layout/fragment_milestones.xml   |   3 +-
 .../res/layout/fragment_my_repositories.xml   |   3 +-
 .../res/layout/fragment_organization_info.xml |  21 +-
 .../res/layout/fragment_organizations.xml     |   1 -
 .../res/layout/fragment_profile_emails.xml    |   3 +-
 .../res/layout/fragment_profile_followers.xml |   3 +-
 .../res/layout/fragment_profile_following.xml |   3 +-
 .../res/layout/fragment_pull_requests.xml     |   3 +-
 app/src/main/res/layout/fragment_releases.xml |   3 +-
 .../layout/fragment_repositories_by_org.xml   |   3 +-
 .../layout/fragment_starred_repositories.xml  |   3 +-
 .../main/res/layout/fragment_teams_by_org.xml |   3 +-
 app/src/main/res/layout/list_admin_users.xml  |   5 +-
 app/src/main/res/layout/list_branches.xml     |   3 +-
 app/src/main/res/layout/list_commits.xml      |   8 +-
 app/src/main/res/layout/list_files.xml        |   4 +-
 app/src/main/res/layout/list_issues.xml       | 122 +++++-----
 app/src/main/res/layout/list_labels.xml       |  40 ++--
 app/src/main/res/layout/list_milestones.xml   | 222 ++++++++++--------
 .../main/res/layout/list_organizations.xml    |  14 +-
 app/src/main/res/layout/list_pr.xml           | 114 ++++-----
 .../main/res/layout/list_profile_emails.xml   |   5 +-
 .../res/layout/list_profile_followers.xml     |   8 +-
 .../res/layout/list_profile_following.xml     |   8 +-
 app/src/main/res/layout/list_releases.xml     |   8 +-
 36 files changed, 373 insertions(+), 366 deletions(-)

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 992f0184..60a2c9fb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@@ -188,9 +188,11 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 			prNumber.setText(String.valueOf(prModel.getNumber()));
 			prMergeable.setText(String.valueOf(prModel.isMergeable()));
-			prHeadBranch.setText(prModel.getHead().getRef());
-			prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
-			prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+			if(prModel.getHead() != null) {
+				prHeadBranch.setText(prModel.getHead().getRef());
+				prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
+				prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+			}
 			prCommentsCount.setText(String.valueOf(prModel.getComments()));
 
 			prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));
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 6801e437..4aac3653 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@@ -77,16 +77,20 @@ public class MilestonesFragment extends Fragment {
         dataList = new ArrayList<>();
         adapter = new MilestonesAdapter(ctx, dataList);
 
-        adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
+	    if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-            if(dataList.size() == resultLimit || pageSize == resultLimit) {
+		    adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
 
-                int page = (dataList.size() + resultLimit) / resultLimit;
-                loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, tinyDb.getString("milestoneState"));
+			    if(dataList.size() == resultLimit || pageSize == resultLimit) {
 
-            }
+				    int page = (dataList.size() + resultLimit) / resultLimit;
+				    loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, tinyDb.getString("milestoneState"));
 
-        }));
+			    }
+
+		    }));
+
+	    }
 
         viewBinding.recyclerView.setHasFixedSize(true);
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
@@ -113,16 +117,21 @@ public class MilestonesFragment extends Fragment {
             dataList.clear();
 
             adapter = new MilestonesAdapter(ctx, dataList);
-            adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
 
-                if(dataList.size() == resultLimit || pageSize == resultLimit) {
+	        if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-                    int page = (dataList.size() + resultLimit) / resultLimit;
-                    loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, milestoneState);
+		        adapter.setLoadMoreListener(() -> viewBinding.recyclerView.post(() -> {
 
-                }
+			        if(dataList.size() == resultLimit || pageSize == resultLimit) {
 
-            }));
+				        int page = (dataList.size() + resultLimit) / resultLimit;
+				        loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, milestoneState);
+
+			        }
+
+		        }));
+
+	        }
 
             tinyDb.putString("milestoneState", milestoneState);
 
@@ -171,7 +180,7 @@ public class MilestonesFragment extends Fragment {
             @Override
             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
 
-                if(response.isSuccessful()) {
+                if(response.code() == 200) {
 
                     assert response.body() != null;
                     if(response.body().size() > 0) {
@@ -222,7 +231,7 @@ public class MilestonesFragment extends Fragment {
             @Override
             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
 
-                if(response.isSuccessful()) {
+	            if(response.code() == 200) {
 
                     //remove loading view
                     dataList.remove(dataList.size() - 1);
@@ -238,7 +247,6 @@ public class MilestonesFragment extends Fragment {
                     }
                     else {
 
-                        Toasty.info(ctx, getString(R.string.noMoreData));
                         adapter.setMoreDataAvailable(false);
 
                     }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
index 71cda317..adeb45b4 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
@@ -12,6 +12,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
@@ -37,6 +38,7 @@ public class OrganizationInfoFragment extends Fragment {
     private TextView orgDescInfo;
     private TextView orgWebsiteInfo;
     private TextView orgLocationInfo;
+    private LinearLayout orgInfoLayout;
 
     private RepoInfoFragment.OnFragmentInteractionListener mListener;
 
@@ -76,6 +78,7 @@ public class OrganizationInfoFragment extends Fragment {
         orgDescInfo = v.findViewById(R.id.orgDescInfo);
         orgWebsiteInfo = v.findViewById(R.id.orgWebsiteInfo);
         orgLocationInfo = v.findViewById(R.id.orgLocationInfo);
+	    orgInfoLayout = v.findViewById(R.id.orgInfoLayout);
 
         orgNameInfo.setText(orgName);
 
@@ -99,19 +102,22 @@ public class OrganizationInfoFragment extends Fragment {
 
                 Organization orgInfo = response.body();
 
-                if (response.isSuccessful()) {
+                if (response.code() == 200) {
 
-                    if (response.code() == 200) {
+                    orgInfoLayout.setVisibility(View.VISIBLE);
 
-                        assert orgInfo != null;
-                        PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
-                        orgDescInfo.setText(orgInfo.getDescription());
-                        orgWebsiteInfo.setText(orgInfo.getWebsite());
-                        orgLocationInfo.setText(orgInfo.getLocation());
+                    assert orgInfo != null;
+                    PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
+                    orgDescInfo.setText(orgInfo.getDescription());
+                    orgWebsiteInfo.setText(orgInfo.getWebsite());
+                    orgLocationInfo.setText(orgInfo.getLocation());
 
-                        mProgressBar.setVisibility(View.GONE);
+                    mProgressBar.setVisibility(View.GONE);
 
-                    }
+                }
+                else if(response.code() == 404) {
+
+	                mProgressBar.setVisibility(View.GONE);
 
                 }
                 else {
diff --git a/app/src/main/res/layout/activity_admin_get_users.xml b/app/src/main/res/layout/activity_admin_get_users.xml
index 06805643..26afb6f8 100644
--- a/app/src/main/res/layout/activity_admin_get_users.xml
+++ b/app/src/main/res/layout/activity_admin_get_users.xml
@@ -54,7 +54,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -70,4 +69,4 @@
         android:textSize="20sp"
         android:visibility="visible" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_commits.xml b/app/src/main/res/layout/activity_commits.xml
index a8fd5e10..25b259e0 100644
--- a/app/src/main/res/layout/activity_commits.xml
+++ b/app/src/main/res/layout/activity_commits.xml
@@ -58,7 +58,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -83,4 +82,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index 8700f820..c102c437 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -160,7 +160,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseTypeText"
-                android:checked="true"
+                android:checked="false"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 android:textColor="?attr/primaryTextColor"/>
@@ -170,7 +170,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseDraftText"
-                android:checked="true"
+                android:checked="false"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 android:textColor="?attr/primaryTextColor"/>
@@ -194,4 +194,4 @@
 
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_team_by_org.xml b/app/src/main/res/layout/activity_create_team_by_org.xml
index 435f4358..e9a3f416 100644
--- a/app/src/main/res/layout/activity_create_team_by_org.xml
+++ b/app/src/main/res/layout/activity_create_team_by_org.xml
@@ -74,7 +74,7 @@
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -97,7 +97,7 @@
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/hintColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -105,7 +105,7 @@
                 android:text="@string/newTeamPermission"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
+                android:layout_marginTop="10dp" />
 
             <TextView
                 android:id="@+id/teamPermission"
@@ -116,10 +116,10 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:inputType="none"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/hintColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="none" />
 
             <TextView
                 android:id="@+id/teamPermissionDetail"
@@ -128,7 +128,7 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="start"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -136,7 +136,7 @@
                 android:text="@string/newTeamAccessControls"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:layout_marginTop="10dp"/>
+                android:layout_marginTop="10dp" />
 
             <TextView
                 android:id="@+id/teamAccessControls"
@@ -147,16 +147,16 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="?attr/primaryTextColor"
-                android:textColorHint="?attr/primaryTextColor"
-                android:inputType="none"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/hintColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="none" />
 
             <TextView
                 android:id="@+id/teamAccessControlsArray"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <Button
                 android:id="@+id/createTeamButton"
@@ -171,10 +171,10 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="35dp"/>
+                android:layout_height="35dp" />
 
         </LinearLayout>
 
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_branches.xml b/app/src/main/res/layout/fragment_branches.xml
index 07116147..8fd7ea7a 100644
--- a/app/src/main/res/layout/fragment_branches.xml
+++ b/app/src/main/res/layout/fragment_branches.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
         <GridView
@@ -50,4 +49,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index dce8d9cd..3925f83a 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -34,7 +34,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
         <TextView
@@ -59,4 +58,4 @@
         android:indeterminate="true"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_issues.xml b/app/src/main/res/layout/fragment_issues.xml
index 528ab48b..c99afd01 100644
--- a/app/src/main/res/layout/fragment_issues.xml
+++ b/app/src/main/res/layout/fragment_issues.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -41,4 +40,4 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_labels.xml b/app/src/main/res/layout/fragment_labels.xml
index 9245fcd6..7388cc34 100644
--- a/app/src/main/res/layout/fragment_labels.xml
+++ b/app/src/main/res/layout/fragment_labels.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -41,4 +40,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml
index 65fcf8a0..4095f723 100644
--- a/app/src/main/res/layout/fragment_milestones.xml
+++ b/app/src/main/res/layout/fragment_milestones.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -54,4 +53,4 @@
         android:visibility="gone"
         android:contentDescription="@string/addNewContent" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml
index 764019b3..52b32497 100644
--- a/app/src/main/res/layout/fragment_my_repositories.xml
+++ b/app/src/main/res/layout/fragment_my_repositories.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -52,4 +51,4 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index affaec9c..1e6103d3 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -15,7 +15,8 @@
             android:orientation="vertical"
             android:id="@+id/orgInfoLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/orgAvatar"
@@ -24,22 +25,16 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
                 android:contentDescription="@string/orgContentAvatar"
-                android:layout_marginBottom="20dp"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/nameText"
-                android:textSize="16sp"
-                android:textColor="?attr/primaryTextColor"/>
+                android:layout_marginBottom="15dp"/>
 
             <TextView
                 android:id="@+id/orgNameInfo"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
                 android:textIsSelectable="true"
                 android:textSize="16sp"
-                android:paddingTop="5dp"
                 android:textColor="?attr/primaryTextColor"/>
 
             <TextView
@@ -115,4 +110,4 @@
 
     </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index 77dec7e6..b1068f4d 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -13,7 +13,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_profile_emails.xml b/app/src/main/res/layout/fragment_profile_emails.xml
index 25083dea..76b05b2f 100644
--- a/app/src/main/res/layout/fragment_profile_emails.xml
+++ b/app/src/main/res/layout/fragment_profile_emails.xml
@@ -14,7 +14,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -39,4 +38,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_profile_followers.xml b/app/src/main/res/layout/fragment_profile_followers.xml
index b84a2664..d76dcf11 100644
--- a/app/src/main/res/layout/fragment_profile_followers.xml
+++ b/app/src/main/res/layout/fragment_profile_followers.xml
@@ -14,7 +14,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -39,4 +38,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_profile_following.xml b/app/src/main/res/layout/fragment_profile_following.xml
index 9262af76..80b4a6f7 100644
--- a/app/src/main/res/layout/fragment_profile_following.xml
+++ b/app/src/main/res/layout/fragment_profile_following.xml
@@ -14,7 +14,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -39,4 +38,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_pull_requests.xml b/app/src/main/res/layout/fragment_pull_requests.xml
index dc51a37f..4ab09666 100644
--- a/app/src/main/res/layout/fragment_pull_requests.xml
+++ b/app/src/main/res/layout/fragment_pull_requests.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -41,4 +40,4 @@
         android:textSize="20sp"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_releases.xml b/app/src/main/res/layout/fragment_releases.xml
index 7b5be3d7..272b90b6 100644
--- a/app/src/main/res/layout/fragment_releases.xml
+++ b/app/src/main/res/layout/fragment_releases.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -41,4 +40,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_repositories_by_org.xml b/app/src/main/res/layout/fragment_repositories_by_org.xml
index a34f5312..213e730e 100644
--- a/app/src/main/res/layout/fragment_repositories_by_org.xml
+++ b/app/src/main/res/layout/fragment_repositories_by_org.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -40,4 +39,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml
index acb01e21..fd8b6aa9 100644
--- a/app/src/main/res/layout/fragment_starred_repositories.xml
+++ b/app/src/main/res/layout/fragment_starred_repositories.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -52,4 +51,4 @@
         android:padding="@dimen/fab_padding"
         android:contentDescription="@string/addNewContent" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_teams_by_org.xml b/app/src/main/res/layout/fragment_teams_by_org.xml
index c72965b5..6b1b58ea 100644
--- a/app/src/main/res/layout/fragment_teams_by_org.xml
+++ b/app/src/main/res/layout/fragment_teams_by_org.xml
@@ -15,7 +15,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/primaryBackgroundColor"
-            android:padding="4dp"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -40,4 +39,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_admin_users.xml b/app/src/main/res/layout/list_admin_users.xml
index ec3c9565..c40bcb27 100644
--- a/app/src/main/res/layout/list_admin_users.xml
+++ b/app/src/main/res/layout/list_admin_users.xml
@@ -3,10 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="10dp"
-    android:paddingTop="10dp"
-    android:paddingStart="15dp"
-    android:paddingEnd="15dp"
+    android:padding="15dp"
     android:background="?attr/primaryBackgroundColor" >
 
     <LinearLayout
diff --git a/app/src/main/res/layout/list_branches.xml b/app/src/main/res/layout/list_branches.xml
index 48095e4a..8cf098c6 100644
--- a/app/src/main/res/layout/list_branches.xml
+++ b/app/src/main/res/layout/list_branches.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/list_commits.xml b/app/src/main/res/layout/list_commits.xml
index e1310bf5..a31c8379 100644
--- a/app/src/main/res/layout/list_commits.xml
+++ b/app/src/main/res/layout/list_commits.xml
@@ -1,10 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/commitList"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:context=".activities.CommitsActivity"
     android:background="?attr/primaryBackgroundColor">
 
     <LinearLayout
@@ -12,10 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:fitsSystemWindows="true"
         android:orientation="vertical"
-        android:layout_margin="15dp"
-        tools:ignore="UselessParent">
+        android:layout_margin="15dp">
 
         <TextView
             android:id="@+id/commitTitleVw"
@@ -80,7 +77,6 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:id="@+id/divider"
-        android:layout_marginTop="10dp"
         android:background="?attr/dividerColor" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_files.xml b/app/src/main/res/layout/list_files.xml
index c21819be..c4a18e5b 100644
--- a/app/src/main/res/layout/list_files.xml
+++ b/app/src/main/res/layout/list_files.xml
@@ -4,7 +4,7 @@
     android:id="@+id/linearLayoutFilesFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="10dp"
+    android:layout_margin="12dp"
     android:background="?attr/primaryBackgroundColor">
 
     <TextView
@@ -62,4 +62,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_issues.xml b/app/src/main/res/layout/list_issues.xml
index f08f9523..6a15a290 100644
--- a/app/src/main/res/layout/list_issues.xml
+++ b/app/src/main/res/layout/list_issues.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/relativeLayoutFrameIssuesList"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="15dp"
-    android:layout_marginStart="15dp"
-    android:layout_marginEnd="15dp"
-    android:background="?attr/primaryBackgroundColor"
-    tools:context=".activities.RepoDetailActivity">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/issueNumber"
@@ -17,86 +12,95 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <ImageView
-        android:id="@+id/assigneeAvatar"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="15dp"
-        android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_android" />
-
-    <LinearLayout
-        android:id="@+id/infoSection"
+    <RelativeLayout
+        android:id="@+id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/assigneeAvatar"
+        android:layout_alignParentTop="true"
+        android:layout_margin="15dp"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/frameIssueNameStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/issueTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="top|center_vertical"
-                android:textAlignment="gravity"
-                android:text="@string/strFilter"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
-
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/assigneeAvatar"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:src="@drawable/ic_android" />
 
         <LinearLayout
-            android:id="@+id/frameCreatedDate"
+            android:id="@+id/infoSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
+            android:layout_toEndOf="@+id/assigneeAvatar"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/frameCommentsCount"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
+                android:id="@+id/frameIssueNameStatus"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/issueCommentsCount"
+                    android:id="@+id/issueTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:drawablePadding="5dp"
-                    android:drawableStart="@drawable/ic_comment_20"
-                    android:layout_gravity="center_horizontal"
+                    android:gravity="top|center_vertical"
+                    android:textAlignment="gravity"
+                    android:text="@string/strFilter"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/frameCreatedDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/frameCommentsCount"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/issueCommentsCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="start"
+                        android:drawablePadding="5dp"
+                        android:drawableStart="@drawable/ic_comment_20"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/issueCreatedTime"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/issueCreatedTime"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
-
         </LinearLayout>
 
-    </LinearLayout>
+    </RelativeLayout>
 
     <View
-        android:layout_below="@id/infoSection"
+        android:layout_below="@id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:id="@+id/divider"
-        android:layout_marginTop="15dp"
         android:background="?attr/dividerColor" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_labels.xml b/app/src/main/res/layout/list_labels.xml
index 52c85dbd..39bf1e1e 100644
--- a/app/src/main/res/layout/list_labels.xml
+++ b/app/src/main/res/layout/list_labels.xml
@@ -1,11 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:id="@+id/relativeLayoutMainFrame"
     android:background="?attr/primaryBackgroundColor">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:id="@+id/labelTitle"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:id="@+id/labelId"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:id="@+id/labelColor"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -18,6 +37,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
+            android:paddingTop="5dp"
             android:contentDescription="@string/labelMenuContentDesc"
             android:gravity="start"
             android:layout_weight="1"
@@ -35,24 +55,6 @@
             android:scaleType="fitEnd"
             android:src="@drawable/ic_dotted_menu_horizontal" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/labelTitle"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/labelId"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/labelColor"/>
-
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index fd869b15..e1c256ac 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="15dp"
     android:id="@+id/milestoneFrame"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
@@ -21,119 +20,136 @@
         android:id="@+id/milestoneStatus" />
 
     <LinearLayout
-        android:id="@+id/frameTitle"
+        android:id="@+id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_alignParentTop="true"
+        android:layout_margin="15dp"
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/milestoneTitle"
-            android:layout_width="0dp"
-            android:textIsSelectable="true"
+        <LinearLayout
+            android:id="@+id/frameTitle"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight=".80"
-            android:layout_marginBottom="5dp"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp" />
-
-        <ImageView
-            android:id="@+id/milestoneState"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight=".15"
-            android:layout_gravity="end"
-            android:gravity="end"
-            android:scaleType="fitEnd"
-            android:contentDescription="@string/pageTitleCreateMilestone"
-            android:layout_marginBottom="5dp" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/milestoneDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/repoDescription"
-        android:textIsSelectable="true"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="14sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="5dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/milestoneIssuesClosed"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="8"
-            android:text="@string/repoWatchers"
-            android:gravity="start"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
-
-        <ProgressBar
-            android:id="@+id/milestoneProgress"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="80"
-            android:progress="50"
-            android:layout_marginTop="2dp"
-            android:progressDrawable="@drawable/progress_bar"
-            android:progressTint="@color/colorLightGreen" />
-
-        <TextView
-            android:id="@+id/milestoneIssuesOpen"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="8"
-            android:text="@string/repoStars"
-            android:gravity="end"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/milestoneDateMenuFrame"
-        android:layout_marginTop="8dp"
-        android:orientation="horizontal">
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_weight=".90"
-            android:layout_height="wrap_content"
-            android:id="@+id/dueDateFrame"
-            android:orientation="horizontal"
-            android:layout_marginTop="3dp">
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/milestoneDueDate"
-                android:layout_width="wrap_content"
+                android:id="@+id/milestoneTitle"
+                android:layout_width="0dp"
+                android:textIsSelectable="true"
                 android:layout_height="wrap_content"
-                android:text="@string/dueDate"
+                android:layout_weight=".80"
+                android:layout_marginBottom="5dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:id="@+id/milestoneState"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight=".15"
+                android:layout_gravity="end"
+                android:gravity="end"
+                android:scaleType="fitEnd"
+                android:contentDescription="@string/pageTitleCreateMilestone"
+                android:layout_marginBottom="5dp" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/milestoneDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/repoDescription"
+            android:textIsSelectable="true"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="14sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/milestoneIssuesClosed"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="8"
+                android:text="@string/repoWatchers"
                 android:gravity="start"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="12sp" />
+                android:textSize="14sp" />
 
-        </RelativeLayout>
+            <ProgressBar
+                android:id="@+id/milestoneProgress"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="80"
+                android:progress="50"
+                android:layout_marginTop="2dp"
+                android:progressDrawable="@drawable/progress_bar"
+                android:progressTint="@color/colorLightGreen" />
 
-        <ImageView
-            android:id="@+id/milestonesMenu"
-            android:layout_width="0dp"
-            android:layout_weight=".10"
+            <TextView
+                android:id="@+id/milestoneIssuesOpen"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="8"
+                android:text="@string/repoStars"
+                android:gravity="end"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:scaleType="fitEnd"
-            android:src="@drawable/ic_dotted_menu_horizontal"
-            android:contentDescription="@string/menuContentDesc" />
+            android:id="@+id/milestoneDateMenuFrame"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_weight=".90"
+                android:layout_height="wrap_content"
+                android:id="@+id/dueDateFrame"
+                android:orientation="horizontal"
+                android:layout_marginTop="3dp">
+
+                <TextView
+                    android:id="@+id/milestoneDueDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dueDate"
+                    android:gravity="start"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="12sp" />
+
+            </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/milestonesMenu"
+                android:layout_width="0dp"
+                android:layout_weight=".10"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:scaleType="fitEnd"
+                android:src="@drawable/ic_dotted_menu_horizontal"
+                android:contentDescription="@string/menuContentDesc" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+    <View
+        android:layout_below="@id/mainFrame"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:id="@+id/divider"
+        android:background="?attr/dividerColor" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_organizations.xml b/app/src/main/res/layout/list_organizations.xml
index 47757065..cc6204be 100644
--- a/app/src/main/res/layout/list_organizations.xml
+++ b/app/src/main/res/layout/list_organizations.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/primaryBackgroundColor" >
+    android:background="?attr/primaryBackgroundColor">
 
     <RelativeLayout
         android:id="@+id/linearLayoutFrame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:fitsSystemWindows="true"
         android:orientation="vertical"
-        android:padding="10dp"
-        tools:context=".activities.MainActivity">
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/organizationId"
@@ -26,7 +24,6 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginEnd="15dp"
-            android:layout_marginBottom="5dp"
             android:src="@drawable/ic_android"
             android:contentDescription="@string/orgContentAvatar"/>
 
@@ -50,7 +47,6 @@
                 android:id="@+id/orgDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
                 android:text="@string/orgDescription"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml
index b0380726..7aecb804 100644
--- a/app/src/main/res/layout/list_pr.xml
+++ b/app/src/main/res/layout/list_pr.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/relativeLayoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="15dp"
-    tools:context=".activities.RepoDetailActivity">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/prNumber"
@@ -38,77 +36,87 @@
         android:layout_height="wrap_content"
         android:visibility="invisible"/>
 
-    <ImageView
-        android:id="@+id/assigneeAvatar"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="15dp"
-        android:contentDescription="@string/generalImgContentText"
-        android:src="@drawable/ic_android" />
-
-    <LinearLayout
-        android:id="@+id/infoSection"
+    <RelativeLayout
+        android:id="@+id/mainFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/assigneeAvatar"
+        android:layout_alignParentTop="true"
+        android:layout_margin="15dp"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/framePrNameStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/prTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="top|center_vertical"
-                android:textAlignment="gravity"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="18sp" />
-
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/assigneeAvatar"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:src="@drawable/ic_android" />
 
         <LinearLayout
-            android:id="@+id/frameCreatedDate"
+            android:id="@+id/infoSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
+            android:layout_toEndOf="@+id/assigneeAvatar"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/frameCommentsCount"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
+                android:id="@+id/framePrNameStatus"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/prCommentsCount"
+                    android:id="@+id/prTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:drawablePadding="5dp"
-                    android:drawableStart="@drawable/ic_comment_20"
-                    android:layout_gravity="center_horizontal"
+                    android:gravity="top|center_vertical"
+                    android:textAlignment="gravity"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/frameCreatedDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/frameCommentsCount"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/prCommentsCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="start"
+                        android:drawablePadding="5dp"
+                        android:drawableStart="@drawable/ic_comment_20"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/prCreatedTime"
+                    android:layout_width="0dp"
+                    android:layout_weight=".25"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/prCreatedTime"
-                android:layout_width="0dp"
-                android:layout_weight=".25"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp" />
-
         </LinearLayout>
 
-    </LinearLayout>
+    </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_profile_emails.xml b/app/src/main/res/layout/list_profile_emails.xml
index ba7cded1..cd41d14a 100644
--- a/app/src/main/res/layout/list_profile_emails.xml
+++ b/app/src/main/res/layout/list_profile_emails.xml
@@ -3,10 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="15dp"
-    android:paddingTop="15dp"
-    android:paddingStart="20dp"
-    android:paddingEnd="20dp"
+    android:padding="15dp"
     android:background="?attr/primaryBackgroundColor" >
 
     <TextView
diff --git a/app/src/main/res/layout/list_profile_followers.xml b/app/src/main/res/layout/list_profile_followers.xml
index f7315e09..6c6208a5 100644
--- a/app/src/main/res/layout/list_profile_followers.xml
+++ b/app/src/main/res/layout/list_profile_followers.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="10dp"
-    android:paddingTop="10dp"
-    android:paddingStart="20dp"
-    android:paddingEnd="20dp"
+    android:padding="15dp"
     android:background="?attr/primaryBackgroundColor" >
 
     <ImageView
diff --git a/app/src/main/res/layout/list_profile_following.xml b/app/src/main/res/layout/list_profile_following.xml
index f7315e09..6c6208a5 100644
--- a/app/src/main/res/layout/list_profile_following.xml
+++ b/app/src/main/res/layout/list_profile_following.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="10dp"
-    android:paddingTop="10dp"
-    android:paddingStart="20dp"
-    android:paddingEnd="20dp"
+    android:padding="15dp"
     android:background="?attr/primaryBackgroundColor" >
 
     <ImageView
diff --git a/app/src/main/res/layout/list_releases.xml b/app/src/main/res/layout/list_releases.xml
index 1718e7e6..11c8ecf0 100644
--- a/app/src/main/res/layout/list_releases.xml
+++ b/app/src/main/res/layout/list_releases.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor" >
@@ -9,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:fitsSystemWindows="true"
         android:orientation="vertical"
         android:layout_margin="15dp" >
 
@@ -72,8 +72,8 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="5dp"
-            android:background="?attr/inputBackgroundColor" />
+            android:id="@+id/divider"
+            android:background="?attr/dividerColor" />
 
         <TextView
             android:id="@+id/releaseZipDownload"