y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes dockbar

Browse Source
This commit is contained in:
gdlbo
2022-04-02 23:41:20 +03:00
parent 67f9d9bbd9
commit a847d6a3eb
8 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vtosters/lite/R.java
+1 -1
View File
@@ -161,7 +161,7 @@ public final class R {
public static final int language = 0x7f030059;
public static final int lang_value = 0x7f03005a;
public static final int start = 0x7f03005b;
public static final int start_value = 0x7f03005c;
public static final int start_values = 0x7f03005c;
public static final int proxy = 0x7f03005d;
public static final int proxy_value = 0x7f03005e;
}
app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java
+3 -4
View File
@@ -21,7 +21,7 @@ import ru.vtosters.lite.utils.Helper;
import ru.vtosters.lite.utils.Themes;
public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditViewHolder>
implements IItemTouchHelper {
implements IItemTouchHelper {
public static final int SELECTED_TAB_TYPE = 1;
public static final int DISABLED_TAB_TYPE = 2;
@@ -131,7 +131,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
int fromViewType = getItemType(fromPosition);
int toViewType = getItemType(toPosition);
if (fromPosition < toPosition) {
if (fromPosition < toPosition) {
if (fromViewType != toViewType) {
mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
@@ -142,7 +142,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
} else if (toPosition != 0) {
if (fromViewType != toViewType){
if (fromViewType != toViewType) {
mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
} else {
List<DockBarTab> list = fromViewType == 1 ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
@@ -163,7 +163,6 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
}
static class DockBarEditViewHolder extends RecyclerView.x {
private LinearLayout mTabContainer;
app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java
+8
View File
@@ -1,7 +1,11 @@
package ru.vtosters.lite.ui.fragments.dockbar;
import static ru.vtosters.lite.utils.Themes.color_grishka;
import static ru.vtosters.lite.utils.Themes.isAndroidMonet;
import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.Menu;
import android.view.MenuItem;
@@ -25,6 +29,7 @@ import java.util.List;
import java.util.Map;
import ru.vtosters.lite.utils.Helper;
import ru.vtosters.lite.utils.Themes;
public class DockBarInjector {
private static final DockBarManager sManager = DockBarManager.getInstance();
@@ -63,6 +68,9 @@ public class DockBarInjector {
MenuItem add = menu.add(0, tab.id, 0, tab.titleID);
Drawable drawable = Helper.GetContext().getResources().getDrawable(tab.iconID);
ColorStateList colorStateList = Helper.GetContext().getResources().getColorStateList(com.vtosters.lite.R.color.bottom_navigation_item);
if (isAndroidMonet()) {
colorStateList = ColorStateList.valueOf(Themes.getAccentColor());
}
add.setIcon((Drawable) new RecoloredDrawable(drawable, colorStateList));
add.setShowAsAction(1);
add.setCheckable(true);
app/src/main/java/ru/vtosters/lite/utils/Prefs.java
+5 -3
View File
@@ -753,8 +753,10 @@ public class Prefs {
}
public static Class getStartFragment() {
return DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
/*String string = ru.vtosters.lite.utils.Helper.GetPreferences().getString("start_value", "");
String string = ru.vtosters.lite.utils.Helper.GetPreferences().getString("start_values", "");
if (string.equals("default")) {
return DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
}
if (string.equals("newsfeed")) {
return Feed2049.b.c();
}
@@ -809,7 +811,7 @@ public class Prefs {
if (string.equals("docs")) {
return DocumentsViewFragment.class;
}
return string.equals("brtd") ? BirthdaysFragment.class : Feed2049.b.c();*/
return string.equals("brtd") ? BirthdaysFragment.class : DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
}
public static Context BaseContextLocale(Context context) {