指示器优化

app/src/main/java/cn/yunliyunwai/beyondclouds/SplashActivity.java

 package cn.yunliyunwai.beyondclouds;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+
 import javax.inject.Inject;
 
 import cn.yunliyunwai.beyondclouds.base.BaseActivity;
-import cn.yunliyunwai.beyondclouds.databinding.ActivityMainBinding;
 import cn.yunliyunwai.beyondclouds.databinding.ActivitySplashBinding;
 import cn.yunliyunwai.beyondclouds.util.ContextUtils;
 import cn.yunliyunwai.beyondclouds.viewmodel.SplashActivityViewModel;

app/src/main/java/cn/yunliyunwai/beyondclouds/adapter/CategoryFragmentAdapter.java

@@ -9,7 +9,6 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import java.util.List;
 
-import cn.yunliyunwai.beyondclouds.data.model.BlogCategory;
 import cn.yunliyunwai.beyondclouds.data.model.CommonCategory;
 import cn.yunliyunwai.beyondclouds.ui.HomeFragment;
 

app/src/main/java/cn/yunliyunwai/beyondclouds/adapter/HomeNavigatorAdapter.java

@@ -2,7 +2,6 @@ package cn.yunliyunwai.beyondclouds.adapter;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.text.TextUtils;
 
 import androidx.viewpager.widget.ViewPager;
 
@@ -13,9 +12,7 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTit
 import java.util.List;
 
 import cn.yunliyunwai.beyondclouds.R;
-import cn.yunliyunwai.beyondclouds.data.model.BlogCategory;
 import cn.yunliyunwai.beyondclouds.data.model.CommonCategory;
-import cn.yunliyunwai.beyondclouds.util.TypeFaces;
 import cn.yunliyunwai.beyondclouds.view.CommonPagerIndicator;
 import cn.yunliyunwai.beyondclouds.view.ScaleTransitionPagerTitleView;
 
@@ -53,7 +50,7 @@ public class HomeNavigatorAdapter extends CommonNavigatorAdapter {
         indicator.setMode(CommonPagerIndicator.MODE_EXACTLY);
         indicator.setDrawableHeight(2 * density);
         indicator.setDrawableWidth(8 * density);
-        indicator.setX(2 * density);
+        indicator.setX(1 * density);
         return indicator;
     }
 

app/src/main/java/cn/yunliyunwai/beyondclouds/data/model/BlogCategory.java

@@ -3,7 +3,6 @@ package cn.yunliyunwai.beyondclouds.data.model;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
-import androidx.room.TypeConverter;
 import androidx.room.TypeConverters;
 
 import java.util.Date;

app/src/main/java/cn/yunliyunwai/beyondclouds/di/component/HomeFragmentComponent.java

 package cn.yunliyunwai.beyondclouds.di.component;
 
-import cn.yunliyunwai.beyondclouds.di.module.HomeFragmentModuleBinds;
 import cn.yunliyunwai.beyondclouds.ui.HomeFragment;
 import dagger.Subcomponent;
 

app/src/main/java/cn/yunliyunwai/beyondclouds/di/component/SplashActivityComponent.java

@@ -2,7 +2,6 @@ package cn.yunliyunwai.beyondclouds.di.component;
 
 import cn.yunliyunwai.beyondclouds.SplashActivity;
 import cn.yunliyunwai.beyondclouds.di.scope.ActivityScope;
-import cn.yunliyunwai.beyondclouds.ui.HomeFragment;
 import dagger.Subcomponent;
 
 @ActivityScope

app/src/main/java/cn/yunliyunwai/beyondclouds/di/module/AppModuleBinds.java

@@ -6,7 +6,6 @@ import javax.inject.Singleton;
 
 import cn.yunliyunwai.beyondclouds.data.source.BlogRepositoryImpl;
 import cn.yunliyunwai.beyondclouds.data.source.IBlogRepository;
-import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel;
 import cn.yunliyunwai.beyondclouds.viewmodel.MainActivityViewModel;
 import dagger.Binds;
 import dagger.Module;

app/src/main/java/cn/yunliyunwai/beyondclouds/di/module/BlogListFragmentModuleBinds.java

@@ -3,9 +3,7 @@ package cn.yunliyunwai.beyondclouds.di.module;
 import androidx.lifecycle.ViewModel;
 
 import cn.yunliyunwai.beyondclouds.di.component.BlogListFragmentComponent;
