比赛完同步提交
This commit is contained in:
parent
e06508994d
commit
2414f36fe7
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -110,7 +110,7 @@ dependencies {
|
|||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
|
||||
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
|
||||
implementation 'androidx.preference:preference-ktx:1.1.1'
|
||||
implementation 'androidx.preference:preference-ktx:1.2.0'
|
||||
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||
|
|
|
|||
|
|
@ -968,7 +968,11 @@ class FileManagerActivity : BaseActivity<ActivityFileBinding>() {
|
|||
if (file.isDirectory) {
|
||||
viewModel.currentPathLiveData.value = file.absolutePath
|
||||
} else {
|
||||
|
||||
fileItemBinding.more.setOnClickListener {
|
||||
val popupMenu = PopupMenu(this, fileItemBinding.more)
|
||||
popupMenu.inflate(R.menu.menu_files)
|
||||
popupMenu.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
|
|||
private fun initAction() {
|
||||
immersionBar {
|
||||
transparentStatusBar().statusBarDarkFont(true)
|
||||
.navigationBarColor(R.color.white_200).navigationBarDarkIcon(true)
|
||||
.transparentNavigationBar().navigationBarDarkIcon(true)
|
||||
}
|
||||
Log.d("应用识别码", appSettings.getValue(AppSettings.Setting.AppID, "无"))
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,42 @@ object GlobalMethod {
|
|||
const val DEBUG_SIGN = "963dfd616924b27f9247a35e45bc130a"
|
||||
const val RELEASE_SIGN = "5320b24894fe7ed449842a81a2dfceda"
|
||||
|
||||
/**
|
||||
* 获取主题色
|
||||
*
|
||||
* @param context 上下文环境
|
||||
* @param resId 资源id
|
||||
* @return 成功返回值，失败返回-1
|
||||
*/
|
||||
fun getThemeColor(context: Context, resId: Int): Int {
|
||||
val typedValue = TypedValue()
|
||||
return if (context.theme.resolveAttribute(resId, typedValue, true)) {
|
||||
typedValue.data
|
||||
} else {
|
||||
-1
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取主要色
|
||||
*
|
||||
* @param context 上下文环境
|
||||
* @return 整数
|
||||
*/
|
||||
fun getColorPrimary(context: Context): Int {
|
||||
return getThemeColor(context, R.attr.colorPrimary)
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取暗色主要色
|
||||
*
|
||||
* @param context 上下文环境
|
||||
* @return 整数
|
||||
*/
|
||||
fun getDarkColorPrimary(context: Context): Int {
|
||||
return getThemeColor(context, R.attr.colorPrimaryDark)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取Glide请求设置
|
||||
|
|
@ -154,41 +190,7 @@ object GlobalMethod {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取主题色
|
||||
*
|
||||
* @param context 上下文环境
|
||||
* @param resId 资源id
|
||||
* @return 成功返回值，失败返回-1
|
||||
*/
|
||||
fun getThemeColor(context: Context, resId: Int): Int {
|
||||
val typedValue = TypedValue()
|
||||
return if (context.theme.resolveAttribute(resId, typedValue, true)) {
|
||||
typedValue.data
|
||||
} else {
|
||||
-1
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取主要色
|
||||
*
|
||||
* @param context 上下文环境
|
||||
* @return 整数
|
||||
*/
|
||||
fun getColorPrimary(context: Context): Int {
|
||||
return getThemeColor(context, R.attr.colorPrimary)
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取暗色主要色
|
||||
*
|
||||
* @param context 上下文环境
|
||||
* @return 整数
|
||||
*/
|
||||
fun getDarkColorPrimary(context: Context): Int {
|
||||
return getThemeColor(context, R.attr.colorPrimaryDark)
|
||||
}
|
||||
|
||||
//设置删除线
|
||||
fun addDeleteLine(vararg textViews: TextView?) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Concept">
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Dark.Concept">
|
||||
<!-- Transparent system bars for edge-to-edge. -->
|
||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Concept">
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Dark.Concept">
|
||||
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Concept">
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Light.Concept">
|
||||
<!-- Transparent system bars for edge-to-edge. -->
|
||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,64 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="blue_200">#90CAF9</color>
|
||||
<color name="blue_100">#BBDEFB</color>
|
||||
<color name="blue_500">#2196F3</color>
|
||||
<color name="blue_700">#1976D2</color>
|
||||
<color name="pink_200">#F48FB1</color>
|
||||
<color name="pink_700">#C2185B</color>
|
||||
<color name="pink_500">#E91E63</color>
|
||||
<color name="pink_100">#F8BBD0</color>
|
||||
<color name="white_200">#F0F0F3</color>
|
||||
<color name="seed">#e91e63</color>
|
||||
<color name="md_theme_light_primary">#BC004B</color>
|
||||
<color name="md_theme_light_onPrimary">#FFFFFF</color>
|
||||
<color name="md_theme_light_primaryContainer">#FFD9DE</color>
|
||||
<color name="md_theme_light_onPrimaryContainer">#400014</color>
|
||||
<color name="md_theme_light_secondary">#75565B</color>
|
||||
<color name="md_theme_light_onSecondary">#FFFFFF</color>
|
||||
<color name="md_theme_light_secondaryContainer">#FFD9DE</color>
|
||||
<color name="md_theme_light_onSecondaryContainer">#2C1519</color>
|
||||
<color name="md_theme_light_tertiary">#795831</color>
|
||||
<color name="md_theme_light_onTertiary">#FFFFFF</color>
|
||||
<color name="md_theme_light_tertiaryContainer">#FFDDBA</color>
|
||||
<color name="md_theme_light_onTertiaryContainer">#2B1700</color>
|
||||
<color name="md_theme_light_error">#BA1A1A</color>
|
||||
<color name="md_theme_light_errorContainer">#FFDAD6</color>
|
||||
<color name="md_theme_light_onError">#FFFFFF</color>
|
||||
<color name="md_theme_light_onErrorContainer">#410002</color>
|
||||
<color name="md_theme_light_background">#FFFBFF</color>
|
||||
<color name="md_theme_light_onBackground">#201A1B</color>
|
||||
<color name="md_theme_light_surface">#FFFBFF</color>
|
||||
<color name="md_theme_light_onSurface">#201A1B</color>
|
||||
<color name="md_theme_light_surfaceVariant">#F3DDDF</color>
|
||||
<color name="md_theme_light_onSurfaceVariant">#524345</color>
|
||||
<color name="md_theme_light_outline">#847375</color>
|
||||
<color name="md_theme_light_inverseOnSurface">#FBEEEE</color>
|
||||
<color name="md_theme_light_inverseSurface">#362F2F</color>
|
||||
<color name="md_theme_light_inversePrimary">#FFB2BE</color>
|
||||
<color name="md_theme_light_shadow">#000000</color>
|
||||
<color name="md_theme_light_surfaceTint">#BC004B</color>
|
||||
<color name="md_theme_light_surfaceTintColor">#BC004B</color>
|
||||
<color name="md_theme_dark_primary">#FFB2BE</color>
|
||||
<color name="md_theme_dark_onPrimary">#660025</color>
|
||||
<color name="md_theme_dark_primaryContainer">#900038</color>
|
||||
<color name="md_theme_dark_onPrimaryContainer">#FFD9DE</color>
|
||||
<color name="md_theme_dark_secondary">#E5BDC2</color>
|
||||
<color name="md_theme_dark_onSecondary">#43292D</color>
|
||||
<color name="md_theme_dark_secondaryContainer">#5C3F43</color>
|
||||
<color name="md_theme_dark_onSecondaryContainer">#FFD9DE</color>
|
||||
<color name="md_theme_dark_tertiary">#EBBF90</color>
|
||||
<color name="md_theme_dark_onTertiary">#452B08</color>
|
||||
<color name="md_theme_dark_tertiaryContainer">#5F411C</color>
|
||||
<color name="md_theme_dark_onTertiaryContainer">#FFDDBA</color>
|
||||
<color name="md_theme_dark_error">#FFB4AB</color>
|
||||
<color name="md_theme_dark_errorContainer">#93000A</color>
|
||||
<color name="md_theme_dark_onError">#690005</color>
|
||||
<color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
|
||||
<color name="md_theme_dark_background">#201A1B</color>
|
||||
<color name="md_theme_dark_onBackground">#ECE0E0</color>
|
||||
<color name="md_theme_dark_surface">#201A1B</color>
|
||||
<color name="md_theme_dark_onSurface">#ECE0E0</color>
|
||||
<color name="md_theme_dark_surfaceVariant">#524345</color>
|
||||
<color name="md_theme_dark_onSurfaceVariant">#D6C2C3</color>
|
||||
<color name="md_theme_dark_outline">#9F8C8E</color>
|
||||
<color name="md_theme_dark_inverseOnSurface">#201A1B</color>
|
||||
<color name="md_theme_dark_inverseSurface">#ECE0E0</color>
|
||||
<color name="md_theme_dark_inversePrimary">#BC004B</color>
|
||||
<color name="md_theme_dark_shadow">#000000</color>
|
||||
<color name="md_theme_dark_surfaceTint">#FFB2BE</color>
|
||||
<color name="md_theme_dark_surfaceTintColor">#FFB2BE</color>
|
||||
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="dark_background">#191C1E</color>
|
||||
|
|
@ -16,5 +66,7 @@
|
|||
<color name="red">#F44336</color>
|
||||
<color name="green">#8BC34A</color>
|
||||
<color name="icon_color">#e91e63</color>
|
||||
<color name="blue_500">#2196F3</color>
|
||||
<color name="pink_500">#E91E63</color>
|
||||
|
||||
</resources>
|
||||
46
app/src/main/res/values/styles.xml
Normal file
46
app/src/main/res/values/styles.xml
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:ignore="PrivateResource">
|
||||
|
||||
<style name="Preference.MaterialFiles.Material3.SimpleMenuPreference" parent="Preference.SimpleMenuPreference">
|
||||
<item name="android:popupMenuStyle">@style/Widget.MaterialFiles.Material3.Preference.SimpleMenuPreference.PopupMenu</item>
|
||||
</style>
|
||||
<style name="Widget.MaterialFiles.Material3.Preference.SimpleMenuPreference.PopupMenu" parent="Widget.Preference.SimpleMenuPreference.PopupMenu">
|
||||
</style>
|
||||
|
||||
<!-- <style name="TextAppearance.MaterialFiles.Material3.ListItem" parent="TextAppearance.Material3.TitleMedium">-->
|
||||
<!-- <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>-->
|
||||
<!-- <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>-->
|
||||
<!-- </style>-->
|
||||
|
||||
<!-- <style name="TextAppearance.MaterialFiles.Material3.ListItemSmall" parent="TextAppearance.Material3.TitleSmall">-->
|
||||
<!-- <item name="fontFamily">@string/m3_ref_typeface_plain_regular</item>-->
|
||||
<!-- <item name="android:fontFamily">@string/m3_ref_typeface_plain_regular</item>-->
|
||||
<!-- </style>-->
|
||||
|
||||
<!-- <style name="Widget.MaterialFiles.Material3.CompoundButton.Switch" parent="Widget.Material3.CompoundButton.Switch">-->
|
||||
<!-- <item name="android:thumb">@drawable/switch_thumb_material3</item>-->
|
||||
<!-- <item name="thumbTint">@color/switch_thumb_tint_material3</item>-->
|
||||
<!-- <item name="thumbTintMode">src_in</item>-->
|
||||
<!-- <item name="track">@drawable/switch_track_material3</item>-->
|
||||
<!-- <item name="trackTint">@color/switch_track_tint_material3</item>-->
|
||||
<!-- </style>-->
|
||||
|
||||
<!-- <style name="Widget.MaterialFiles.Material3.NavigationView" parent="Widget.Material3.NavigationView">-->
|
||||
<!-- <item name="itemHorizontalPadding">@dimen/navigation_item_horizontal_padding_material3</item>-->
|
||||
<!-- <item name="itemSubtitleTextAppearance">?textAppearanceBodyMedium</item>-->
|
||||
<!-- <item name="itemSubtitleTextColor">@color/navigation_item_subtitle_text_color_material3</item>-->
|
||||
<!-- <item name="itemSubtitleTextSize">10sp</item>-->
|
||||
<!-- <item name="itemIconPadding">@dimen/navigation_item_icon_padding_material3</item>-->
|
||||
<!-- <item name="dividerVerticalPadding">@dimen/design_navigation_separator_vertical_padding</item>-->
|
||||
<!-- </style>-->
|
||||
|
||||
<!-- <style name="Widget.MaterialFiles.Material3.TabLayout" parent="Widget.Material3.TabLayout">-->
|
||||
<!-- <item name="android:background">@android:color/transparent</item>-->
|
||||
<!-- </style>-->
|
||||
|
||||
<!-- <style name="Widget.MaterialFiles.Material3.Toolbar" parent="Widget.Material3.Toolbar">-->
|
||||
<!-- <item name="contentInsetStartWithNavigation">@dimen/abc_action_bar_content_inset_with_nav</item>-->
|
||||
<!-- </style>-->
|
||||
</resources>
|
||||
|
|
@ -11,26 +11,77 @@
|
|||
|
||||
<!--概念主题 -->
|
||||
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Concept"/>
|
||||
<style name="Theme.rust.Concept" parent="Base.rust.Light.Concept" />
|
||||
|
||||
<style name="Base.rust.Concept" parent="Theme.Material3.DayNight.NoActionBar">
|
||||
<item name="colorPrimary">@color/pink_500</item>
|
||||
<item name="colorPrimaryContainer">@color/pink_200</item>
|
||||
<item name="colorSurfaceVariant">@color/pink_100</item>
|
||||
<item name="colorSecondary">@color/blue_500</item>
|
||||
<item name="colorSecondaryContainer">@color/blue_100</item>
|
||||
<!-- <item name="windowActionBar">false</item>-->
|
||||
<!-- <item name="windowNoTitle">true</item>-->
|
||||
<item name="md_corner_radius">28dp</item>
|
||||
<!-- <item name="md_background_color">@color/material_on_surface_emphasis_medium</item>-->
|
||||
<style name="Base.rust.Light.Concept" parent="Theme.Material3.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/md_theme_light_primary</item>
|
||||
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
|
||||
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
|
||||
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
|
||||
<item name="colorSecondary">@color/md_theme_light_secondary</item>
|
||||
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
|
||||
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
|
||||
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
|
||||
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
|
||||
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
|
||||
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
|
||||
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
|
||||
<item name="colorError">@color/md_theme_light_error</item>
|
||||
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
|
||||
<item name="colorOnError">@color/md_theme_light_onError</item>
|
||||
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
|
||||
<item name="android:colorBackground">@color/md_theme_light_background</item>
|
||||
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
|
||||
<item name="colorSurface">@color/md_theme_light_surface</item>
|
||||
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
|
||||
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
|
||||
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
|
||||
<item name="colorOutline">@color/md_theme_light_outline</item>
|
||||
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
|
||||
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
|
||||
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
|
||||
<item name="android:popupBackground" tools:ignore="PrivateResource">
|
||||
@drawable/m3_popupmenu_background_overlay
|
||||
</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Base.rust.Dark.Concept" parent="Theme.Material3.Dark.NoActionBar">
|
||||
<item name="colorPrimary">@color/md_theme_dark_primary</item>
|
||||
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
|
||||
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
|
||||
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
|
||||
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
|
||||
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
|
||||
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
|
||||
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
|
||||
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
|
||||
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
|
||||
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
|
||||
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
|
||||
<item name="colorError">@color/md_theme_dark_error</item>
|
||||
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
|
||||
<item name="colorOnError">@color/md_theme_dark_onError</item>
|
||||
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
|
||||
<item name="android:colorBackground">@color/md_theme_dark_background</item>
|
||||
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
|
||||
<item name="colorSurface">@color/md_theme_dark_surface</item>
|
||||
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
|
||||
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
|
||||
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
|
||||
<item name="colorOutline">@color/md_theme_dark_outline</item>
|
||||
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
|
||||
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
|
||||
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
|
||||
<item name="android:popupBackground" tools:ignore="PrivateResource">
|
||||
@drawable/m3_popupmenu_background_overlay
|
||||
</item>
|
||||
</style>
|
||||
|
||||
<!--设置标签为小写-->
|
||||
<style name="TabLayoutTextStyle" parent="TextAppearance.Design.Tab">
|
||||
<item name="textAllCaps">false</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
</resources>
|
||||
Loading…
Reference in New Issue
Block a user