Some layout changes

This commit is contained in:
tom79 2019-11-05 18:04:50 +01:00
parent c6657ebfe0
commit ca22e9f9a2
2 changed files with 11 additions and 39 deletions

View File

@ -19,17 +19,11 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.FitCenter;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import java.util.List;
import app.fedilab.android.R;
@ -81,11 +75,7 @@ public class InstancePeertubeRegAdapter extends RecyclerView.Adapter {
holder.instance_count_user.setText(context.getString(R.string.users, Helper.withSuffix(instanceReg.getTotal_users())));
holder.instance_description.setText(instanceReg.getDescription());
holder.instance_host.setText(instanceReg.getDomain());
holder.instance_version.setText(String.format("%s - %s", instanceReg.getCategory(), instanceReg.getVersion()));
Glide.with(context)
.load(instanceReg.getProxied_thumbnail())
.apply(new RequestOptions().transforms(new FitCenter(), new RoundedCorners(10)))
.into(holder.instance_pp);
holder.instance_version.setText(String.format("%s - %s (%s)", instanceReg.getCategory(), instanceReg.getVersion(), instanceReg.getCountry()));
}
public long getItemId(int position) {
@ -99,13 +89,11 @@ public class InstancePeertubeRegAdapter extends RecyclerView.Adapter {
class ViewHolder extends RecyclerView.ViewHolder {
ImageView instance_pp;
TextView instance_host, instance_version, instance_description, instance_count_user;
ImageButton instance_choose;
public ViewHolder(View itemView) {
super(itemView);
instance_pp = itemView.findViewById(R.id.instance_pp);
instance_host = itemView.findViewById(R.id.instance_host);
instance_version = itemView.findViewById(R.id.instance_version);
instance_description = itemView.findViewById(R.id.instance_description);

View File

@ -30,39 +30,23 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/instance_pp"
android:layout_width="80dp"
android:layout_height="80dp"
android:scaleType="centerCrop"
android:contentDescription="@string/instance_logo" />
<LinearLayout
<TextView
android:textStyle="bold"
android:id="@+id/instance_host"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/instance_host"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/instance_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/instance_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_marginTop="5dp"
android:id="@+id/instance_description"
android:layout_width="match_parent"
android:layout_height="wrap_content" />