Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/line_gray" />
|
||||
<item android:state_pressed="true" android:color="@color/line_gray" />
|
||||
<item android:state_selected="true" android:color="@color/line_gray" />
|
||||
<item android:state_checked="true" android:color="@color/line_gray" />
|
||||
<item android:color="@color/white" />
|
||||
|
||||
</selector>
|
||||
5
app/src/main/res/drawable/ic_baseline_check_24.xml
Normal file
5
app/src/main/res/drawable/ic_baseline_check_24.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="#2C2C2C"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="#2C2C2C"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,5 @@
|
||||
<vector android:autoMirrored="true" android:height="24dp"
|
||||
android:tint="#2C2C2C" android:viewportHeight="24"
|
||||
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,5 @@
|
||||
<vector android:autoMirrored="true" android:height="24dp"
|
||||
android:tint="#2C2C2C" android:viewportHeight="24"
|
||||
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
|
||||
</vector>
|
||||
8
app/src/main/res/drawable/selector_bg_round_button.xml
Normal file
8
app/src/main/res/drawable/selector_bg_round_button.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:drawable="@drawable/shape_round_btn_press"></item>
|
||||
<item android:state_checked="true" android:drawable="@drawable/shape_round_btn_press"/>
|
||||
<item android:state_pressed="true" android:drawable="@drawable/shape_round_btn_press"/>
|
||||
<item android:state_selected="true" android:drawable="@drawable/shape_round_btn_press"></item>
|
||||
<item android:drawable="@drawable/shape_round_btn_normal"/>
|
||||
</selector>
|
||||
6
app/src/main/res/drawable/selector_img_expand.xml
Normal file
6
app/src/main/res/drawable/selector_img_expand.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_expanded="true"
|
||||
android:drawable="@drawable/ic_baseline_keyboard_arrow_down_24"/>
|
||||
<item android:drawable="@drawable/ic_baseline_keyboard_arrow_right_24"/>
|
||||
</selector>
|
||||
11
app/src/main/res/drawable/shape_card_bg_default.xml
Normal file
11
app/src/main/res/drawable/shape_card_bg_default.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<padding
|
||||
android:bottom="@dimen/nimap_defalut_padding"
|
||||
android:left="@dimen/nimap_defalut_padding"
|
||||
android:right="@dimen/nimap_defalut_padding"
|
||||
android:top="@dimen/nimap_defalut_padding"></padding>
|
||||
<solid android:color="@color/colorSurface"></solid>
|
||||
</shape>
|
||||
5
app/src/main/res/drawable/shape_round_btn_normal.xml
Normal file
5
app/src/main/res/drawable/shape_round_btn_normal.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
<solid android:color="@color/colorSurface" />
|
||||
</shape>
|
||||
5
app/src/main/res/drawable/shape_round_btn_press.xml
Normal file
5
app/src/main/res/drawable/shape_round_btn_press.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
<solid android:color="@color/colorOnSurface" />
|
||||
</shape>
|
||||
@@ -1,12 +1,64 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
tools:context=".ui.fragment.empty.EmptyFragment">
|
||||
|
||||
<ExpandableListView
|
||||
android:id="@+id/elv_layer_manager"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@color/bg_left_pannel"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/title_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
style="@style/left_pannel_title_layout">
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/img_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:background="@drawable/selector_bg_round_button"
|
||||
android:foreground="@drawable/ripple_btn_press"
|
||||
style="@style/btn_round"
|
||||
android:src="@drawable/ic_baseline_keyboard_arrow_left_24"></androidx.appcompat.widget.AppCompatImageView>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="@dimen/left_pannel_title_font"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"></androidx.appcompat.widget.AppCompatTextView>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/img_confirm"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:background="@drawable/selector_bg_round_button"
|
||||
android:foreground="@drawable/ripple_btn_press"
|
||||
style="@style/btn_round"
|
||||
android:src="@drawable/ic_baseline_check_24"></androidx.appcompat.widget.AppCompatImageView>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/title_layout"
|
||||
style="@style/default_card_view">
|
||||
<ExpandableListView
|
||||
android:id="@+id/elv_layer_manager"
|
||||
android:divider="@android:drawable/divider_horizontal_dim_dark"
|
||||
android:dividerHeight="0.1dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
</LinearLayout>
|
||||
@@ -1,10 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:paddingLeft="@dimen/default_widget_padding"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<androidx.appcompat.widget.AppCompatCheckBox
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/chk_layermanager_child"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="true"></androidx.appcompat.widget.AppCompatCheckBox>
|
||||
android:paddingVertical="0dp"
|
||||
android:paddingHorizontal="@dimen/default_widget_padding"
|
||||
android:checked="true"></CheckBox>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_layermanager_child_name"
|
||||
android:textSize="@dimen/default_font_size"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"></androidx.appcompat.widget.AppCompatTextView>
|
||||
</LinearLayout>
|
||||
@@ -1,11 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<androidx.appcompat.widget.AppCompatCheckBox
|
||||
android:id="@+id/chk_layermanager_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:focusable="false"
|
||||
android:focusableInTouchMode="false"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:checked="true"></androidx.appcompat.widget.AppCompatCheckBox>
|
||||
</LinearLayout>
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/img_group_indicator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:src="@drawable/selector_img_expand"></androidx.appcompat.widget.AppCompatImageView>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_layermanager_parent_name"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/default_font_size"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_toLeftOf="@id/img_group_indicator"
|
||||
android:layout_toRightOf="@id/chk_layermanager_parent"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_height="wrap_content"></androidx.appcompat.widget.AppCompatTextView>
|
||||
</RelativeLayout>
|
||||
@@ -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