Commit be450b0a authored by M M Arif's avatar M M Arif

Merge branch '55-list-following' into 'master'

Resolve "[New]  List the users that the authenticated user is following"

Closes #55

See merge request mmarif4u/gitnex!93
parents 7b23e31b 0ffeaf41
......@@ -7,7 +7,7 @@ android {
minSdkVersion 21
targetSdkVersion 28
versionCode 25
versionName "1.1.0-rc2-debug"
versionName "1.1.0-rc2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
......
......@@ -131,12 +131,12 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
holder.userNameMain.setText(currentItem.getUsername());
if (!currentItem.getFullname().equals("")) {
holder.userFullName.setText(String.valueOf(currentItem.getFullname()));
holder.userName.setText(currentItem.getUsername());
holder.userFullName.setText(currentItem.getFullname());
holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
}
else {
holder.userFullName.setText(String.valueOf(currentItem.getUsername()));
holder.userName.setText(String.valueOf(currentItem.getUsername()));
holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
}
if (!currentItem.getAvatar().equals("")) {
......
......@@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:background="@color/backgroundColor" >
......@@ -31,7 +31,7 @@
android:layout_marginBottom="5dp"
android:text="@string/userName"
android:textColor="@color/white"
android:textSize="18sp" />
android:textSize="16sp" />
<TextView
android:id="@+id/userName"
......@@ -58,8 +58,8 @@
android:gravity="end"
android:layout_marginStart="14dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:orientation="vertical">
<ImageView
......
......@@ -351,9 +351,6 @@
<string name="menuDeleteText">Delete</string>
<string name="colorfulBulletSpan" translatable="false">\u0020\u0020\u0020\u25CF\u0020\u0020\u0020</string>
<string name="modifiedText">edited</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<!-- generic copy -->
</resources>
- New: Add collaborator to repository
- New: User can now edit his/her own comments
- New: See who are your followers
- New: See who you are following
- Enhancement: Redesign Profile screen
- Enhancement: Added edited status for single issue and comments
Release notes: https://gitlab.com/mmarif4u/gitnex/releases
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment