From 78651025a44bd57f8b51a2d01ec5584e4eb7ba17 Mon Sep 17 00:00:00 2001 From: Floens Date: Mon, 12 Feb 2018 22:21:06 +0100 Subject: [PATCH] add empty text to site and board screens add description to site add dialog, fix padding --- .../ui/controller/BoardSetupController.java | 5 +++ .../ui/controller/SitesSetupController.java | 6 +++ .../floens/chan/ui/layout/SiteAddLayout.java | 4 +- .../res/layout/controller_board_setup.xml | 44 ++++++++++++++----- .../res/layout/controller_sites_setup.xml | 44 ++++++++++++++----- .../src/main/res/layout/layout_site_add.xml | 23 ++++++---- Clover/app/src/main/res/values/strings.xml | 3 ++ 7 files changed, 99 insertions(+), 30 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java index 489a2d39..861d8c1e 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java @@ -45,6 +45,7 @@ import org.floens.chan.core.presenter.BoardSetupPresenter; import org.floens.chan.core.site.Site; import org.floens.chan.ui.helper.BoardHelper; import org.floens.chan.ui.layout.BoardAddLayout; +import org.floens.chan.ui.view.CrossfadeView; import org.floens.chan.ui.view.DividerItemDecoration; import java.util.List; @@ -64,6 +65,7 @@ public class BoardSetupController extends Controller implements View.OnClickList @Inject BoardSetupPresenter presenter; + private CrossfadeView crossfadeView; private RecyclerView savedBoardsRecycler; private FloatingActionButton add; @@ -112,6 +114,7 @@ public class BoardSetupController extends Controller implements View.OnClickList navigation.swipeable = false; // View binding + crossfadeView = view.findViewById(R.id.crossfade); savedBoardsRecycler = view.findViewById(R.id.boards_recycler); add = view.findViewById(R.id.add); @@ -127,6 +130,7 @@ public class BoardSetupController extends Controller implements View.OnClickList itemTouchHelper.attachToRecyclerView(savedBoardsRecycler); add.setOnClickListener(this); theme().applyFabColor(add); + crossfadeView.toggle(false, false); // Presenter presenter.create(this, site); @@ -175,6 +179,7 @@ public class BoardSetupController extends Controller implements View.OnClickList @Override public void setSavedBoards(List savedBoards) { savedAdapter.setSavedBoards(savedBoards); + crossfadeView.toggle(!savedBoards.isEmpty(), true); } @Override diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java index d2a215b2..a9f12eb4 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java @@ -40,6 +40,7 @@ import org.floens.chan.ui.helper.HintPopup; import org.floens.chan.ui.layout.SiteAddLayout; import org.floens.chan.ui.toolbar.ToolbarMenu; import org.floens.chan.ui.toolbar.ToolbarMenuItem; +import org.floens.chan.ui.view.CrossfadeView; import org.floens.chan.ui.view.DividerItemDecoration; import org.floens.chan.ui.view.FloatingMenuItem; @@ -60,6 +61,7 @@ public class SitesSetupController extends StyledToolbarNavigationController impl private ToolbarMenuItem doneMenuItem; + private CrossfadeView crossfadeView; private RecyclerView sitesRecyclerview; private FloatingActionButton addButton; @@ -82,6 +84,7 @@ public class SitesSetupController extends StyledToolbarNavigationController impl navigation.setTitle(R.string.setup_sites_title); // View binding + crossfadeView = view.findViewById(R.id.crossfade); sitesRecyclerview = view.findViewById(R.id.sites_recycler); addButton = view.findViewById(R.id.add); @@ -95,6 +98,7 @@ public class SitesSetupController extends StyledToolbarNavigationController impl new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); addButton.setOnClickListener(this); theme().applyFabColor(addButton); + crossfadeView.toggle(false, false); // Presenter presenter.create(this); @@ -195,6 +199,8 @@ public class SitesSetupController extends StyledToolbarNavigationController impl this.sites.clear(); this.sites.addAll(sites); sitesAdapter.notifyDataSetChanged(); + + crossfadeView.toggle(!sites.isEmpty(), true); } @Override diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/SiteAddLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/SiteAddLayout.java index dd7ccc5e..d032e313 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/SiteAddLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/SiteAddLayout.java @@ -2,15 +2,15 @@ package org.floens.chan.ui.layout; import android.app.Dialog; import android.content.Context; -import android.support.constraint.ConstraintLayout; import android.support.design.widget.TextInputLayout; import android.util.AttributeSet; import android.widget.EditText; +import android.widget.LinearLayout; import org.floens.chan.R; import org.floens.chan.core.presenter.SitesSetupPresenter; -public class SiteAddLayout extends ConstraintLayout implements SitesSetupPresenter.AddCallback { +public class SiteAddLayout extends LinearLayout implements SitesSetupPresenter.AddCallback { private EditText url; private TextInputLayout urlContainer; diff --git a/Clover/app/src/main/res/layout/controller_board_setup.xml b/Clover/app/src/main/res/layout/controller_board_setup.xml index 73c6ee0c..785950af 100644 --- a/Clover/app/src/main/res/layout/controller_board_setup.xml +++ b/Clover/app/src/main/res/layout/controller_board_setup.xml @@ -20,17 +20,41 @@ along with this program. If not, see . android:layout_height="match_parent" android:background="?attr/backcolor"> - + android:layout_height="match_parent"> + + + + + + + + + + . android:background="?attr/backcolor" tools:ignore="ContentDescription,RtlHardcoded"> - + android:layout_height="match_parent"> + + + + + + + + + + . + android:layout_height="match_parent" + android:orientation="vertical"> + + + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginTop="8dp"> Get started Your sites + No sites added Add sites Add site + Enter the url of the site you want to browse Site url http:// %s added @@ -198,6 +200,7 @@ Re-enable this permission in the app settings if you permanently disabled it."Off Configure boards of %s + No boards added Add board Removed \'%s\' %s added