devol/UntrackMe-app-android-redirect-nitter-invidious-bibliogram
1
0
Fork 0
mirror of https://framagit.org/tom79/nitterizeme synced 2025-02-13 10:10:48 +01:00
Code Issues Releases Wiki Activity

Change layout

Browse Source
This commit is contained in:
Thomas 2020-02-29 15:10:11 +01:00
parent 39a2cdf090
commit 44d4c39abb
3 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/app/fedilab/nitterizeme/Instance.java
View File

@ -55,19 +55,19 @@ class Instance {
this.type = type;
}
public boolean isCloudflare() {
boolean isCloudflare() {
return cloudflare;
}
public void setCloudflare(boolean cloudflare) {
void setCloudflare(boolean cloudflare) {
this.cloudflare = cloudflare;
}
public String getLocale() {
String getLocale() {
return locale;
}
public void setLocale(String locale) {
void setLocale(String locale) {
this.locale = locale;
}

4
app/src/main/java/app/fedilab/nitterizeme/InstanceActivity.java
View File

@ -172,17 +172,19 @@ public class InstanceActivity extends AppCompatActivity {
InstanceAdapter invidiousAdapter = new InstanceAdapter(invidiousInstances);
invidious_instances.setAdapter(invidiousAdapter);
invidious_instances.setLayoutManager(iLayoutManager);
invidious_instances.setNestedScrollingEnabled(false);
final LinearLayoutManager nLayoutManager = new LinearLayoutManager(activity);
InstanceAdapter nitterAdapter = new InstanceAdapter(nitterInstances);
nitter_instances.setAdapter(nitterAdapter);
nitter_instances.setLayoutManager(nLayoutManager);
nitter_instances.setNestedScrollingEnabled(false);
final LinearLayoutManager bLayoutManager = new LinearLayoutManager(activity);
InstanceAdapter bibliogramAdapter = new InstanceAdapter(bibliogramInstances);
bibliogram_instances.setAdapter(bibliogramAdapter);
bibliogram_instances.setLayoutManager(bLayoutManager);
bibliogram_instances.setNestedScrollingEnabled(false);
latency_test.setOnClickListener(
v -> {
invidiousAdapter.evalLatency();

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

@ -8,34 +8,50 @@
<RadioButton
android:id="@+id/checkbox_instance"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true" />
<ImageView
android:layout_gravity="center"
android:layout_marginStart="3dp"
android:layout_marginLeft="3dp"
android:id="@+id/use_cloudflare"
android:layout_width="30dp"
android:src="@drawable/ic_cloudflare"
android:layout_height="20dp"
android:contentDescription="@string/cloudflare" />
<TextView
android:layout_marginStart="3dp"
android:layout_marginLeft="3dp"
android:layout_width="20dp"
android:layout_height="wrap_content"
android:id="@+id/locale"/>
<TextView
android:id="@+id/latency"
<LinearLayout
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" />
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>
</LinearLayout>