Skip to content

Commit c5a50ca

Browse files
authored
Merge pull request #30 from MirrorFly/release/V7.13.0
Release version 7.13.0
2 parents 73e57d4 + 2d94879 commit c5a50ca

File tree

5 files changed

+152
-0
lines changed

5 files changed

+152
-0
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<vector
2+
xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:aapt="http://schemas.android.com/aapt"
4+
android:width="336dp"
5+
android:height="60dp"
6+
android:viewportWidth="336"
7+
android:viewportHeight="60"
8+
>
9+
<group>
10+
<clip-path
11+
android:pathData="M8 0H328C332.418 0 336 3.58172 336 8V52C336 56.4183 332.418 60 328 60H8C3.58172 60 0 56.4183 0 52V8C0 3.58172 3.58172 0 8 0Z"
12+
/>
13+
<path
14+
android:pathData="M0 0V60H336V0"
15+
android:fillColor="#80000000"
16+
/>
17+
<path
18+
android:pathData="M8 0H328C332.418 0 336 3.58172 336 8V52C336 56.4183 332.418 60 328 60H8C3.58172 60 0 56.4183 0 52V8C0 3.58172 3.58172 0 8 0Z"
19+
android:strokeWidth="2"
20+
android:strokeColor="#262626"
21+
/>
22+
</group>
23+
</vector>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="20dp"
3+
android:height="20dp"
4+
android:viewportWidth="20"
5+
android:viewportHeight="20">
6+
<group>
7+
<clip-path
8+
android:pathData="M0,0h20v20h-20z"/>
9+
<path
10+
android:pathData="M11.175,10L14.758,6.425C14.915,6.269 15.003,6.056 15.003,5.834C15.003,5.612 14.915,5.399 14.758,5.242C14.601,5.085 14.389,4.997 14.167,4.997C13.945,4.997 13.732,5.085 13.575,5.242L10,8.825L6.425,5.242C6.268,5.085 6.055,4.997 5.833,4.997C5.611,4.997 5.399,5.085 5.242,5.242C5.085,5.399 4.997,5.612 4.997,5.834C4.997,6.056 5.085,6.269 5.242,6.425L8.825,10L5.242,13.575C5.164,13.653 5.102,13.745 5.059,13.847C5.017,13.948 4.995,14.057 4.995,14.167C4.995,14.277 5.017,14.386 5.059,14.488C5.102,14.589 5.164,14.681 5.242,14.759C5.319,14.837 5.411,14.899 5.513,14.941C5.614,14.983 5.723,15.005 5.833,15.005C5.943,15.005 6.052,14.983 6.154,14.941C6.255,14.899 6.347,14.837 6.425,14.759L10,11.175L13.575,14.759C13.652,14.837 13.745,14.899 13.846,14.941C13.948,14.983 14.057,15.005 14.167,15.005C14.277,15.005 14.385,14.983 14.487,14.941C14.589,14.899 14.681,14.837 14.758,14.759C14.836,14.681 14.898,14.589 14.941,14.488C14.983,14.386 15.005,14.277 15.005,14.167C15.005,14.057 14.983,13.948 14.941,13.847C14.898,13.745 14.836,13.653 14.758,13.575L11.175,10Z"
11+
android:fillColor="#ffffff"/>
12+
</group>
13+
</vector>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="32dp"
3+
android:height="32dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="32">
6+
<path
7+
android:pathData="M16,0L16,0A16,16 0,0 1,32 16L32,16A16,16 0,0 1,16 32L16,32A16,16 0,0 1,0 16L0,16A16,16 0,0 1,16 0z"
8+
android:fillColor="#333333"/>
9+
<path
10+
android:pathData="M11,16L11,16A1,1 0,0 1,12 17L12,21A1,1 0,0 1,11 22L11,22A1,1 0,0 1,10 21L10,17A1,1 0,0 1,11 16z"
11+
android:fillColor="#EA1212"/>
12+
<path
13+
android:pathData="M15,13L15,13A1,1 0,0 1,16 14L16,21A1,1 0,0 1,15 22L15,22A1,1 0,0 1,14 21L14,14A1,1 0,0 1,15 13z"
14+
android:fillColor="#D9D9D9"/>
15+
<path
16+
android:pathData="M19,10L19,10A1,1 0,0 1,20 11L20,21A1,1 0,0 1,19 22L19,22A1,1 0,0 1,18 21L18,11A1,1 0,0 1,19 10z"
17+
android:fillColor="#D9D9D9"/>
18+
</vector>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="34dp"
3+
android:height="24dp"
4+
android:viewportWidth="34"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M12,0L22,0A12,12 0,0 1,34 12L34,12A12,12 0,0 1,22 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"
8+
android:fillColor="#404040"/>
9+
<path
10+
android:pathData="M12,12L12,12A1,1 0,0 1,13 13L13,17A1,1 0,0 1,12 18L12,18A1,1 0,0 1,11 17L11,13A1,1 0,0 1,12 12z"
11+
android:fillColor="#EA1212"/>
12+
<path
13+
android:pathData="M16,9L16,9A1,1 0,0 1,17 10L17,17A1,1 0,0 1,16 18L16,18A1,1 0,0 1,15 17L15,10A1,1 0,0 1,16 9z"
14+
android:fillColor="#D9D9D9"/>
15+
<path
16+
android:pathData="M20,6L20,6A1,1 0,0 1,21 7L21,17A1,1 0,0 1,20 18L20,18A1,1 0,0 1,19 17L19,7A1,1 0,0 1,20 6z"
17+
android:fillColor="#D9D9D9"/>
18+
</vector>
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:id="@+id/poor_connection_root"
6+
android:layout_width="match_parent"
7+
android:layout_height="wrap_content"
8+
android:padding="@dimen/margin_10">
9+
10+
<androidx.cardview.widget.CardView
11+
android:layout_width="0dp"
12+
android:layout_height="wrap_content"
13+
android:layout_margin="8dp"
14+
android:elevation="4dp"
15+
app:cardBackgroundColor="#262626"
16+
app:cardCornerRadius="4dp"
17+
app:cardPreventCornerOverlap="true"
18+
app:cardUseCompatPadding="true"
19+
app:layout_constraintEnd_toEndOf="parent"
20+
app:layout_constraintStart_toStartOf="parent"
21+
app:layout_constraintTop_toTopOf="parent">
22+
23+
<androidx.constraintlayout.widget.ConstraintLayout
24+
android:layout_width="match_parent"
25+
android:layout_height="wrap_content"
26+
android:background="@drawable/ic_poor_connection_background"
27+
android:padding="@dimen/margin_10">
28+
29+
<ImageView
30+
android:id="@+id/network_id"
31+
android:layout_width="@dimen/margin_40"
32+
android:layout_height="@dimen/margin_40"
33+
android:contentDescription="@string/poor_connection"
34+
android:src="@drawable/ic_poor_connection_snackbar_alert"
35+
app:layout_constraintBottom_toBottomOf="parent"
36+
app:layout_constraintStart_toStartOf="parent"
37+
app:layout_constraintTop_toTopOf="parent" />
38+
39+
<TextView
40+
android:id="@+id/poor_connection_textView"
41+
android:layout_width="wrap_content"
42+
android:layout_height="wrap_content"
43+
android:layout_marginStart="@dimen/padding_15"
44+
android:fontFamily="@font/sf_ui_display_medium"
45+
android:text="@string/poor_connection"
46+
android:textAppearance="@style/poor_connection_text"
47+
android:textColor="@color/white"
48+
app:layout_constraintBottom_toTopOf="@+id/try_moving_textView"
49+
app:layout_constraintStart_toEndOf="@id/network_id" />
50+
51+
<TextView
52+
android:id="@+id/try_moving_textView"
53+
android:layout_width="wrap_content"
54+
android:layout_height="wrap_content"
55+
android:layout_marginStart="@dimen/padding_15"
56+
android:layout_marginTop="@dimen/margin_5"
57+
android:fontFamily="@font/sf_ui_display_regular"
58+
android:text="@string/try_moving_to_get_better_signal"
59+
android:textAppearance="@style/try_moving"
60+
android:textColor="@color/white"
61+
app:layout_constraintBottom_toBottomOf="parent"
62+
app:layout_constraintStart_toEndOf="@id/network_id" />
63+
64+
<ImageView
65+
android:id="@+id/close_snack"
66+
android:layout_width="@dimen/margin_20"
67+
android:layout_height="@dimen/margin_20"
68+
android:layout_marginEnd="@dimen/margin_5"
69+
android:contentDescription="@string/close_poor_connection_layout"
70+
android:src="@drawable/ic_poor_connection_close"
71+
android:textColor="@color/white"
72+
android:textSize="30sp"
73+
app:layout_constraintBottom_toBottomOf="@+id/poor_connection_textView"
74+
app:layout_constraintEnd_toEndOf="parent"
75+
app:layout_constraintTop_toTopOf="@+id/poor_connection_textView" />
76+
77+
</androidx.constraintlayout.widget.ConstraintLayout>
78+
79+
</androidx.cardview.widget.CardView>
80+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)