排卡部分修复

This commit is contained in:
2025-04-20 02:54:12 +08:00
parent b5fb065208
commit 8a6e7d6dd9
13 changed files with 420 additions and 183 deletions

View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#673AB7</color>
<color name="purple_500">#673AB7</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#045D53</color>
<color name="night">#673AB7</color>
<color name="border_color">#FFFFFF</color> <!-- 白色 -->
<color name="teal_700">#FF018786</color>
<color name="black">#8A8282</color>
<color name="white">#FFFFFFFF</color>
<color name="primary">#673AB7</color>
<color name="primary_dark">#673AB7</color>
<color name="primary_light">#673AB7</color>
<color name="accent">#3F51B5</color>
<color name="primary_text">#212121</color>
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>
<color name="divider">#B6B6B6</color>
<color name="colorPrimary">#673AB7</color>
<color name="colorPrimaryVariant">#673AB7</color>
<color name="colorOnPrimary">#141313</color>
<color name="colorSecondary">#045D53</color>
<color name="colorSecondaryVariant">#018786</color>
<color name="colorOnSecondary">#000000</color>
<color name="lineBaseGreen">#045D53</color>
<color name="VlineBaseGreen">#C2F6C4</color>
<color name="textcolorPrimary">#FFFFFF</color>
<color name="red">#F44336</color>
</resources>

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#D5C4ED</color>
<color name="purple_500">#D5C4ED</color>
<color name="purple_700">#D5C4ED</color>
<color name="teal_200">#D5C4ED</color>
<color name="night">#D5C4ED</color>
<color name="teal_700">#D5C4ED</color>
<color name="black">#8A8282</color>
<color name="white">#FFFFFFFF</color>
<color name="primary">#D5C4ED</color>
<color name="primary_dark">#D5C4ED</color>
<color name="primary_light">#D1C4E9</color>
<color name="accent">#D5C4ED</color>
<color name="primary_text">#8C8181</color>
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>
<color name="divider">#B6B6B6</color>
<color name="colorPrimary">#D5C4ED</color>
<color name="colorPrimaryVariant">#D5C4ED</color>
<color name="colorOnPrimary">#FFFFFF</color>
<color name="colorSecondary">#D5C4ED</color>
<color name="colorSecondaryVariant">#D5C4ED</color>
<color name="colorOnSecondary">#000000</color>
<color name="lineBaseGreen">#1DF687</color>
<color name="VlineBaseGreen">#C2F6C4</color>
<color name="textcolorPrimary">#D5C4ED</color>
<color name="border_color">#000000</color> <!-- 黑色 -->
<color name="menu_background_color">#FFFFFF</color> <!-- 白色背景 -->
<color name="red">#F44336</color>
<color name="red2">#FF9189</color>
<color name="dividerColor">#7D7D7D</color>
</resources>

View File

@@ -47,4 +47,13 @@
android:textColor="@color/white"
app:backgroundTint="@color/colorPrimary"
tools:ignore="MissingConstraints"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/qrscan"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="扫码加入排卡"
android:textColor="@color/white"
app:backgroundTint="@color/divider"
tools:ignore="MissingConstraints"/>
</LinearLayout>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:theme="@style/Theme.FindMaimaiUltra">
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
@@ -17,5 +17,4 @@
android:title="上传成绩"
android:orderInCategory="100"
app:showAsAction="never"/>
</menu>
</menu>

View File

@@ -13,7 +13,7 @@
<color name="primary_dark">#D5C4ED</color>
<color name="primary_light">#D1C4E9</color>
<color name="accent">#D5C4ED</color>
<color name="primary_text">#212121</color>
<color name="primary_text">#8C8181</color>
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>
<color name="divider">#B6B6B6</color>
@@ -27,6 +27,7 @@
<color name="VlineBaseGreen">#C2F6C4</color>
<color name="textcolorPrimary">#D5C4ED</color>
<color name="border_color">#000000</color> <!-- 黑色 -->
<color name="menu_background_color">#FFFFFF</color> <!-- 白色背景 -->
<color name="red">#F44336</color>
<color name="red2">#FF9189</color>

View File

@@ -18,4 +18,7 @@
<style name="DialogAnimation"> <item name="android:windowEnterAnimation">@anim/dialog_enter</item>
<item name="android:windowExitAnimation">@anim/dialog_exit</item>
</style>
<style name="MenuBackgroundStyle">
<item name="android:background">@color/menu_background_color</item>
</style>
</resources>

View File

@@ -12,10 +12,14 @@
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
<item name="popupMenuStyle">@style/MenuBackgroundStyle</item>
</style>
<style name="Theme.FindMaimaiUltra.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="popupMenuStyle">@style/MenuBackgroundStyle</item>
</style>
<style name="Theme.FindMaimaiUltra.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="Theme.FindMaimaiUltra.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
@@ -31,6 +35,8 @@
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<item name="popupMenuStyle">@style/MenuBackgroundStyle</item>
<!-- Customize your theme here. -->
</style>
</resources>