Reisa/FindMaimaiUltra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

主题功能,nfc修复

Browse Source
This commit is contained in:
Spasol
2025-05-24 02:43:47 +08:00
parent ac60d8181d
commit e6254b5ea4
12 changed files with 382 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_page.xml
View File

@@ -8,7 +8,7 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="13mm"
android:background="@color/colorPrimary"
android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
tools:ignore="MissingConstraints">
@@ -16,7 +16,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="7mm"
android:layout_height="11mm"
android:tooltipText="FindMaimai"
android:background="@color/colorPrimary"
android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"

69
app/src/main/res/layout/fragment_slideshow.xml
View File

@@ -101,7 +101,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/dividerVertical"
android:id="@+id/view2"
android:background="?android:attr/dividerVertical"
android:layout_marginTop="16dp"/>
<com.google.android.material.textfield.TextInputLayout
@@ -169,7 +170,68 @@
android:backgroundTint="?attr/colorPrimary"
android:paddingTop="16dp"
android:paddingBottom="16dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/textcolorPrimary"
android:textSize="18sp"
android:id="@+id/themeText"
android:text="文字主题"/>
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none">
<LinearLayout
android:id="@+id/themeCardContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
<androidx.cardview.widget.CardView
android:id="@+id/cardPink"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="8dp"
app:cardBackgroundColor="@color/primary"
app:cardCornerRadius="8dp" />
<androidx.cardview.widget.CardView
android:id="@+id/cardGreen"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="8dp"
app:cardBackgroundColor="@color/lineBaseGreen"
app:cardCornerRadius="8dp" />
<androidx.cardview.widget.CardView
android:id="@+id/cardBlue"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="8dp"
app:cardBackgroundColor="@color/colorPrimary2"
app:cardCornerRadius="8dp" />
<androidx.cardview.widget.CardView
android:id="@+id/cardWhite"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="8dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="8dp" />
<androidx.cardview.widget.CardView
android:id="@+id/cardGray"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="8dp"
app:cardBackgroundColor="@color/black"
app:cardCornerRadius="8dp" />
</LinearLayout>
</HorizontalScrollView>
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/save_settings_button"
@@ -182,7 +244,9 @@
android:paddingBottom="16dp"/>
</LinearLayout>
<TextView android:layout_width="wrap_content" android:textColor="@color/textcolorPrimary"
<TextView android:layout_width="wrap_content"
android:textColor="@color/textcolorPrimary"
android:id="@+id/desc"
android:layout_height="wrap_content" android:text="@string/settin_body"/>
<TextView
android:layout_width="match_parent"
@@ -192,6 +256,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:id="@+id/view3"
android:background="?android:attr/dividerVertical"
android:layout_marginTop="16dp"/>
<TextView android:layout_width="wrap_content" android:textColor="@color/textcolorPrimary"

4
app/src/main/res/values/colors.xml
View File

@@ -28,6 +28,10 @@
<color name="lineBaseGreen">#1DF687</color>
<color name="VlineBaseGreen">#C2F6C4</color>
<color name="textcolorPrimary">#D5C4ED</color>
<color name="textcolorPrimary2">#2196F3</color>
<color name="colorPrimary2">#2196F3</color>
<color name="border_color">#000000</color> <!-- 黑色 -->
<color name="menu_background_color">#FFFFFF</color> <!-- 白色背景 -->

8
app/src/main/res/values/themes.xml
View File

@@ -22,7 +22,6 @@
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/teal_200</item>
<item name="colorOnSecondary">@color/black</item>
<color name="textcolorPrimary">#D5C4ED</color>
</style>
<!-- Green Theme -->
@@ -31,19 +30,16 @@
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/teal_200</item>
<item name="colorOnSecondary">@color/black</item>
<color name="textcolorPrimary">@color/lineBaseGreen</color>
</style>
<!-- Blue Theme -->
<style name="Theme.FindMaimaiUltra.Blue" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">#2196F3</item>
<item name="colorPrimary">@color/colorPrimary2</item>
<item name="colorPrimaryVariant">@color/teal_700</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/teal_200</item>
<item name="colorOnSecondary">@color/black</item>
<color name="textcolorPrimary">#2196F3</color>
</style>
<!-- White Theme -->
@@ -53,7 +49,6 @@
<item name="colorOnPrimary">@color/black</item>
<item name="colorSecondary">@color/white</item>
<item name="colorOnSecondary">@color/black</item>
<color name="textcolorPrimary">@color/white</color>
</style>
<!-- Gray Theme -->
@@ -63,7 +58,6 @@
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/dividerColor</item>
<item name="colorOnSecondary">@color/black</item>
<color name="textcolorPrimary">@color/dividerColor</color>
</style>
<style name="Theme.FindMaimaiUltra.NoActionBar">
<item name="windowActionBar">false</item>