This commit is contained in:
memory
2022-09-16 03:53:58 +08:00
parent b7fdd89ac7
commit 283e3802dd
34 changed files with 22 additions and 22 deletions

View File

@@ -223,7 +223,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
initView();
InitialModel.get().getMainTabInfosLiveData().observeForever(mainTabInfos -> {
if (mainTabInfos != null) {
mMainTabLayout.setMainTabInfoList(mainTabInfos);
mMainTabLayout.setMainTabInfoList(InitialModel.getDefaultMainTab());
}
});
initMaterialView();

View File

@@ -64,7 +64,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
indicator.setLineHeight(UIUtil.dip2px(mContext, 10));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 7));
indicator.setColors(Color.parseColor("#FFC000"));
indicator.setColors(Color.parseColor("#5FCCE4"));
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
lp.gravity = Gravity.END;
lp.bottomMargin = UIUtil.dip2px(mContext, 0);

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/color_333333" android:state_selected="true" />
<item android:color="#5FCCE4" android:state_selected="true" />
<item android:color="@color/main_tab_normal" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 426 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

@@ -5,6 +5,6 @@
<stroke
android:width="1dp"
android:color="#ffffffff" />
<solid android:color="#FFFFA936" />
<solid android:color="#66D9D9" />
<corners android:radius="100dp" />
</shape>

View File

@@ -4,8 +4,8 @@
<gradient
android:angle="180"
android:startColor="#FFFFA936"
android:endColor="#FFFFA936"/>
android:startColor="#66D9D9"
android:endColor="#66D9D9"/>
<corners android:radius="12dp"/>
</shape>

View File

@@ -2,13 +2,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<gradient android:angle="180" android:endColor="#FFFFA936" android:startColor="#FFFFCB47" android:type="linear" android:useLevel="true" /> <corners android:radius="100dp" />
<gradient android:angle="180" android:endColor="#66D9D9" android:startColor="#5BC8F8" android:type="linear" android:useLevel="true" /> <corners android:radius="100dp" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<gradient android:angle="180" android:endColor="#FFFFA936" android:startColor="#FFFFCB47" android:type="linear" android:useLevel="true" />
<gradient android:angle="180" android:endColor="#66D9D9" android:startColor="#5BC8F8" android:type="linear" android:useLevel="true" />
<corners android:radius="100dp" />
</shape>
</item>
@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<gradient android:angle="180" android:endColor="#FFFFA936" android:startColor="#FFFFCB47" android:type="linear" android:useLevel="true" />
<gradient android:angle="180" android:endColor="#66D9D9" android:startColor="#5BC8F8" android:type="linear" android:useLevel="true" />
<corners android:radius="100dp" />
</shape>
</item>

View File

@@ -3,7 +3,7 @@
<item android:state_selected="true">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffffffff" />
<solid android:color="#ffffa936" />
<solid android:color="#66D9D9" />
<corners android:radius="8dp" />
</shape>
</item>

View File

@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FFFFCB47"
android:startColor="#FFFFA936"
android:endColor="#5BC8F8"
android:startColor="#66D9D9"
android:angle="180" />
<corners android:radius="20dp" />
</shape>

View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FFC000"
android:startColor="#FFD15A" />
android:endColor="#5FCCE4"
android:startColor="#5FCCE4" />
<corners android:radius="30dp" />
</shape>

View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFBC51" />
<solid android:color="#5FCCE4" />
<size
android:width="@dimen/dp_12"
android:height="@dimen/dp_4" />

View File

@@ -35,7 +35,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_me_page"
app:layout_constraintDimensionRatio="750:672"
app:layout_constraintDimensionRatio="750:1334"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@@ -27,9 +27,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shaderEnable="true"
app:shaderEndColor="#FFFFA936"
app:shaderEndColor="#66D9D9"
app:shaderMode="topToBottom"
app:shaderStartColor="#FFFFCB47" />
app:shaderStartColor="#5BC8F8" />
<TextView
android:id="@+id/tv_name"

View File

@@ -30,9 +30,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shaderEnable="true"
app:shaderEndColor="#FFFFA936"
app:shaderEndColor="#66D9D9"
app:shaderMode="topToBottom"
app:shaderStartColor="#FFFFCB47" />
app:shaderStartColor="#5BC8F8" />
<TextView
android:id="@+id/tv_name"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -588,7 +588,7 @@
<color name="color_7727e4">#66D9D9</color>
<color name="color_5caaff">#5CAAFF</color>
<!-- 首页tab未选中颜色 -->
<color name="main_tab_normal">#66333333</color>
<color name="main_tab_normal">#8A8CAB</color>
<!-- 音游UI规范 end-->

View File

@@ -407,7 +407,7 @@ public class InitialModel extends BaseModel implements IInitialModel {
}
private List<MainTabInfo> getDefaultMainTab() {
public static List<MainTabInfo> getDefaultMainTab() {
return new ArrayList<>(Arrays.asList(
new MainTabInfo(
"",