fix color palette and tab items
This commit is contained in:
@@ -18,6 +18,7 @@ import com.vtosters.lite.R;
|
||||
import java.util.List;
|
||||
|
||||
import ru.vtosters.lite.utils.Helper;
|
||||
import ru.vtosters.lite.utils.Themes;
|
||||
|
||||
public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditViewHolder>
|
||||
implements IItemTouchHelper {
|
||||
@@ -55,18 +56,9 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
|
||||
container.setLayoutParams(new LinearLayout.LayoutParams(-1, Helper.convertDpToPixel(48)));
|
||||
container.setVisibility(View.GONE);
|
||||
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Helper.GetContext().getTheme().resolveAttribute(R.attr.text_secondary, typedValue, true);
|
||||
|
||||
int textSecondary = typedValue.data;
|
||||
|
||||
Helper.GetContext().getTheme().resolveAttribute(R.attr.text_secondary, typedValue, true);
|
||||
|
||||
int textPrimary = typedValue.data;
|
||||
|
||||
ImageView icon = new ImageView(Helper.GetContext());
|
||||
icon.setTag("icon");
|
||||
icon.setImageTintList(ColorStateList.valueOf(Color.BLACK));
|
||||
icon.setImageTintList(ColorStateList.valueOf(Themes.getAccentColor()));
|
||||
icon.setLayoutParams(new LinearLayout.LayoutParams(
|
||||
Helper.convertDpToPixel(24),
|
||||
Helper.convertDpToPixel(24)));
|
||||
@@ -76,7 +68,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
|
||||
title.setTag("title");
|
||||
title.setTextSize(16.0f);
|
||||
title.setTypeface(Typeface.DEFAULT_BOLD);
|
||||
//title.setTextColor(textPrimary);
|
||||
title.setTextColor(Themes.getTextAttr());
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, -2);
|
||||
params.weight = 1;
|
||||
params.leftMargin = Helper.convertDpToPixel(16);
|
||||
@@ -107,12 +99,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
|
||||
title.setLayoutParams(new LinearLayout.LayoutParams(-1, -2));
|
||||
title.setVisibility(View.GONE);
|
||||
|
||||
TypedValue typedValue = new TypedValue();
|
||||
Helper.GetContext().getTheme().resolveAttribute(R.attr.text_secondary, typedValue, true);
|
||||
|
||||
int textPrimary = typedValue.data;
|
||||
|
||||
title.setTextColor(Color.BLACK);
|
||||
title.setTextColor(Themes.getTextAttr());
|
||||
|
||||
return title;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.vk.apps.AppsFragment;
|
||||
import com.vk.discover.DiscoverFeedFragment;
|
||||
import com.vk.fave.fragments.FaveTabFragment;
|
||||
import com.vk.menu.MenuFragment;
|
||||
import com.vk.newsfeed.NewsfeedFragment;
|
||||
|
||||
@@ -82,7 +83,7 @@ public class DockBarManager {
|
||||
mDisabledTabs.add(new DockBarTab("tab_videos", R.drawable.ic_video_24, R.string.videos, R.id.menu_videos, VideosFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_lives", R.drawable.ic_live_filter_24dp, R.string.sett_live, R.id.menu_lives, LivesPostListFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_games", R.drawable.ic_games_24, R.string.games, R.id.menu_games, GamesFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_fave", R.drawable.ic_favorite_24, R.string.fave_community_title, R.id.menu_fave, FriendsFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_fave", R.drawable.ic_favorite_24, R.string.fave_title, R.id.menu_fave, FaveTabFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_documents", R.drawable.ic_document_24, R.string.docs, R.id.menu_documents, DocumentsViewFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_payments", R.drawable.ic_money_transfer_24, R.string.money_transfer_money_transfers, R.id.menu_payments, MoneyTransfersFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_vk_apps", R.drawable.ic_services_24, R.string.menu_apps, R.id.menu_vk_apps, AppsFragment.class));
|
||||
|
||||
Reference in New Issue
Block a user