devol
/
UntrackMe-app-android-redirect-nitter-invidious-bibliogram
mirror of https://framagit.org/tom79/nitterizeme
1
0
Fork 0
Code Issues Releases Wiki Activity

Layout changes in instances list

This commit is contained in:
Ash 2020-03-01 06:25:54 +05:30
parent 361abe079b
commit 1b58004adf
2 changed files with 80 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/nitterizeme/InstanceAdapter.java
View File

@ -25,6 +25,7 @@ import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
@ -92,6 +93,7 @@ public class InstanceAdapter extends RecyclerView.Adapter {
holder.locale.setText(instance.getLocale());
if( instance.isCloudflare()){
holder.useCloudflare.setVisibility(View.VISIBLE);
holder.useCloudflare.setOnClickListener(v -> Toast.makeText(context,R.string.cloudflare,Toast.LENGTH_SHORT).show());
}else{
holder.useCloudflare.setVisibility(View.GONE);
}

124
app/src/main/res/layout/drawer_instance.xml
View File

@ -1,57 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal">
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:animateLayoutChanges="true">
<RadioButton
android:id="@+id/checkbox_instance"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:ellipsize="end"
android:singleLine="true" />
<LinearLayout
android:layout_width="50dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/locale"/>
<ImageView
android:layout_gravity="center"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:id="@+id/use_cloudflare"
android:layout_width="20dp"
android:src="@drawable/ic_cloudflare"
android:layout_height="15dp"
android:contentDescription="@string/cloudflare" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/latency"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="end" />
<ProgressBar
android:id="@+id/progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical|end"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
android:singleLine="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/barrier_info_start"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_info_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="start"
app:constraint_referenced_ids="use_cloudflare,progress" />
<ImageView
android:id="@+id/use_cloudflare"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:contentDescription="@string/cloudflare"
android:src="@drawable/ic_warning"
app:layout_constraintBottom_toTopOf="@id/barrier_latency_top"
app:layout_constraintEnd_toStartOf="@id/locale"
app:layout_constraintHeight_percent="0.5"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/locale"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:gravity="center_vertical"
android:textAllCaps="true"
app:layout_constraintBottom_toTopOf="@id/barrier_latency_top"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.5"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_latency_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierAllowsGoneWidgets="false"
app:barrierDirection="top"
app:constraint_referenced_ids="progress,latency" />
<ProgressBar
android:id="@+id/progress"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toStartOf="@id/latency"
app:layout_constraintHeight_percent="0.5"
app:layout_constraintTop_toBottomOf="@id/locale" />
<TextView
android:id="@+id/latency"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="2dp"
android:layout_marginRight="2dp"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.5"
app:layout_constraintTop_toBottomOf="@id/locale" />
</androidx.constraintlayout.widget.ConstraintLayout>