From e53ef41fc1566dcde6417b073e785670eb81af43 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Tue, 1 Oct 2019 06:42:56 +0000
Subject: [PATCH] ui-improvements (#81)

---
 .../activities/IssueDetailActivity.java       |   6 +-
 .../SingleIssueBottomSheetFragment.java       |   7 +-
 app/src/main/res/drawable/ic_comment_20.xml   |   5 +
 app/src/main/res/drawable/round_corners.xml   |   2 +-
 .../main/res/layout/activity_issue_detail.xml |   1 -
 app/src/main/res/layout/admin_users_list.xml  |   2 -
 .../res/layout/collaborators_list_search.xml  |   1 -
 app/src/main/res/layout/fragment_profile.xml  |   2 -
 app/src/main/res/layout/issue_comments.xml    |   2 -
 app/src/main/res/layout/my_repos_list.xml     |   4 +-
 .../main/res/layout/organizations_list.xml    |   1 -
 .../res/layout/profile_followers_list.xml     |   2 -
 .../res/layout/profile_following_list.xml     |   2 -
 .../res/layout/repo_detail_issues_list.xml    |  13 +-
 app/src/main/res/layout/repos_list.xml        |   4 +-
 .../res/layout/repositories_by_org_list.xml   | 246 +++++++++--------
 .../main/res/layout/starred_repos_list.xml    | 250 +++++++++---------
 app/src/main/res/values-de/strings.xml        |   4 +-
 app/src/main/res/values-fr/strings.xml        |   4 +-
 app/src/main/res/values-ru/strings.xml        |   4 +-
 app/src/main/res/values/strings.xml           |   4 +-
 21 files changed, 275 insertions(+), 291 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_comment_20.xml

diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index b9269c4c..98ccda30 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -478,7 +478,7 @@ public class IssueDetailActivity extends AppCompatActivity {
                             case "pretty": {
                                 PrettyTime prettyTime = new PrettyTime(new Locale(locale));
                                 String createdTime = prettyTime.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+                                issueCreatedTime.setText(createdTime);
                                 issueCreatedTime.setVisibility(View.VISIBLE);
                                 issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), getApplicationContext()));
                                 break;
@@ -486,14 +486,14 @@ public class IssueDetailActivity extends AppCompatActivity {
                             case "normal": {
                                 DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
                                 String createdTime = formatter.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+                                issueCreatedTime.setText(createdTime);
                                 issueCreatedTime.setVisibility(View.VISIBLE);
                                 break;
                             }
                             case "normal1": {
                                 DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
                                 String createdTime = formatter.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(getString(R.string.createdTime, createdTime));
+                                issueCreatedTime.setText(createdTime);
                                 issueCreatedTime.setVisibility(View.VISIBLE);
                                 break;
                             }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
index f01b36dd..f3723597 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java
@@ -13,6 +13,7 @@ import org.mian.gitnex.activities.AddRemoveAssigneesActivity;
 import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -85,14 +86,14 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             @Override
             public void onClick(View v) {
 
-                //get url of repo
+                // get url of repo
                 String repoFullName = tinyDB.getString("repoFullName");
                 String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
                 if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
                     instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
                 }
 
-                //get issue Url
+                // get issue Url
                 String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
 
                 // copy to clipboard
@@ -102,6 +103,8 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
 
                 dismiss();
 
+                Toasty.info(getContext(), getContext().getString(R.string.copyIssueUrlToastMsg));
+
             }
         });
 
diff --git a/app/src/main/res/drawable/ic_comment_20.xml b/app/src/main/res/drawable/ic_comment_20.xml
new file mode 100644
index 00000000..8a5e73a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_comment_20.xml
@@ -0,0 +1,5 @@
+<vector android:height="20dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_corners.xml b/app/src/main/res/drawable/round_corners.xml
index 2b483c75..bef6d1ab 100644
--- a/app/src/main/res/drawable/round_corners.xml
+++ b/app/src/main/res/drawable/round_corners.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <corners android:radius="35dp"/>
+    <corners android:radius="5dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 5b9f4d0d..84515c6b 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -51,7 +51,6 @@
                         android:id="@+id/assigneeAvatar"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:layout_marginTop="5dp"
                         android:layout_marginEnd="15dp"
                         android:contentDescription="@string/generalImgContentText" />
 
