Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
This commit is contained in:
@@ -2,11 +2,12 @@
|
||||
<resources>
|
||||
<color name="transp">#00000000</color>
|
||||
<color name="line_gray" comment="轻度灰色,一般用于下划线,不可点击按钮的边框">#dadade</color>
|
||||
<color name="bg_left_pannel" comment="左侧弹出框背景颜色">#f4f4fc</color>
|
||||
<color name="colorPrimary">#6c14c4</color>
|
||||
<color name="colorSecondary">#4c54ec</color>
|
||||
<color name="colorAccent">#c42cd4</color>
|
||||
<color name="colorSurface">#FFFFFF</color>
|
||||
<color name="colorOnSurface">#4263EB</color>
|
||||
<color name="colorOnSurface">#3c3c44</color>
|
||||
<color name="colorPrimarySurface">#aa342c4c</color>
|
||||
<color name="colorOnPrimarySurface">#FFFFFF</color>
|
||||
<color name="colorError">#e74c3c</color>
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
<dimen name="nav_header_vertical_spacing">8dp</dimen>
|
||||
<dimen name="nav_header_height">176dp</dimen>
|
||||
<dimen name="default_widget_padding">10dp</dimen>
|
||||
<dimen name="left_pannel_title_font" comment="左侧弹出框顶部标题字体大小">22sp</dimen>
|
||||
<dimen name="default_font_size" comment="默认字体大小,style中父最顶层">15sp</dimen>
|
||||
<dimen name="card_title_font_size">24sp</dimen>
|
||||
<dimen name="card_title_font_2size">13sp</dimen>
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
</style>
|
||||
|
||||
<style name="btn_gradient_color" parent="TextAppearance.AppCompat.Button">
|
||||
<item name="android:textColor">@color/btn_select_color</item>
|
||||
<item name="android:textColor">@color/selector_default_text_color_white_enable_gray</item>
|
||||
<item name="android:background">@drawable/selector_bg_default_button</item>
|
||||
<item name="android:clickable">true</item>
|
||||
<item name="android:focusable">true</item>
|
||||
@@ -133,4 +133,23 @@
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
</style>
|
||||
|
||||
<!-- 左侧弹出框顶部标题栏样式 -->
|
||||
<style name="left_pannel_title_layout" parent="TextAppearance.AppCompat">
|
||||
<item name="android:textSize">@dimen/left_pannel_title_font</item>
|
||||
<item name="android:textColor">@color/black</item>
|
||||
<item name="android:paddingHorizontal">@dimen/default_widget_padding</item>
|
||||
</style>
|
||||
|
||||
<!--圆形按钮的样式-->
|
||||
<style name="btn_round">
|
||||
<item name="background">@drawable/selector_bg_round_button</item>
|
||||
<item name="android:padding">@dimen/default_widget_padding</item>
|
||||
</style>
|
||||
|
||||
<style name="default_card_view" parent="@style/CardView">
|
||||
<item name="background">@drawable/shape_card_bg_default</item>
|
||||
<item name="android:layout_margin">@dimen/default_widget_padding</item>
|
||||
<item name="cardCornerRadius">@dimen/default_widget_padding</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user