diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device_permssion.xml b/app/src/main/res/drawable/ic_device_permssion.xml new file mode 100644 index 0000000..9382c8a --- /dev/null +++ b/app/src/main/res/drawable/ic_device_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device_permssion.xml b/app/src/main/res/drawable/ic_device_permssion.xml new file mode 100644 index 0000000..9382c8a --- /dev/null +++ b/app/src/main/res/drawable/ic_device_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device_permssion.xml b/app/src/main/res/drawable/ic_device_permssion.xml new file mode 100644 index 0000000..9382c8a --- /dev/null +++ b/app/src/main/res/drawable/ic_device_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_permssion.xml b/app/src/main/res/drawable/ic_location_permssion.xml new file mode 100644 index 0000000..9656dca --- /dev/null +++ b/app/src/main/res/drawable/ic_location_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device_permssion.xml b/app/src/main/res/drawable/ic_device_permssion.xml new file mode 100644 index 0000000..9382c8a --- /dev/null +++ b/app/src/main/res/drawable/ic_device_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_permssion.xml b/app/src/main/res/drawable/ic_location_permssion.xml new file mode 100644 index 0000000..9656dca --- /dev/null +++ b/app/src/main/res/drawable/ic_location_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device_permssion.xml b/app/src/main/res/drawable/ic_device_permssion.xml new file mode 100644 index 0000000..9382c8a --- /dev/null +++ b/app/src/main/res/drawable/ic_device_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_permssion.xml b/app/src/main/res/drawable/ic_location_permssion.xml new file mode 100644 index 0000000..9656dca --- /dev/null +++ b/app/src/main/res/drawable/ic_location_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml index ebd5a92..1747ad0 100644 --- a/app/src/main/res/layout/activity_permssion.xml +++ b/app/src/main/res/layout/activity_permssion.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> - + - - - - - - + android:paddingHorizontal="@dimen/dp_20" + android:text="欢迎使用智慧城管！" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> @@ -60,203 +47,165 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingHorizontal="@dimen/dp_50"> + android:paddingHorizontal="@dimen/dp_20"> + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="位置" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_location_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会收集您的地理位置信息，以便为您查看案卷位置并导航至案卷发生点。请注意，在部分场景下，地理位置是必要信息，如您拒绝授权可能影响正常使用。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:layout_marginVertical="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="相机" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_camera_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您使用相机拍照、录制视频等对应业务相关服务时使用您的相机功能。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="相册" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_album_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您使用照片及视频上传、保存等对应服务是收集您的相册信息。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:layout_marginVertical="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="设备信息" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_device_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会收集您的设备信息以保障系统运行和您的账号安全。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="录音" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_audio_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您处理案卷相关业务时使用您的录音功能。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:layout_marginVertical="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="拨号" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_call_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您需要联系相关业务工作人员时使用您的拨号功能。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> @@ -265,6 +214,6 @@ android:id="@+id/enterMainButton" style="@style/MainButtonStyle" android:layout_marginHorizontal="@dimen/dp_50" - android:layout_marginVertical="@dimen/dp_30" + android:layout_marginVertical="@dimen/dp_20" android:text="下一步" /> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4df589c..830d79a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -109,6 +109,8 @@ + + @@ -126,12 +128,16 @@ + + + + @@ -141,6 +147,7 @@ + @@ -152,6 +159,7 @@ + diff --git a/app/src/main/res/drawable/ic_album_permssion.xml b/app/src/main/res/drawable/ic_album_permssion.xml new file mode 100644 index 0000000..101a787 --- /dev/null +++ b/app/src/main/res/drawable/ic_album_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_audio.xml b/app/src/main/res/drawable/ic_audio.xml deleted file mode 100644 index bbfe013..0000000 --- a/app/src/main/res/drawable/ic_audio.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_audio_permssion.xml b/app/src/main/res/drawable/ic_audio_permssion.xml new file mode 100644 index 0000000..80507c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_audio_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index d351b1d..0000000 --- a/app/src/main/res/drawable/ic_call.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_call_permssion.xml b/app/src/main/res/drawable/ic_call_permssion.xml new file mode 100644 index 0000000..06a8068 --- /dev/null +++ b/app/src/main/res/drawable/ic_call_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_camera_permssion.xml b/app/src/main/res/drawable/ic_camera_permssion.xml index b612ce9..d92c819 100644 --- a/app/src/main/res/drawable/ic_camera_permssion.xml +++ b/app/src/main/res/drawable/ic_camera_permssion.xml @@ -1,99 +1,12 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M834.3,631.4A173.9,173.9 0,1 0,660.5 805.2a173.8,173.8 0,0 0,173.9 -173.8z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="@color/black" + android:pathData="M826.3,224.1h-55.6a2.6,2.6 0,0 1,-2.3 -1.6A151.8,151.8 0,0 0,629.6 133.1L394.4,133.1a151.8,151.8 0,0 0,-138.8 89.4,2.6 2.6,0 0,1 -2.3,1.6h-55.6A150.7,150.7 0,0 0,46.1 373.7L46.1,746.5A150.7,150.7 0,0 0,197.7 896h628.6A150.7,150.7 0,0 0,977.9 746.5L977.9,373.6a150.7,150.7 0,0 0,-151.6 -149.5zM905.5,746.5a78.2,78.2 0,0 1,-79.2 77L197.7,823.5A78.2,78.2 0,0 1,118.5 746.5L118.5,373.7a78.2,78.2 0,0 1,79.2 -77h55.6a75.1,75.1 0,0 0,68.5 -44.5,79.3 79.3,0 0,1 72.7,-46.4h235.1a79.3,79.3 0,0 1,72.7 46.4,75.1 75.1,0 0,0 68.5,44.5h55.6a78.2,78.2 0,0 1,79.2 77L905.5,746.5zM509.7,373.1a185.6,185.6 0,1 0,185.5 185.6,185.8 185.8,0 0,0 -185.5,-185.6zM509.7,671.9a113.2,113.2 0,1 1,113.1 -113.2,113.2 113.2,0 0,1 -113,113.1zM772.1,348.2a40.7,40.7 0,1 0,40.7 40.7,40.7 40.7,0 0,0 -40.7,-40.7z" /> diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device_permssion.xml b/app/src/main/res/drawable/ic_device_permssion.xml new file mode 100644 index 0000000..9382c8a --- /dev/null +++ b/app/src/main/res/drawable/ic_device_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_permssion.xml b/app/src/main/res/drawable/ic_location_permssion.xml new file mode 100644 index 0000000..9656dca --- /dev/null +++ b/app/src/main/res/drawable/ic_location_permssion.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml index ebd5a92..1747ad0 100644 --- a/app/src/main/res/layout/activity_permssion.xml +++ b/app/src/main/res/layout/activity_permssion.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> - + - - - - - - + android:paddingHorizontal="@dimen/dp_20" + android:text="欢迎使用智慧城管！" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> @@ -60,203 +47,165 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingHorizontal="@dimen/dp_50"> + android:paddingHorizontal="@dimen/dp_20"> + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="位置" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_location_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会收集您的地理位置信息，以便为您查看案卷位置并导航至案卷发生点。请注意，在部分场景下，地理位置是必要信息，如您拒绝授权可能影响正常使用。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:layout_marginVertical="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="相机" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_camera_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您使用相机拍照、录制视频等对应业务相关服务时使用您的相机功能。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="相册" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_album_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您使用照片及视频上传、保存等对应服务是收集您的相册信息。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:layout_marginVertical="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="设备信息" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_device_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会收集您的设备信息以保障系统运行和您的账号安全。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="录音" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_audio_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您处理案卷相关业务时使用您的录音功能。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> + android:layout_marginVertical="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_gray_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_10"> - + android:drawablePadding="@dimen/dp_10" + android:text="拨号" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" + app:drawableStartCompat="@drawable/ic_call_permssion" /> - - - - - - + android:layout_marginStart="@dimen/dp_32" + android:layout_marginTop="@dimen/dp_10" + android:text="经授权，我们会在您需要联系相关业务工作人员时使用您的拨号功能。" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_14" /> @@ -265,6 +214,6 @@ android:id="@+id/enterMainButton" style="@style/MainButtonStyle" android:layout_marginHorizontal="@dimen/dp_50" - android:layout_marginVertical="@dimen/dp_30" + android:layout_marginVertical="@dimen/dp_20" android:text="下一步" /> \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4293551..3d0040f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -16,6 +16,7 @@ 20dp 25dp 30dp + 32dp 40dp 50dp 80dp