diff --git a/app/debug/app-debug.aab b/app/debug/app-debug.aab deleted file mode 100644 index 9fa93a20..00000000 Binary files a/app/debug/app-debug.aab and /dev/null differ diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java index dea2a93c..deacfc2d 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java @@ -71,7 +71,7 @@ public class PersonalizedFeedAdapter extends MultiBaseAdapter { 1 } - resources.getBoolean(R.bool.is_tablet) -> { + attachContext.isTablet -> { 3 } else -> { diff --git a/app/src/main/res/drawable/bottom_item_icon_tint_list.xml b/app/src/main/res/color/bottom_item_icon_tint_list.xml similarity index 100% rename from app/src/main/res/drawable/bottom_item_icon_tint_list.xml rename to app/src/main/res/color/bottom_item_icon_tint_list.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 34088076..3240dc50 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -29,8 +29,8 @@ android:layout_alignParentBottom="true" app:bottomNavigationBackgroundTint="@color/default_color_nav" app:elevation="4dp" - app:itemIconTintList="@drawable/bottom_item_icon_tint_list" - app:itemTextTintList="@drawable/bottom_item_icon_tint_list" + app:itemIconTintList="@color/bottom_item_icon_tint_list" + app:itemTextTintList="@color/bottom_item_icon_tint_list" app:labelVisibilityMode="unlabeled" app:menu="@menu/navbar_main" /> diff --git a/app/src/main/res/values-sw600dp/booleans.xml b/app/src/main/res/values-sw600dp/booleans.xml deleted file mode 100644 index b9786656..00000000 --- a/app/src/main/res/values-sw600dp/booleans.xml +++ /dev/null @@ -1,3 +0,0 @@ - - true - \ No newline at end of file diff --git a/app/src/main/res/values/booleans.xml b/app/src/main/res/values/booleans.xml deleted file mode 100644 index 0a99eb02..00000000 --- a/app/src/main/res/values/booleans.xml +++ /dev/null @@ -1,3 +0,0 @@ - - false - \ No newline at end of file