-import cn.yunliyunwai.beyondclouds.di.component.HomeFragmentComponent;
 import cn.yunliyunwai.beyondclouds.viewmodel.BlogListFragmentViewModel;
-import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel;
 import dagger.Binds;
 import dagger.Module;
 import dagger.multibindings.IntoMap;

app/src/main/java/cn/yunliyunwai/beyondclouds/di/module/HomeFragmentModuleBinds.java

@@ -2,13 +2,8 @@ package cn.yunliyunwai.beyondclouds.di.module;
 
 import androidx.lifecycle.ViewModel;
 
-import javax.inject.Singleton;
-
-import cn.yunliyunwai.beyondclouds.data.source.BlogRepositoryImpl;
-import cn.yunliyunwai.beyondclouds.data.source.IBlogRepository;
 import cn.yunliyunwai.beyondclouds.di.component.HomeFragmentComponent;
 import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel;
-import cn.yunliyunwai.beyondclouds.viewmodel.MainActivityViewModel;
 import dagger.Binds;
 import dagger.Module;
 import dagger.multibindings.IntoMap;

app/src/main/java/cn/yunliyunwai/beyondclouds/di/module/SplashActivityModuleBinds.java

@@ -2,9 +2,7 @@ package cn.yunliyunwai.beyondclouds.di.module;
 
 import androidx.lifecycle.ViewModel;
 
-import cn.yunliyunwai.beyondclouds.di.component.HomeFragmentComponent;
 import cn.yunliyunwai.beyondclouds.di.component.SplashActivityComponent;
-import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel;
 import cn.yunliyunwai.beyondclouds.viewmodel.SplashActivityViewModel;
 import dagger.Binds;
 import dagger.Module;

app/src/main/java/cn/yunliyunwai/beyondclouds/util/BindingUtils.java

 package cn.yunliyunwai.beyondclouds.util;
 
-import android.util.Log;
-
 import androidx.lifecycle.ViewModel;
 import androidx.viewbinding.ViewBinding;
 

app/src/main/java/cn/yunliyunwai/beyondclouds/util/ContextUtils.java

 package cn.yunliyunwai.beyondclouds.util;
 
 import android.app.Activity;
-import android.content.Context;
 
 import cn.yunliyunwai.beyondclouds.BeyondApplication;
 import cn.yunliyunwai.beyondclouds.di.component.AppComponent;

app/src/main/java/cn/yunliyunwai/beyondclouds/util/ViewModelUtils.java

@@ -3,9 +3,6 @@ package cn.yunliyunwai.beyondclouds.util;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelStoreOwner;
-import androidx.viewbinding.ViewBinding;
-
-import java.lang.reflect.Method;
 
 public class ViewModelUtils {
 

app/src/main/java/cn/yunliyunwai/beyondclouds/view/ScaleTransitionPagerTitleView.java

@@ -49,12 +49,6 @@ public class ScaleTransitionPagerTitleView extends ColorTransitionPagerTitleView
         int paddingBottom = scaleTransitionPagerTitleView.getPaddingTop();
         int paddingLeft = (int) (6 * density);
         int paddingRight = (int) (6 * density);
-        if (index == 0) {
-            paddingLeft = (int) (12 * density);
-        }
-        if (index == 0) {
-            paddingRight = (int) (12 * density);
-        }
         scaleTransitionPagerTitleView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
         scaleTransitionPagerTitleView.setNormalColor(context.getResources().getColor(R.color.colorText));
         scaleTransitionPagerTitleView.setSelectedColor(context.getResources().getColor(R.color.colorTextAccent));

app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/HomeFragmentViewModel.java

@@ -7,7 +7,6 @@ import androidx.lifecycle.ViewModel;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/MainActivityViewModel.java

 package cn.yunliyunwai.beyondclouds.viewmodel;
 
-import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModel;
-import androidx.lifecycle.ViewModelProvider;
 
 import javax.inject.Inject;
 

app/src/main/res/layout/fragment_home.xml

@@ -17,6 +17,10 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            android:paddingStart="6dp"
+            android:paddingLeft="6dp"
+            android:paddingEnd="6dp"
+            android:paddingRight="6dp"
             android:layout_width="match_parent"
             android:layout_height="40dp" />
         <cn.yunliyunwai.beyondclouds.view.BeyondSearchBar