toolBar, Fabの明示追加
This commit is contained in:
parent
a033a3888e
commit
00febce148
|
@ -209,11 +209,11 @@ public class CommonHomeFragment extends Fragment {
|
||||||
|
|
||||||
private void setupToolBar() {
|
private void setupToolBar() {
|
||||||
if (isChildMode) {
|
if (isChildMode) {
|
||||||
toolBarManager.setTitle("KidShift");
|
toolBarManager.setTitle("ホーム");
|
||||||
toolBarManager.setSubtitle("子供ビュー - タスク一覧");
|
toolBarManager.setSubtitle("子供ビュー");
|
||||||
} else {
|
} else {
|
||||||
toolBarManager.setTitle("KidShift");
|
toolBarManager.setTitle("ホーム");
|
||||||
toolBarManager.setSubtitle("保護者ビュー - タスク一覧");
|
toolBarManager.setSubtitle("保護者ビュー");
|
||||||
}
|
}
|
||||||
MenuHost menuHost = requireActivity();
|
MenuHost menuHost = requireActivity();
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ import one.nem.kidshift.feature.common.adapter.SelectShowChildListItemAdapter;
|
||||||
import one.nem.kidshift.utils.FabManager;
|
import one.nem.kidshift.utils.FabManager;
|
||||||
import one.nem.kidshift.utils.KSLogger;
|
import one.nem.kidshift.utils.KSLogger;
|
||||||
import one.nem.kidshift.utils.RecyclerViewAnimUtils;
|
import one.nem.kidshift.utils.RecyclerViewAnimUtils;
|
||||||
|
import one.nem.kidshift.utils.ToolBarManager;
|
||||||
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
|
@ -34,6 +35,8 @@ public class CommonSelectChildFragment extends Fragment {
|
||||||
@Inject
|
@Inject
|
||||||
FabManager fabManager;
|
FabManager fabManager;
|
||||||
@Inject
|
@Inject
|
||||||
|
ToolBarManager toolBarManager;
|
||||||
|
@Inject
|
||||||
RecyclerViewAnimUtils recyclerViewAnimUtils;
|
RecyclerViewAnimUtils recyclerViewAnimUtils;
|
||||||
private KSLogger logger;
|
private KSLogger logger;
|
||||||
|
|
||||||
|
@ -80,6 +83,8 @@ public class CommonSelectChildFragment extends Fragment {
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
fabManager.hide();
|
fabManager.hide();
|
||||||
|
toolBarManager.setTitle("子供選択");
|
||||||
|
toolBarManager.setSubtitle(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -14,6 +14,7 @@ import one.nem.kidshift.data.RewardData;
|
||||||
import one.nem.kidshift.data.UserSettings;
|
import one.nem.kidshift.data.UserSettings;
|
||||||
import one.nem.kidshift.utils.FabManager;
|
import one.nem.kidshift.utils.FabManager;
|
||||||
import one.nem.kidshift.utils.KSLogger;
|
import one.nem.kidshift.utils.KSLogger;
|
||||||
|
import one.nem.kidshift.utils.ToolBarManager;
|
||||||
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
|
@ -27,6 +28,8 @@ public class WalletContentFragment extends Fragment {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
FabManager fabManager;
|
FabManager fabManager;
|
||||||
|
@Inject
|
||||||
|
ToolBarManager toolBarManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
UserSettings userSettings;
|
UserSettings userSettings;
|
||||||
|
@ -100,5 +103,7 @@ public class WalletContentFragment extends Fragment {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
updateTotalReward();
|
updateTotalReward();
|
||||||
fabManager.hide();
|
fabManager.hide();
|
||||||
|
toolBarManager.setTitle("ウォレット");
|
||||||
|
toolBarManager.setSubtitle(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,9 @@ import dagger.hilt.android.AndroidEntryPoint;
|
||||||
import one.nem.kidshift.data.ChildData;
|
import one.nem.kidshift.data.ChildData;
|
||||||
import one.nem.kidshift.data.RewardData;
|
import one.nem.kidshift.data.RewardData;
|
||||||
import one.nem.kidshift.model.ChildModel;
|
import one.nem.kidshift.model.ChildModel;
|
||||||
|
import one.nem.kidshift.utils.FabManager;
|
||||||
import one.nem.kidshift.utils.KSLogger;
|
import one.nem.kidshift.utils.KSLogger;
|
||||||
|
import one.nem.kidshift.utils.ToolBarManager;
|
||||||
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
|
@ -42,6 +44,10 @@ public class WalletParentWrapperFragment extends Fragment {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
RewardData rewardData;
|
RewardData rewardData;
|
||||||
|
@Inject
|
||||||
|
FabManager fabManager;
|
||||||
|
@Inject
|
||||||
|
ToolBarManager toolBarManager;
|
||||||
|
|
||||||
private TabLayout tabLayout;
|
private TabLayout tabLayout;
|
||||||
private ViewPager2 viewPager;
|
private ViewPager2 viewPager;
|
||||||
|
@ -104,4 +110,12 @@ public class WalletParentWrapperFragment extends Fragment {
|
||||||
return childList == null ? 0 : childList.size();
|
return childList == null ? 0 : childList.size();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
fabManager.hide();
|
||||||
|
toolBarManager.setTitle("ウォレット");
|
||||||
|
toolBarManager.setSubtitle(null);
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user