Its pretty much done i think
This commit is contained in:
parent
cfb9854a8e
commit
4940eff7f9
|
@ -3,6 +3,7 @@ package org.joinmastodon.android.ui.displayitems;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Button;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
@ -34,14 +35,15 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
|
||||||
|
|
||||||
public static class Holder extends StatusDisplayItem.Holder<WarningFilteredStatusDisplayItem>{
|
public static class Holder extends StatusDisplayItem.Holder<WarningFilteredStatusDisplayItem>{
|
||||||
public final View warningWrap;
|
public final View warningWrap;
|
||||||
public final ProgressBar progress;
|
public final Button showBtn;
|
||||||
public final TextView text;
|
public final TextView text;
|
||||||
public ArrayList<StatusDisplayItem> filteredItems;
|
public ArrayList<StatusDisplayItem> filteredItems;
|
||||||
|
|
||||||
public Holder(Context context, ViewGroup parent){
|
public Holder(Context context, ViewGroup parent){
|
||||||
super(context, R.layout.display_item_warning, parent);
|
super(context, R.layout.display_item_warning, parent);
|
||||||
warningWrap=findViewById(R.id.warning_wrap);
|
warningWrap=findViewById(R.id.warning_wrap);
|
||||||
progress=findViewById(R.id.progress);
|
showBtn=findViewById(R.id.reveal_btn);
|
||||||
|
showBtn.setOnClickListener(i -> item.parentFragment.onWarningClick(this));
|
||||||
text=findViewById(R.id.text);
|
text=findViewById(R.id.text);
|
||||||
// itemView.setOnClickListener(v->item.parentFragment.onRevealFilteredClick(this));
|
// itemView.setOnClickListener(v->item.parentFragment.onRevealFilteredClick(this));
|
||||||
}
|
}
|
||||||
|
@ -54,7 +56,7 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(){
|
public void onClick(){
|
||||||
item.parentFragment.onWarningClick(this);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="60dp"
|
android:layout_height="75dp"
|
||||||
android:id="@+id/warning_wrap"
|
android:id="@+id/warning_wrap"
|
||||||
android:background="@drawable/bg_timeline_gap">
|
android:background="@drawable/bg_timeline_gap">
|
||||||
|
|
||||||
|
@ -9,17 +9,23 @@
|
||||||
android:id="@+id/text"
|
android:id="@+id/text"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_marginStart="16dp"
|
||||||
android:gravity="center_horizontal"
|
android:layout_gravity="start|center_vertical"
|
||||||
android:textAppearance="@style/m3_title_medium"
|
android:textAppearance="@style/m3_title_medium"
|
||||||
android:textColor="?android:textColorSecondary"
|
android:textColor="?android:textColorSecondary"
|
||||||
android:text="@string/load_missing_posts"/>
|
android:text="@string/mo_filtered"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/reveal_btn"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:layout_gravity="end|center_vertical"
|
||||||
|
android:text="@string/tap_to_reveal"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:visibility="visible"
|
||||||
|
/>
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/progress"
|
|
||||||
android:layout_width="32dp"
|
|
||||||
android:layout_height="32dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
Loading…
Reference in New Issue