Merge branch 'feature/follow-requests' into fork

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java

@@ -13,13 +13,10 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.follow_requests.AuthorizeFollowRequest;
-import org.joinmastodon.android.api.requests.follow_requests.RejectFollowRequest;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
-import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
@@ -28,8 +25,6 @@ import org.joinmastodon.android.ui.views.ProgressBarButton;
 
 import java.util.Collections;
 
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;

mastodon/src/main/res/layout/item_discover_account.xml

@@ -11,8 +11,8 @@
 		android:id="@+id/cover"
 		android:layout_width="match_parent"
 		android:layout_height="128dp"
-		android:layout_marginLeft="4dp"
 		android:layout_marginTop="4dp"
+		android:layout_marginLeft="4dp"
 		android:layout_marginRight="4dp"
 		android:scaleType="centerCrop"
 		tools:src="#0f0"/>
@@ -112,11 +112,10 @@
 			android:id="@+id/followers_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="48dp"
-			android:layout_marginStart="12dp"
 			android:layout_marginTop="16dp"
-			android:gravity="center_horizontal"
+			android:layout_marginStart="12dp"
-			android:orientation="vertical">
+			android:orientation="vertical"
-
+			android:gravity="center_horizontal">
 			<TextView
 				android:id="@+id/followers_count"
 				android:layout_width="wrap_content"
@@ -136,11 +135,10 @@
 			android:id="@+id/following_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="48dp"
-			android:layout_marginStart="12dp"
 			android:layout_marginTop="16dp"
-			android:gravity="center_horizontal"
+			android:layout_marginStart="12dp"
-			android:orientation="vertical">
+			android:orientation="vertical"
-
+			android:gravity="center_horizontal">
 			<TextView
 				android:id="@+id/following_count"
 				android:layout_width="wrap_content"
@@ -168,7 +166,8 @@
 			android:layout_marginTop="8dp"
 			android:clipToPadding="false"
 			android:paddingHorizontal="4dp"
-			android:paddingVertical="8dp">
+			android:paddingVertical="8dp"
+			android:visibility="gone">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
 				android:id="@+id/reject_btn"
@@ -198,7 +197,8 @@
 			android:layout_marginTop="8dp"
 			android:clipToPadding="false"
 			android:paddingHorizontal="4dp"
-			android:paddingVertical="8dp">
+			android:paddingVertical="8dp"
+			android:visibility="gone">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
 				android:id="@+id/accept_btn"
@@ -225,9 +225,8 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="8dp"
-			android:clipToPadding="false"
 			android:padding="8dp"
-			android:visibility="gone">
+			android:clipToPadding="false">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
 				android:id="@+id/action_btn"
@@ -238,14 +237,14 @@
 
 			<ProgressBar
 				android:id="@+id/action_progress"
-				style="?android:progressBarStyleSmall"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:elevation="10dp"
 				android:indeterminate="true"
-				android:indeterminateTint="?colorButtonText"
+				style="?android:progressBarStyleSmall"
+				android:elevation="10dp"
 				android:outlineProvider="none"
+				android:indeterminateTint="?colorButtonText"
 				android:visibility="gone"/>
 		</FrameLayout>
 	</LinearLayout>