diff --git a/app/src/main/res/layout/admin_users_list.xml b/app/src/main/res/layout/admin_users_list.xml
index dd09d217..09f33e17 100644
--- a/app/src/main/res/layout/admin_users_list.xml
+++ b/app/src/main/res/layout/admin_users_list.xml
@@ -21,7 +21,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="5dp"
             android:contentDescription="@string/generalImgContentText"
             android:src="@drawable/ic_android" />
 
@@ -31,7 +30,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:scaleType="fitCenter"
-            android:layout_marginTop="5dp"
             android:contentDescription="@string/userRoleAdmin"
             android:src="@drawable/ic_android" />
 
diff --git a/app/src/main/res/layout/collaborators_list_search.xml b/app/src/main/res/layout/collaborators_list_search.xml
index 22bdbf95..b9e6fd8a 100644
--- a/app/src/main/res/layout/collaborators_list_search.xml
+++ b/app/src/main/res/layout/collaborators_list_search.xml
@@ -13,7 +13,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginTop="5dp"
         android:contentDescription="@string/generalImgContentText"
         android:src="@drawable/ic_android" />
 
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index d7803735..5c3a6328 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -23,8 +23,6 @@
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:layout_gravity="start"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="5dp"
             android:contentDescription="@string/logo"
             android:src="@mipmap/app_logo_round" />
 
diff --git a/app/src/main/res/layout/issue_comments.xml b/app/src/main/res/layout/issue_comments.xml
index 215f5284..ac37f823 100644
--- a/app/src/main/res/layout/issue_comments.xml
+++ b/app/src/main/res/layout/issue_comments.xml
@@ -34,8 +34,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
         android:contentDescription="@string/generalImgContentText"
         android:src="@drawable/ic_android" />
 
diff --git a/app/src/main/res/layout/my_repos_list.xml b/app/src/main/res/layout/my_repos_list.xml
index c8ff7646..0512fca5 100644
--- a/app/src/main/res/layout/my_repos_list.xml
+++ b/app/src/main/res/layout/my_repos_list.xml
@@ -22,7 +22,6 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginEnd="15dp"
-            android:layout_marginTop="5dp"
             android:contentDescription="@string/repoContentAvatar"
             android:src="@drawable/ic_android" />
 
@@ -53,9 +52,8 @@
                     android:layout_weight=".05"
                     android:id="@+id/imageRepoTypeMy"
                     android:layout_width="10dp"
-                    android:layout_height="25dp"
+                    android:layout_height="20dp"
                     android:layout_gravity="end"
-                    android:layout_marginTop="5dp"
                     android:contentDescription="@string/privateAvatar"
                     android:src="@drawable/ic_lock_bold" />
 
diff --git a/app/src/main/res/layout/organizations_list.xml b/app/src/main/res/layout/organizations_list.xml
index eff210ac..efa335b8 100644
--- a/app/src/main/res/layout/organizations_list.xml
+++ b/app/src/main/res/layout/organizations_list.xml
@@ -22,7 +22,6 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginEnd="15dp"
-            android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
             android:src="@drawable/ic_android"
             android:contentDescription="@string/orgContentAvatar"/>
diff --git a/app/src/main/res/layout/profile_followers_list.xml b/app/src/main/res/layout/profile_followers_list.xml
index c8f74c41..eea63075 100644
--- a/app/src/main/res/layout/profile_followers_list.xml
+++ b/app/src/main/res/layout/profile_followers_list.xml
@@ -13,8 +13,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="15dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
         android:contentDescription="@string/generalImgContentText"
         android:src="@drawable/ic_android" />
 
diff --git a/app/src/main/res/layout/profile_following_list.xml b/app/src/main/res/layout/profile_following_list.xml
index c8f74c41..eea63075 100644
--- a/app/src/main/res/layout/profile_following_list.xml
+++ b/app/src/main/res/layout/profile_following_list.xml
@@ -13,8 +13,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="15dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
         android:contentDescription="@string/generalImgContentText"
         android:src="@drawable/ic_android" />
 
diff --git a/app/src/main/res/layout/repo_detail_issues_list.xml b/app/src/main/res/layout/repo_detail_issues_list.xml
index a2687dae..1591583b 100644
--- a/app/src/main/res/layout/repo_detail_issues_list.xml
+++ b/app/src/main/res/layout/repo_detail_issues_list.xml
@@ -20,8 +20,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
         android:contentDescription="@string/generalImgContentText"
         android:src="@drawable/ic_android" />
 
