1.route页ui功能改版
BIN
app/src/main/res/drawable-xhdpi/icon_bar_thumb_image.png
Normal file
|
After Width: | Height: | Size: 428 B |
|
After Width: | Height: | Size: 504 B |
|
After Width: | Height: | Size: 504 B |
|
After Width: | Height: | Size: 432 B |
BIN
app/src/main/res/drawable-xhdpi/icon_left_arrow_image.png
Normal file
|
After Width: | Height: | Size: 252 B |
BIN
app/src/main/res/drawable-xhdpi/icon_right_arrow_image.png
Normal file
|
After Width: | Height: | Size: 236 B |
BIN
app/src/main/res/drawable-xhdpi/icon_vertical_dot_line_image.png
Normal file
|
After Width: | Height: | Size: 178 B |
BIN
app/src/main/res/drawable-xxhdpi/icon_bar_thumb_image.png
Normal file
|
After Width: | Height: | Size: 633 B |
|
After Width: | Height: | Size: 730 B |
|
After Width: | Height: | Size: 730 B |
|
After Width: | Height: | Size: 546 B |
BIN
app/src/main/res/drawable-xxhdpi/icon_left_arrow_image.png
Normal file
|
After Width: | Height: | Size: 326 B |
BIN
app/src/main/res/drawable-xxhdpi/icon_right_arrow_image.png
Normal file
|
After Width: | Height: | Size: 305 B |
|
After Width: | Height: | Size: 186 B |
BIN
app/src/main/res/drawable-xxxhdpi/icon_bar_thumb_image.png
Normal file
|
After Width: | Height: | Size: 797 B |
|
After Width: | Height: | Size: 1001 B |
|
After Width: | Height: | Size: 1001 B |
|
After Width: | Height: | Size: 713 B |
BIN
app/src/main/res/drawable-xxxhdpi/icon_left_arrow_image.png
Normal file
|
After Width: | Height: | Size: 399 B |
BIN
app/src/main/res/drawable-xxxhdpi/icon_right_arrow_image.png
Normal file
|
After Width: | Height: | Size: 378 B |
|
After Width: | Height: | Size: 201 B |
@@ -3,13 +3,13 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="false">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/block_color" />
|
||||
<solid android:color="@color/line_color1" />
|
||||
<corners android:radius="@dimen/dp_8" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_pressed="true">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/white" />
|
||||
<solid android:color="@color/block_color" />
|
||||
<corners android:radius="@dimen/dp_8" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
18
app/src/main/res/drawable/shape_seek_bar_style_v3.xml
Normal file
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@android:id/background">
|
||||
<shape>
|
||||
<corners android:radius="@dimen/dp_20" />
|
||||
<solid android:color="@color/grey_color_92" />
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
<item android:id="@android:id/progress">
|
||||
<clip>
|
||||
<shape>
|
||||
<solid android:color="@color/line_stroke_color" />
|
||||
<corners android:radius="@dimen/dp_20" />
|
||||
</shape>
|
||||
</clip>
|
||||
</item>
|
||||
</layer-list>
|
||||
@@ -28,20 +28,20 @@
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/np_dialog_calender_hour"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="@dimen/dp_47"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<com.abbidot.tracker.widget.TypefaceTextView
|
||||
android:id="@+id/tv_home_route_calendar_from"
|
||||
style="@style/my_TextView_style_v2"
|
||||
android:layout_marginHorizontal="@dimen/dp_18"
|
||||
android:layout_marginHorizontal="@dimen/dp_10"
|
||||
android:text=":"
|
||||
android:textSize="@dimen/textSize24"
|
||||
android:textSize="@dimen/textSize20"
|
||||
app:typeface="@string/roboto_bold_font" />
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/np_dialog_calender_min"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="@dimen/dp_47"
|
||||
android:layout_height="wrap_content" />
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
<com.abbidot.tracker.widget.TypefaceRoundButton
|
||||
android:id="@+id/btn_select_calender_hour_min_cancel"
|
||||
style="@style/my_QMUIRoundButton_small_style_v2"
|
||||
android:layout_marginEnd="@dimen/dp_4"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:text="@string/txt_cancel"
|
||||
app:qmui_borderColor="@color/block_color2"
|
||||
app:qmui_borderWidth="0.55dp"
|
||||
@@ -65,7 +65,7 @@
|
||||
<com.abbidot.tracker.widget.TypefaceRoundButton
|
||||
android:id="@+id/btn_select_calender_hour_min_ok"
|
||||
style="@style/my_QMUIRoundButton_small_style_v2"
|
||||
android:layout_marginStart="@dimen/dp_4"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:text="@android:string/ok"
|
||||
android:textColor="@color/select_color"
|
||||
app:qmui_backgroundColor="@color/btn_yellow_color"
|
||||
|
||||
232
app/src/main/res/layout/fragment_route_v3.xml
Normal file
@@ -0,0 +1,232 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
tools:context=".ui.fragment.data.RouteV3Fragment">
|
||||
|
||||
|
||||
<include
|
||||
android:id="@+id/il_home_route_pet_head_v3"
|
||||
layout="@layout/layout_top_pet_data_small"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="@dimen/dp_8"
|
||||
android:layout_marginTop="@dimen/dp_8" />
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/cv_home_route_v3_card"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="@dimen/dp_8"
|
||||
android:layout_weight="1"
|
||||
app:cardCornerRadius="@dimen/dp_32">
|
||||
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/fc_home_route_fragment_v3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<com.abbidot.tracker.widget.MapMarkerInfoView
|
||||
android:id="@+id/mi_home_route_address_view_v3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_home_route_map_type_btn_v3"
|
||||
style="@style/map_image_white_btn_style"
|
||||
android:layout_gravity="top|end"
|
||||
android:layout_margin="@dimen/dp_12" />
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<androidx.appcompat.widget.LinearLayoutCompat
|
||||
android:id="@+id/sv_home_route_map_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rl_home_route_calendar_v3_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:layout_marginHorizontal="@dimen/dp_8"
|
||||
android:background="@drawable/shape_home_route_calendar_bg"
|
||||
android:padding="@dimen/dp_12">
|
||||
|
||||
<View
|
||||
android:id="@+id/v_home_route_calendar_center_v3"
|
||||
android:layout_width="@dimen/dp_1"
|
||||
android:layout_height="@dimen/dp_1"
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<androidx.appcompat.widget.LinearLayoutCompat
|
||||
android:id="@+id/ll_home_route_calendar_from_v3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_4"
|
||||
android:layout_toStartOf="@id/v_home_route_calendar_center_v3"
|
||||
android:background="@drawable/shape8_white_gray_bg"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
android:paddingVertical="@dimen/dp_8">
|
||||
|
||||
<com.abbidot.tracker.widget.TypefaceTextView
|
||||
android:id="@+id/tv_home_route_calendar_from_v3"
|
||||
style="@style/my_TextView_style_v2"
|
||||
android:layout_marginStart="@dimen/dp_12"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:text="@string/app_name"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/textSize12"
|
||||
app:typeface="@string/roboto_regular_font" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_8"
|
||||
android:src="@drawable/icon_date_time_svg" />
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
|
||||
<androidx.appcompat.widget.LinearLayoutCompat
|
||||
android:id="@+id/ll_home_route_calendar_to_v3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignTop="@id/ll_home_route_calendar_from_v3"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginStart="@dimen/dp_4"
|
||||
android:layout_toEndOf="@id/v_home_route_calendar_center_v3"
|
||||
android:background="@drawable/shape8_white_gray_bg"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
android:paddingVertical="@dimen/dp_8">
|
||||
|
||||
<com.abbidot.tracker.widget.TypefaceTextView
|
||||
android:id="@+id/tv_home_route_calendar_to_v3"
|
||||
style="@style/my_TextView_style_v2"
|
||||
android:layout_marginStart="@dimen/dp_12"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:text="@string/app_name"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/textSize12"
|
||||
app:typeface="@string/roboto_regular_font" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_8"
|
||||
android:src="@drawable/icon_date_time_svg" />
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_map_route_line_v3_last_btn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/ll_home_route_calendar_from_v3"
|
||||
android:layout_alignStart="@id/ll_home_route_calendar_from_v3"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:background="@drawable/selector_transparent_pressed"
|
||||
android:paddingVertical="@dimen/dp_8"
|
||||
android:src="@drawable/icon_left_arrow_image"
|
||||
android:visibility="gone" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_map_route_line_v3_next_btn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignTop="@id/iv_map_route_line_v3_last_btn"
|
||||
android:layout_alignEnd="@id/ll_home_route_calendar_to_v3"
|
||||
android:background="@drawable/selector_transparent_pressed"
|
||||
android:paddingVertical="@dimen/dp_8"
|
||||
android:src="@drawable/icon_right_arrow_image"
|
||||
android:visibility="gone" />
|
||||
|
||||
<com.abbidot.tracker.widget.NoClickSlideSeekBar
|
||||
android:id="@+id/vsb_map_route_line_v3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/ll_home_route_calendar_from_v3"
|
||||
android:layout_marginHorizontal="@dimen/dp_2"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:layout_toStartOf="@id/iv_map_route_line_v3_next_btn"
|
||||
android:layout_toEndOf="@id/iv_map_route_line_v3_last_btn"
|
||||
android:maxHeight="@dimen/dp_8"
|
||||
android:progress="100"
|
||||
android:progressDrawable="@drawable/shape_seek_bar_style_v3"
|
||||
android:splitTrack="false"
|
||||
android:thumb="@drawable/icon_bar_thumb_image"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rl_map_route_line_v3_time_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_8"
|
||||
android:background="@drawable/shape20_white_half_bottom_bg"
|
||||
android:paddingHorizontal="@dimen/dp_14"
|
||||
android:paddingBottom="@dimen/dp_22"
|
||||
android:visibility="visible">
|
||||
|
||||
<androidx.appcompat.widget.LinearLayoutCompat
|
||||
android:id="@+id/ll_map_route_line_v3_zooming_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/dp_4"
|
||||
android:paddingBottom="@dimen/dp_10">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/v_map_route_line_v3_zooming"
|
||||
android:layout_width="@dimen/dp_30"
|
||||
android:layout_height="@dimen/dp_4"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/shape8_gray_bg" />
|
||||
|
||||
<com.abbidot.tracker.widget.TypefaceTextView
|
||||
style="@style/my_TextView_style_v2"
|
||||
android:layout_below="@id/ll_map_route_line_v3_zooming_layout"
|
||||
android:layout_gravity="end"
|
||||
android:text="@string/txt_time_line"
|
||||
android:textSize="@dimen/textSize12"
|
||||
app:typeface="@string/roboto_regular_font" />
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_history_fence_start_image"
|
||||
android:layout_width="@dimen/dp_18"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/ll_map_route_line_v3_zooming_layout"
|
||||
android:layout_marginTop="@dimen/dp_2"
|
||||
android:src="@drawable/icon_right_arrow_image"
|
||||
android:tint="@color/select_color" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rv_map_route_line_v3_fences_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/ll_map_route_line_v3_zooming_layout"
|
||||
android:layout_marginStart="@dimen/dp_8"
|
||||
android:layout_toEndOf="@id/iv_history_fence_start_image" />
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
<View
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/dp_40"
|
||||
android:background="@color/transparent" />
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
45
app/src/main/res/layout/item_history_fence_layout.xml
Normal file
@@ -0,0 +1,45 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_history_fence_type_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/icon_history_danger_fence_image" />
|
||||
|
||||
<com.abbidot.tracker.widget.TypefaceTextView
|
||||
android:id="@+id/tv_history_fence_type_time"
|
||||
style="@style/my_TextView_style_v2"
|
||||
android:layout_alignTop="@id/iv_history_fence_type_image"
|
||||
android:layout_alignBottom="@id/iv_history_fence_type_image"
|
||||
android:layout_marginStart="@dimen/dp_8"
|
||||
android:layout_toEndOf="@id/iv_history_fence_type_image"
|
||||
android:text="@string/app_name"
|
||||
android:textSize="@dimen/textSize16"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<com.abbidot.tracker.widget.TypefaceTextView
|
||||
android:id="@+id/tv_history_fence_type_content"
|
||||
style="@style/my_TextView_style_v2"
|
||||
android:layout_below="@id/tv_history_fence_type_time"
|
||||
android:layout_alignStart="@id/tv_history_fence_type_time"
|
||||
android:layout_marginTop="@dimen/dp_6"
|
||||
android:text="@string/app_name"
|
||||
android:textColor="@color/select_color3"
|
||||
android:textSize="@dimen/textSize14"
|
||||
app:typeface="@string/roboto_regular_font" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_history_fence_type_line"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/iv_history_fence_type_image"
|
||||
android:layout_alignStart="@id/iv_history_fence_type_image"
|
||||
android:layout_alignEnd="@id/iv_history_fence_type_image"
|
||||
android:layout_marginTop="@dimen/dp_2"
|
||||
android:src="@drawable/icon_vertical_dot_line_image" />
|
||||
</RelativeLayout>
|
||||
@@ -377,4 +377,5 @@
|
||||
<color name="rote_line_color">#00C478</color>
|
||||
<color name="light_yellow_color">#F9FFE8</color>
|
||||
<color name="grey_color_91">#B0B0B0</color>
|
||||
<color name="grey_color_92">#758E94</color>
|
||||
</resources>
|
||||
@@ -262,7 +262,7 @@
|
||||
<string name="map_navigate_map_google">Google Map</string>
|
||||
<string name="map_navigate_map_gaode">Gaode Map</string>
|
||||
<string name="map_navigate_cancel">Cancel</string>
|
||||
<string name="txt_no_install">The APP is not installed, please download and install the app first</string>
|
||||
<string name="txt_no_install">Install the map app to navigate</string>
|
||||
<!-- Data -->
|
||||
<string name="data_active_time">Active Time</string>
|
||||
<string name="data_active_goal">Goal</string>
|
||||
@@ -1076,4 +1076,7 @@
|
||||
<string name="txt_fully_asleep">Fell asleep %s ago</string>
|
||||
<string name="txt_move_wake">Move %s to wake up</string>
|
||||
|
||||
<string name="map_navigate_map_baidu">Baidu Map</string>
|
||||
<string name="txt_time_line">Timeline</string>
|
||||
|
||||
</resources>
|
||||