Remove Iconify from SubscriptionFragment (#6645)
This commit is contained in:
parent
705aae44ba
commit
574ec1434c
|
@ -11,8 +11,8 @@ import android.view.LayoutInflater;
|
|||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
@ -22,7 +22,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
|||
|
||||
import com.google.android.material.appbar.MaterialToolbar;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import com.joanzapata.iconify.Iconify;
|
||||
import com.leinardi.android.speeddial.SpeedDialView;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
@ -80,7 +79,7 @@ public class SubscriptionFragment extends Fragment
|
|||
private RecyclerView subscriptionRecycler;
|
||||
private SubscriptionsRecyclerAdapter subscriptionAdapter;
|
||||
private EmptyViewHandler emptyView;
|
||||
private TextView feedsFilteredMsg;
|
||||
private LinearLayout feedsFilteredMsg;
|
||||
private MaterialToolbar toolbar;
|
||||
private ProgressBar progressBar;
|
||||
private String displayedFolder = null;
|
||||
|
@ -319,8 +318,6 @@ public class SubscriptionFragment extends Fragment
|
|||
});
|
||||
|
||||
if (UserPreferences.getSubscriptionsFilter().isEnabled()) {
|
||||
feedsFilteredMsg.setText("{md-info-outline} " + getString(R.string.subscriptions_are_filtered));
|
||||
Iconify.addIcons(feedsFilteredMsg);
|
||||
feedsFilteredMsg.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
feedsFilteredMsg.setVisibility(View.GONE);
|
||||
|
|
|
@ -19,18 +19,30 @@
|
|||
app:title="@string/subscriptions_label"
|
||||
app:navigationIcon="?homeAsUpIndicator" />
|
||||
|
||||
<TextView
|
||||
<LinearLayout
|
||||
android:id="@+id/feeds_filtered_message"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="8dp"
|
||||
android:text="@string/filtered_label"
|
||||
android:paddingStart="60dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingVertical="4dp"
|
||||
android:layout_marginTop="-12dp"
|
||||
android:layout_marginLeft="60dp"
|
||||
android:layout_marginStart="60dp"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:src="@drawable/ic_info" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:text="@string/subscriptions_are_filtered" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
android:id="@+id/nav_feeds_filtered_message"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:importantForAccessibility="no"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
|
Loading…
Reference in New Issue