@@ -57,9 +55,8 @@
 
             <ImageView
                 android:id="@+id/issueType"
-                android:layout_width="16dp"
-                android:layout_height="21dp"
-                android:layout_marginTop="5dp"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:layout_gravity="center_horizontal"
                 android:contentDescription="@string/generalImgContentText"
                 android:src="@drawable/ic_issues" />
@@ -86,10 +83,10 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:drawablePadding="5dp"
-                    android:drawableStart="@drawable/ic_comment_16"
+                    android:drawableStart="@drawable/ic_comment_20"
                     android:layout_gravity="center_horizontal"
                     android:textColor="@color/colorWhite"
-                    android:textSize="12sp" />
+                    android:textSize="14sp" />
 
             </LinearLayout>
 
@@ -100,7 +97,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/colorWhite"
-                android:textSize="12sp" />
+                android:textSize="14sp" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/repos_list.xml b/app/src/main/res/layout/repos_list.xml
index ac788657..7940a4d3 100644
--- a/app/src/main/res/layout/repos_list.xml
+++ b/app/src/main/res/layout/repos_list.xml
@@ -23,7 +23,6 @@
             android:layout_height="40dp"
             android:layout_marginEnd="15dp"
             android:contentDescription="@string/repoContentAvatar"
-            android:layout_marginTop="5dp"
             android:src="@drawable/ic_android" />
 
         <LinearLayout
@@ -53,9 +52,8 @@
                     android:layout_weight=".05"
                     android:id="@+id/imageRepoType"
                     android:layout_width="10dp"
-                    android:layout_height="25dp"
+                    android:layout_height="20dp"
                     android:layout_gravity="end"
-                    android:layout_marginTop="5dp"
                     android:contentDescription="@string/privateAvatar"
                     android:src="@drawable/ic_lock_24dp" />
 
diff --git a/app/src/main/res/layout/repositories_by_org_list.xml b/app/src/main/res/layout/repositories_by_org_list.xml
index 52bdb5cd..95bea649 100644
--- a/app/src/main/res/layout/repositories_by_org_list.xml
+++ b/app/src/main/res/layout/repositories_by_org_list.xml
@@ -1,145 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linearLayoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:layout_alignParentTop="true"
+    android:layout_marginTop="0dp"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    android:layout_margin="10dp"
+    android:theme="@style/AppTheme"
+    android:background="@color/backgroundColor"
+    tools:context=".activities.MainActivity">
 
-    <RelativeLayout
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/linearLayoutFrame"
+    <ImageView
+        android:id="@+id/imageAvatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="15dp"
+        android:contentDescription="@string/repoContentAvatar"
+        android:src="@drawable/ic_android" />
+
+    <LinearLayout
+        android:id="@+id/infoSection"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="0dp"
-        android:fitsSystemWindows="true"
-        android:orientation="vertical"
-        android:layout_margin="10dp"
-        android:theme="@style/AppTheme"
-        tools:context=".activities.MainActivity">
-
-        <ImageView
-            android:id="@+id/imageAvatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginTop="5dp"
-            android:contentDescription="@string/repoContentAvatar"
-            android:src="@drawable/ic_android" />
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/imageAvatar"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/infoSection"
+            android:id="@+id/frameRepoName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/imageAvatar"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/frameRepoName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/repoName"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".95"
-                    android:layout_marginBottom="5dp"
-                    android:text="@string/repoName"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-                <ImageView
-                    android:layout_weight=".05"
-                    android:id="@+id/imageRepoType"
-                    android:layout_width="10dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="5dp"
-                    android:contentDescription="@string/privateAvatar"
-                    android:src="@drawable/ic_lock_24dp" />
-
-            </LinearLayout>
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/repoFullName"
-                android:layout_width="match_parent"
+                android:id="@+id/repoName"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight=".95"
                 android:layout_marginBottom="5dp"
-                android:text="@string/repoFullname"
-                android:textColor="@color/colorWhite"
-                android:textSize="16sp" />
+                android:text="@string/repoName"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
 
