OrgGitea
/
GitNex
mirror of https://codeberg.org/gitnex/GitNex.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fixes-2.1.2' of mmarif/GitNex into release-2.1

This commit is contained in:
M M Arif 2019-10-03 16:45:36 +00:00 committed by Gitea
parent 4904b5899f 07a1fa6aad
commit 22b3802e73
5 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
applicationId "org.mian.gitnex" applicationId "org.mian.gitnex"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 61 versionCode 62
versionName "2.1.1" versionName "2.1.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

11
app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
View File

@ -179,9 +179,14 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
.endConfig() .endConfig()
.buildRoundRect(firstCharacter, color, 3); .buildRoundRect(firstCharacter, color, 3);
if (!currentItem.getAvatar_url().equals("")) { if (currentItem.getAvatar_url() != null) {
Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageMy); if (!currentItem.getAvatar_url().equals("")) {
} else { Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageMy);
} else {
holder.imageMy.setImageDrawable(drawable);
}
}
else {
holder.imageMy.setImageDrawable(drawable); holder.imageMy.setImageDrawable(drawable);
} }

11
app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
View File

@ -180,9 +180,14 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
.endConfig() .endConfig()
.buildRoundRect(firstCharacter, color, 3); .buildRoundRect(firstCharacter, color, 3);
if (!currentItem.getAvatar_url().equals("")) { if (currentItem.getAvatar_url() != null) {
Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image); if (!currentItem.getAvatar_url().equals("")) {
} else { Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
} else {
holder.image.setImageDrawable(drawable);
}
}
else {
holder.image.setImageDrawable(drawable); holder.image.setImageDrawable(drawable);
} }

11
app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
View File

@ -180,9 +180,14 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
.endConfig() .endConfig()
.buildRoundRect(firstCharacter, color, 3); .buildRoundRect(firstCharacter, color, 3);
if (!currentItem.getAvatar_url().equals("")) { if (currentItem.getAvatar_url() != null) {
Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image); if (!currentItem.getAvatar_url().equals("")) {
} else { Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
} else {
holder.image.setImageDrawable(drawable);
}
}
else {
holder.image.setImageDrawable(drawable); holder.image.setImageDrawable(drawable);
} }

4
fastlane/metadata/android/en-US/changelogs/62.txt Normal file
View File

@ -0,0 +1,4 @@
Bugfix: crash when my repo, starred repos are accessed without repo avatar. old Gitea instances
For more, check the release notes.
https://gitea.com/mmarif/GitNex/releases