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 e7962d46..b9269c4c 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -357,7 +357,7 @@ public class IssueDetailActivity extends AppCompatActivity { tinyDb.putString("issueState", singleIssue.getState()); tinyDb.putString("issueTitle", singleIssue.getTitle()); - Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(assigneeAvatar); + Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar); issueTitle.setText(getString(R.string.issueTitleWithId, singleIssue.getNumber(), singleIssue.getTitle())); String cleanIssueDescription = singleIssue.getBody().trim(); Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription)); @@ -374,7 +374,7 @@ public class IssueDetailActivity extends AppCompatActivity { ImageView assigneesView = new ImageView(getApplicationContext()); - Picasso.get().load(singleIssue.getAssignees().get(i).getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(80, 80).centerCrop().into(assigneesView); + Picasso.get().load(singleIssue.getAssignees().get(i).getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop().into(assigneesView); assigneesLayout.addView(assigneesView); assigneesView.setLayoutParams(params1); diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 05afde24..6860135e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -148,7 +148,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On userAvatar = hView.findViewById(R.id.userAvatar); if (!userAvatarNav.equals("")) { - Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(100, 0)).resize(180, 180).centerCrop().into(userAvatar); + Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar); } } else { @@ -354,7 +354,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On userAvatar = hView.findViewById(R.id.userAvatar); if (!Objects.requireNonNull(userDetails).getAvatar().equals("")) { - Picasso.get().load(userDetails.getAvatar()).transform(new RoundedTransformation(100, 0)).resize(180, 180).centerCrop().into(userAvatar); + Picasso.get().load(userDetails.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar); } else { userAvatar.setImageResource(R.mipmap.ic_launcher_round); } diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java index 02088f1e..e83a39d3 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java @@ -17,6 +17,7 @@ import com.vdurmont.emoji.EmojiParser; import org.mian.gitnex.R; import org.mian.gitnex.activities.ReplyToIssueActivity; import org.mian.gitnex.helpers.TimeHelper; +import org.mian.gitnex.helpers.UserMentions; import org.mian.gitnex.models.IssueComments; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.util.TinyDB; @@ -178,9 +179,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter @@ -182,7 +183,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:id="@+id/divider" - android:layout_marginTop="10dp" + android:layout_marginTop="15dp" android:background="@color/divider" /> diff --git a/app/src/main/res/layout/issue_comments.xml b/app/src/main/res/layout/issue_comments.xml index ac37f823..215f5284 100644 --- a/app/src/main/res/layout/issue_comments.xml +++ b/app/src/main/res/layout/issue_comments.xml @@ -34,6 +34,8 @@ 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 3507b16c..c8ff7646 100644 --- a/app/src/main/res/layout/my_repos_list.xml +++ b/app/src/main/res/layout/my_repos_list.xml @@ -22,6 +22,7 @@ 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" /> @@ -52,8 +53,9 @@ android:layout_weight=".05" android:id="@+id/imageRepoTypeMy" android:layout_width="10dp" - android:layout_height="18dp" + android:layout_height="25dp" 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/nav_header.xml b/app/src/main/res/layout/nav_header.xml index b77b83c2..2896b5c8 100644 --- a/app/src/main/res/layout/nav_header.xml +++ b/app/src/main/res/layout/nav_header.xml @@ -14,7 +14,6 @@ android:src="@drawable/ic_android" android:maxHeight="24dp" android:maxWidth="24dp" - android:layout_marginTop="5dp" android:paddingStart="20dp" android:paddingEnd="5dp" android:contentDescription="@string/app_name"/> diff --git a/app/src/main/res/layout/organizations_list.xml b/app/src/main/res/layout/organizations_list.xml index fbe08f2d..eff210ac 100644 --- a/app/src/main/res/layout/organizations_list.xml +++ b/app/src/main/res/layout/organizations_list.xml @@ -22,6 +22,8 @@ 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 eea63075..c8f74c41 100644 --- a/app/src/main/res/layout/profile_followers_list.xml +++ b/app/src/main/res/layout/profile_followers_list.xml @@ -13,6 +13,8 @@ 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 eea63075..c8f74c41 100644 --- a/app/src/main/res/layout/profile_following_list.xml +++ b/app/src/main/res/layout/profile_following_list.xml @@ -13,6 +13,8 @@ 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/repos_list.xml b/app/src/main/res/layout/repos_list.xml index 7194eae2..ac788657 100644 --- a/app/src/main/res/layout/repos_list.xml +++ b/app/src/main/res/layout/repos_list.xml @@ -23,6 +23,7 @@ android:layout_height="40dp" android:layout_marginEnd="15dp" android:contentDescription="@string/repoContentAvatar" + android:layout_marginTop="5dp" android:src="@drawable/ic_android" /> 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 7194eae2..52bdb5cd 100644 --- a/app/src/main/res/layout/repositories_by_org_list.xml +++ b/app/src/main/res/layout/repositories_by_org_list.xml @@ -22,6 +22,7 @@ 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" /> @@ -52,8 +53,9 @@ android:layout_weight=".05" android:id="@+id/imageRepoType" android:layout_width="10dp" - android:layout_height="18dp" + android:layout_height="25dp" 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/starred_repos_list.xml b/app/src/main/res/layout/starred_repos_list.xml index 5b3400fd..2a52cdd2 100644 --- a/app/src/main/res/layout/starred_repos_list.xml +++ b/app/src/main/res/layout/starred_repos_list.xml @@ -22,6 +22,7 @@ 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" /> @@ -52,8 +53,9 @@ android:layout_weight=".05" android:id="@+id/imageRepoType" android:layout_width="10dp" - android:layout_height="18dp" + android:layout_height="25dp" android:layout_gravity="end" + android:layout_marginTop="5dp" android:contentDescription="@string/privateAvatar" android:src="@drawable/ic_lock_24dp" />