-            <TextView
-                android:id="@+id/repoDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:text="@string/repoDescription"
-                android:textColor="@color/colorWhite"
-                android:textSize="16sp"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/repoOpenIssuesCount"
-                    android:layout_width="0dp"
-                    android:layout_height="20dp"
-                    android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_issue_comments"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/repoStars"
-                    android:layout_width="0dp"
-                    android:layout_height="20dp"
-                    android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_star"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/repoStars"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/repoWatchers"
-                    android:layout_width="0dp"
-                    android:layout_height="20dp"
-                    android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_watchers"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:id="@+id/reposDropdownMenu"
-                    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>
+            <ImageView
+                android:layout_weight=".05"
+                android:id="@+id/imageRepoType"
+                android:layout_width="10dp"
+                android:layout_height="20dp"
+                android:layout_gravity="end"
+                android:contentDescription="@string/privateAvatar"
+                android:src="@drawable/ic_lock_24dp" />
 
         </LinearLayout>
 
-    </RelativeLayout>
+        <TextView
+            android:id="@+id/repoFullName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="@string/repoFullname"
+            android:textColor="@color/colorWhite"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/repoDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/repoDescription"
+            android:textColor="@color/colorWhite"
+            android:textSize="16sp"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/repoOpenIssuesCount"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight=".25"
+                android:drawableStart="@drawable/ic_issue_comments"
+                android:drawablePadding="6dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:text="@string/repoWatchers"
+                android:textColor="@color/colorWhite"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/repoStars"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight=".25"
+                android:drawableStart="@drawable/ic_star"
+                android:drawablePadding="6dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:text="@string/repoStars"
+                android:textColor="@color/colorWhite"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/repoWatchers"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight=".25"
+                android:drawableStart="@drawable/ic_watchers"
+                android:drawablePadding="6dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:text="@string/repoWatchers"
+                android:textColor="@color/colorWhite"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:id="@+id/reposDropdownMenu"
+                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>
 
 </RelativeLayout>
+
diff --git a/app/src/main/res/layout/starred_repos_list.xml b/app/src/main/res/layout/starred_repos_list.xml
index 2a52cdd2..0b5f06ad 100644
--- a/app/src/main/res/layout/starred_repos_list.xml
+++ b/app/src/main/res/layout/starred_repos_list.xml
@@ -1,145 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<RelativeLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linearLayoutFrame"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:layout_height="match_parent"
+    android:layout_alignParentTop="true"
+    android:layout_marginTop="0dp"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    android:padding="10dp"
+    android:theme="@style/AppTheme"
+    android:background="@color/backgroundColor"
+    tools:context=".activities.MainActivity">
 
-    <RelativeLayout
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/linearLayoutFrame"
+    <ImageView
+        android:id="@+id/imageAvatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="15dp"
+        android:contentDescription="@string/repoContentAvatar"
+        android:src="@drawable/ic_android" />
+
+    <LinearLayout
+        android:id="@+id/infoSection"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="0dp"
-        android:fitsSystemWindows="true"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:theme="@style/AppTheme"
-        tools:context=".activities.MainActivity">
-
-        <ImageView
-            android:id="@+id/imageAvatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginTop="5dp"
-            android:contentDescription="@string/repoContentAvatar"
-            android:src="@drawable/ic_android" />
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/imageAvatar"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/infoSection"
+            android:id="@+id/frameRepoName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/imageAvatar"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/frameRepoName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/repoName"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".95"
-                    android:layout_marginBottom="5dp"
-                    android:text="@string/repoName"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-                <ImageView
-                    android:layout_weight=".05"
-                    android:id="@+id/imageRepoType"
-                    android:layout_width="10dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="5dp"
-                    android:contentDescription="@string/privateAvatar"
-                    android:src="@drawable/ic_lock_24dp" />
-
-            </LinearLayout>
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/repoFullName"
-                android:layout_width="match_parent"
+                android:id="@+id/repoName"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight=".95"
                 android:layout_marginBottom="5dp"
-                android:text="@string/repoFullname"
-                android:textColor="@color/colorWhite"
-                android:textSize="16sp" />
+                android:text="@string/repoName"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
 
