removed unused code
This commit is contained in:
parent
911498768f
commit
e018e52049
|
@ -28,7 +28,6 @@ import android.support.annotation.NonNull;
|
||||||
import android.support.annotation.Nullable;
|
import android.support.annotation.Nullable;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
import android.support.v4.util.SimpleArrayMap;
|
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
|
@ -53,21 +52,10 @@ import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class CustomTabUtils implements Constants {
|
public class CustomTabUtils implements Constants {
|
||||||
private static final SimpleArrayMap<String, Integer> CUSTOM_TABS_ICON_NAME_MAP = new SimpleArrayMap<>();
|
|
||||||
|
|
||||||
private CustomTabUtils() {
|
private CustomTabUtils() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
public static String findTabIconKey(final int iconRes) {
|
|
||||||
for (int i = 0, j = CUSTOM_TABS_ICON_NAME_MAP.size(); i < j; i++) {
|
|
||||||
if (CUSTOM_TABS_ICON_NAME_MAP.valueAt(i) == iconRes) {
|
|
||||||
return CUSTOM_TABS_ICON_NAME_MAP.keyAt(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static List<Tab> getTabs(@NonNull final Context context) {
|
public static List<Tab> getTabs(@NonNull final Context context) {
|
||||||
final ContentResolver resolver = context.getContentResolver();
|
final ContentResolver resolver = context.getContentResolver();
|
||||||
|
@ -179,8 +167,8 @@ public class CustomTabUtils implements Constants {
|
||||||
return added;
|
return added;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isTabTypeValid(final String tabType) {
|
public static boolean isTabTypeValid(@NonNull final String tabType) {
|
||||||
return tabType != null && TabConfiguration.ofType(Tab.getTypeAlias(tabType)) != null;
|
return TabConfiguration.ofType(Tab.getTypeAlias(tabType)) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean hasAccountId(final Context context, @NonNull final Bundle args,
|
public static boolean hasAccountId(final Context context, @NonNull final Bundle args,
|
||||||
|
|
|
@ -472,7 +472,7 @@ class CustomTabsFragment : BaseSupportFragment(), LoaderCallbacks<Cursor?>, Mult
|
||||||
val type = Tab.getTypeAlias(cursor.getString(indices.type))
|
val type = Tab.getTypeAlias(cursor.getString(indices.type))
|
||||||
val name = cursor.getString(indices.name)
|
val name = cursor.getString(indices.name)
|
||||||
val iconKey = cursor.getString(indices.icon)
|
val iconKey = cursor.getString(indices.icon)
|
||||||
if (CustomTabUtils.isTabTypeValid(type)) {
|
if (type != null && CustomTabUtils.isTabTypeValid(type)) {
|
||||||
val typeName = CustomTabUtils.getTabTypeName(context, type)
|
val typeName = CustomTabUtils.getTabTypeName(context, type)
|
||||||
holder.text1.text = if (TextUtils.isEmpty(name)) typeName else name
|
holder.text1.text = if (TextUtils.isEmpty(name)) typeName else name
|
||||||
holder.text1.paintFlags = holder.text1.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
|
holder.text1.paintFlags = holder.text1.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
|
||||||
|
|
Loading…
Reference in New Issue