-            <TextView
-                android:id="@+id/repoDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:text="@string/repoDescription"
-                android:textColor="@color/colorWhite"
-                android:textSize="16sp"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/repoOpenIssuesCount"
-                    android:layout_width="0dp"
-                    android:layout_height="20dp"
-                    android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_issue_comments"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/repoStars"
-                    android:layout_width="0dp"
-                    android:layout_height="20dp"
-                    android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_star"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/repoStars"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/repoWatchers"
-                    android:layout_width="0dp"
-                    android:layout_height="20dp"
-                    android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_watchers"
-                    android:drawablePadding="6dp"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:id="@+id/reposDropdownMenu"
-                    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>
+            <ImageView
+                android:layout_weight=".05"
+                android:id="@+id/imageRepoType"
+                android:layout_width="10dp"
+                android:layout_height="20dp"
+                android:layout_gravity="end"
+                android:contentDescription="@string/privateAvatar"
+                android:src="@drawable/ic_lock_24dp" />
 
         </LinearLayout>
 
-    </RelativeLayout>
+        <TextView
+            android:id="@+id/repoFullName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="@string/repoFullname"
+            android:textColor="@color/colorWhite"
+            android:textSize="16sp" />
 
-</RelativeLayout>
+        <TextView
+            android:id="@+id/repoDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/repoDescription"
+            android:textColor="@color/colorWhite"
+            android:textSize="16sp"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/repoOpenIssuesCount"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight=".25"
+                android:drawableStart="@drawable/ic_issue_comments"
+                android:drawablePadding="6dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:text="@string/repoWatchers"
+                android:textColor="@color/colorWhite"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/repoStars"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight=".25"
+                android:drawableStart="@drawable/ic_star"
+                android:drawablePadding="6dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:text="@string/repoStars"
+                android:textColor="@color/colorWhite"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/repoWatchers"
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight=".25"
+                android:drawableStart="@drawable/ic_watchers"
+                android:drawablePadding="6dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:text="@string/repoWatchers"
+                android:textColor="@color/colorWhite"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:id="@+id/reposDropdownMenu"
+                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>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f36475a1..7a4d8757 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -427,6 +427,9 @@
 
     <string name="strFilter">Filter</string>
 
+    <string name="copyIssueUrl">Issue URL kopieren</string>
+    <string name="copyIssueUrlToastMsg">Issue URL copied to clipboard</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Fertig</string>
@@ -447,7 +450,6 @@
     <string name="websiteText">Website</string>
     <string name="locationText">Standort</string>
     <string name="characters255Limit">maximal 255 Zeichen</string>
-    <string name="copyIssueUrl">Issue Url kopieren</string>
     <!-- generic copy -->
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 54c4d67d..bbf5c35d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -427,6 +427,9 @@
 
     <string name="strFilter">Filter</string>
 
+    <string name="copyIssueUrl">Copier l Issue URL</string>
+    <string name="copyIssueUrlToastMsg">Issue URL copied to clipboard</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Done</string>
@@ -448,7 +451,6 @@
     <string name="locationText">Location</string>
     <string name="openWebRepo">Ouvrir avec le Browser</string>
     <string name="characters255Limit">Max 255 characters</string>
-    <string name="copyIssueUrl">Copier l Issue Url</string>
     <!-- generic copy -->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 48f47a57..0dfd92ec 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -427,6 +427,9 @@
 
     <string name="strFilter">Filter</string>
 
+    <string name="copyIssueUrl">Copy Issue URL</string>
+    <string name="copyIssueUrlToastMsg">Issue URL copied to clipboard</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Готово</string>
@@ -448,7 +451,6 @@
     <string name="locationText">Место расположения</string>
     <string name="openWebRepo">Открыть с помощью браузера</string>
     <string name="characters255Limit">Max 255 characters</string>
-    <string name="copyIssueUrl">Copy Issue Url</string>
     <!-- generic copy -->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b0d669a..a919bb51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -464,6 +464,9 @@
 
     <string name="strFilter">Filter</string>
 
+    <string name="copyIssueUrl">Copy Issue URL</string>
+    <string name="copyIssueUrlToastMsg">Issue URL copied to clipboard</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Done</string>
@@ -488,7 +491,6 @@
     <string name="locationText">Location</string>
     <string name="characters255Limit">Max 255 characters</string>
     <string name="emptyFields">All fields are required</string>
-    <string name="copyIssueUrl">Copy Issue Url</string>
     <!-- generic copy -->
 
 </resources>