Skip to content

Commit b4a1e55

Browse files
Ginder-SinghGinder-Singh
committed
ui update
1 parent ce9ae91 commit b4a1e55

3 files changed

Lines changed: 107 additions & 132 deletions

File tree

‎base/src/main/res/values/strings.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,13 +372,12 @@
372372
<string name="note">Note</string>
373373
<string name="text_account_set_up">Sign Up</string>
374374
<string name="xpress_login">Lazy Login</string>
375-
<string name="scan_lazy_login_qr_code">Scan this QR code with your phone to log in.</string>
376-
<string name="web_login_description">Go to <b>https://windscribe.com/lazy</b> on any device and enter the code below.</string>
377-
<string name="app_login_description">Using your Windscribe Android app on your phone or tablet, go to Preferences (Top left), under “Account” choose “Lazy Login” and enter the code below.</string>
375+
<string name="scan_lazy_login_qr_code">Scan this QR code</string>
376+
<string name="web_login_description">Scan the QR code or enter the code in Windscribe mobile app at <b>Account → Lazy Login</b>.</string>
378377
<string name="or">OR</string>
379378
<string name="generate_code">Generate Code</string>
380-
<string name="app_login_manual_entry">Enter the code below in your Windscribe mobile app:\nPreferences → Account → Lazy Login</string>
381-
<string name="manual_enter_code">Enter this code manually:</string>
379+
<string name="app_login_manual_entry">Enter in mobile app at <b>Account → Lazy Login</b></string>
380+
<string name="manual_enter_code">Or enter this code manually:</string>
382381
<string name="manual_login">Manual Login</string>
383382
<string name="qr_generation_failed">Failed to generate QR code</string>
384383
<string name="keep_your_secrets">Keep Your\nSecrets.</string>
@@ -430,7 +429,7 @@ last chosen location.</string>
430429
<string name="appearance_description">Light or Dark. Choose a side, and choose wisely.</string>
431430
<string name="auto_connect_on_boot_description">Automatically connect to the last connected location when the device starts.</string>
432431
<string name="gps_spoofing_description">Spoof your device\'s GPS coordinates.</string>
433-
<string name="lazy_login_description">Login into Windscribe\'s TV apps with a short code.</string>
432+
<string name="lazy_login_description">Login into Windscribe\'s TV apps or enter the code in this app.</string>
434433
<string name="get_10gb_data">Get 10GB/ Month of data and gain the ability to reset your password.</string>
435434
<string name="data_left_in_your_plan">Data Left</string>
436435
<string name="referral_username">Referring Username</string>

‎tv/src/main/java/com/windscribe/tv/welcome/fragment/LoginFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import androidx.fragment.app.Fragment
1717
import androidx.lifecycle.lifecycleScope
1818
import com.windscribe.tv.R
1919
import com.windscribe.tv.databinding.FragmentLoginBinding
20-
import com.windscribe.vpn.R as BaseR
2120
import kotlinx.coroutines.Dispatchers
2221
import kotlinx.coroutines.launch
2322
import kotlinx.coroutines.withContext
23+
import com.windscribe.vpn.R as BaseR
2424

2525
class LoginFragment :
2626
Fragment(),

‎tv/src/main/res/layout/xpress_login_layout.xml‎

Lines changed: 101 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@
2727
android:id="@+id/express_login_title"
2828
android:layout_width="0dp"
2929
android:layout_height="wrap_content"
30-
android:layout_marginTop="@dimen/reg_24dp"
3130
android:fontFamily="@font/ibm_plex_sans_bold"
3231
android:gravity="center"
3332
android:text="@string/xpress_login"
3433
android:textColor="@color/colorWhite"
3534
android:textSize="@dimen/text_size_24"
35+
app:layout_constraintBottom_toTopOf="@id/manual_login_container"
3636
app:layout_constraintEnd_toEndOf="@id/guide_end"
3737
app:layout_constraintStart_toStartOf="@id/guide_start"
38-
app:layout_constraintTop_toTopOf="parent" />
38+
app:layout_constraintTop_toTopOf="parent"
39+
app:layout_constraintVertical_chainStyle="packed" />
3940

4041

4142
<LinearLayout
@@ -45,6 +46,7 @@
4546
android:layout_marginTop="@dimen/reg_32dp"
4647
android:gravity="center_horizontal"
4748
android:orientation="vertical"
49+
app:layout_constraintBottom_toBottomOf="parent"
4850
app:layout_constraintEnd_toEndOf="@id/guide_end"
4951
app:layout_constraintStart_toStartOf="@id/guide_start"
5052
app:layout_constraintTop_toBottomOf="@id/express_login_title">
@@ -54,19 +56,6 @@
5456
android:layout_width="match_parent"
5557
android:text="@string/web_login_description" />
5658

57-
<TextView
58-
style="@style/loginDescriptionStyle"
59-
android:layout_width="match_parent"
60-
android:layout_marginTop="@dimen/reg_24dp"
61-
android:fontFamily="@font/ibm_plex_sans_bold"
62-
android:text="@string/or" />
63-
64-
<TextView
65-
style="@style/loginDescriptionStyle"
66-
android:layout_width="match_parent"
67-
android:layout_marginTop="@dimen/reg_40dp"
68-
android:text="@string/app_login_description" />
69-
7059
<Button
7160
android:id="@+id/generate_code"
7261
style="@style/LoginButtonStyle"
@@ -81,128 +70,115 @@
8170
<LinearLayout
8271
android:id="@+id/qr_login_container"
8372
android:layout_width="0dp"
84-
android:layout_height="wrap_content"
85-
android:layout_marginStart="@dimen/reg_16dp"
86-
android:layout_marginTop="@dimen/reg_8dp"
87-
android:layout_marginEnd="@dimen/reg_16dp"
88-
android:gravity="center_vertical"
89-
android:orientation="horizontal"
73+
android:layout_height="0dp"
74+
android:gravity="center"
75+
android:orientation="vertical"
9076
android:visibility="gone"
91-
app:layout_constraintEnd_toEndOf="parent"
92-
app:layout_constraintStart_toStartOf="parent"
93-
app:layout_constraintTop_toBottomOf="@id/express_login_title">
77+
app:layout_constraintBottom_toBottomOf="parent"
78+
app:layout_constraintEnd_toEndOf="@id/guide_end"
79+
app:layout_constraintStart_toStartOf="@id/guide_start"
80+
app:layout_constraintTop_toTopOf="parent"
81+
>
9482

95-
<LinearLayout
96-
android:layout_width="384dp"
83+
<TextView
84+
android:layout_width="match_parent"
9785
android:layout_height="wrap_content"
98-
android:gravity="center_horizontal"
99-
android:orientation="vertical">
86+
android:fontFamily="@font/ibm_plex_sans_regular"
87+
android:gravity="center"
88+
android:text="@string/scan_lazy_login_qr_code"
89+
android:textColor="@color/colorWhite50"
90+
android:textSize="21sp" />
10091

101-
<TextView
102-
style="@style/loginDescriptionStyle"
103-
android:layout_width="match_parent"
104-
android:text="@string/scan_lazy_login_qr_code" />
105-
106-
<FrameLayout
107-
android:layout_width="384dp"
108-
android:layout_height="384dp"
109-
android:layout_marginTop="@dimen/reg_12dp">
110-
111-
<ImageView
112-
android:id="@+id/qr_code"
113-
android:layout_width="match_parent"
114-
android:layout_height="match_parent"
115-
android:background="@color/colorWhite"
116-
android:contentDescription="@string/scan_lazy_login_qr_code"
117-
android:padding="@dimen/reg_8dp"
118-
android:scaleType="fitCenter" />
119-
120-
<ProgressBar
121-
android:id="@+id/qr_loading"
122-
android:layout_width="wrap_content"
123-
android:layout_height="wrap_content"
124-
android:layout_gravity="center"
125-
android:visibility="gone" />
126-
127-
<LinearLayout
128-
android:id="@+id/qr_error_container"
129-
android:layout_width="match_parent"
130-
android:layout_height="match_parent"
131-
android:background="@color/colorWhite"
132-
android:gravity="center"
133-
android:orientation="vertical"
134-
android:padding="@dimen/reg_16dp"
135-
android:visibility="gone">
136-
137-
<TextView
138-
android:id="@+id/qr_error_message"
139-
android:layout_width="wrap_content"
140-
android:layout_height="wrap_content"
141-
android:gravity="center"
142-
android:text="@string/qr_generation_failed"
143-
android:textColor="@color/colorBlack"
144-
android:textSize="@dimen/text_size_16" />
145-
146-
<Button
147-
android:id="@+id/qr_retry_button"
148-
style="@style/LoginButtonStyle"
149-
android:layout_width="wrap_content"
150-
android:layout_height="wrap_content"
151-
android:layout_marginTop="@dimen/reg_16dp"
152-
android:text="@string/retry" />
153-
154-
</LinearLayout>
155-
156-
</FrameLayout>
157-
158-
<androidx.appcompat.widget.AppCompatTextView
159-
android:id="@+id/secret_code"
160-
style="@style/secretCodeStyle"
161-
android:layout_marginTop="@dimen/reg_16dp"
162-
android:fontFamily="@font/ibm_plex_sans_bold"
163-
android:visibility="visible" />
164-
165-
</LinearLayout>
166-
167-
<LinearLayout
168-
android:layout_width="0dp"
92+
<TextView
93+
android:layout_width="match_parent"
16994
android:layout_height="wrap_content"
170-
android:layout_marginStart="@dimen/reg_24dp"
171-
android:layout_weight="1"
172-
android:gravity="center_horizontal"
173-
android:orientation="vertical">
174-
175-
<TextView
176-
style="@style/loginDescriptionStyle"
177-
android:layout_width="match_parent"
178-
android:layout_marginTop="@dimen/reg_24dp"
179-
android:fontFamily="@font/ibm_plex_sans_bold"
180-
android:text="@string/or" />
95+
android:layout_marginTop="@dimen/reg_16dp"
96+
android:fontFamily="@font/ibm_plex_sans_bold"
97+
android:gravity="center"
98+
android:text="@string/or"
99+
android:textColor="@color/colorWhite50"
100+
android:textSize="21sp" />
181101

182-
<TextView
183-
style="@style/loginDescriptionStyle"
102+
<TextView
103+
android:layout_width="match_parent"
104+
android:layout_height="wrap_content"
105+
android:layout_marginTop="@dimen/reg_8dp"
106+
android:fontFamily="@font/ibm_plex_sans_regular"
107+
android:gravity="center"
108+
android:text="@string/app_login_manual_entry"
109+
android:textColor="@color/colorWhite50"
110+
android:textSize="21sp" />
111+
112+
<FrameLayout
113+
android:id="@+id/qr_frame"
114+
android:layout_width="225dp"
115+
android:layout_height="225dp"
116+
android:layout_marginTop="@dimen/reg_24dp">
117+
118+
<ImageView
119+
android:id="@+id/qr_code"
184120
android:layout_width="match_parent"
185-
android:layout_marginTop="@dimen/reg_24dp"
186-
android:text="@string/manual_enter_code" />
121+
android:layout_height="match_parent"
122+
android:background="@color/colorWhite"
123+
android:contentDescription="@string/scan_lazy_login_qr_code"
124+
android:padding="@dimen/reg_8dp"
125+
android:scaleType="fitCenter" />
126+
127+
<ProgressBar
128+
android:id="@+id/qr_loading"
129+
android:layout_width="wrap_content"
130+
android:layout_height="wrap_content"
131+
android:layout_gravity="center"
132+
android:visibility="gone" />
187133

188-
<androidx.appcompat.widget.AppCompatTextView
189-
android:id="@+id/secret_code_large"
134+
<LinearLayout
135+
android:id="@+id/qr_error_container"
190136
android:layout_width="match_parent"
191-
android:layout_height="wrap_content"
192-
android:layout_marginTop="@dimen/reg_16dp"
193-
android:fontFamily="@font/ibm_plex_sans_bold"
137+
android:layout_height="match_parent"
138+
android:background="@color/colorWhite"
194139
android:gravity="center"
195-
android:textColor="@color/colorWhite"
196-
android:textSize="@dimen/text_size_32"
197-
android:letterSpacing="0.1" />
140+
android:orientation="vertical"
141+
android:padding="@dimen/reg_16dp"
142+
android:visibility="gone">
198143

199-
<TextView
200-
style="@style/loginDescriptionStyle"
201-
android:layout_width="match_parent"
202-
android:layout_marginTop="@dimen/reg_24dp"
203-
android:text="@string/app_login_manual_entry" />
144+
<TextView
145+
android:id="@+id/qr_error_message"
146+
android:layout_width="wrap_content"
147+
android:layout_height="wrap_content"
148+
android:gravity="center"
149+
android:text="@string/qr_generation_failed"
150+
android:textColor="@color/colorBlack"
151+
android:textSize="@dimen/text_size_16" />
152+
153+
<Button
154+
android:id="@+id/qr_retry_button"
155+
style="@style/LoginButtonStyle"
156+
android:layout_width="wrap_content"
157+
android:layout_height="wrap_content"
158+
android:layout_marginTop="@dimen/reg_16dp"
159+
android:text="@string/retry" />
160+
161+
</LinearLayout>
204162

205-
</LinearLayout>
163+
</FrameLayout>
164+
165+
<androidx.appcompat.widget.AppCompatTextView
166+
android:id="@+id/secret_code_large"
167+
android:layout_width="match_parent"
168+
android:layout_height="wrap_content"
169+
android:layout_marginTop="@dimen/reg_16dp"
170+
android:fontFamily="@font/ibm_plex_sans_bold"
171+
android:gravity="center"
172+
android:letterSpacing="0.1"
173+
android:textColor="@color/colorWhite"
174+
android:textSize="@dimen/text_size_32" />
175+
176+
<androidx.appcompat.widget.AppCompatTextView
177+
android:id="@+id/secret_code"
178+
style="@style/secretCodeStyle"
179+
android:layout_marginTop="@dimen/reg_8dp"
180+
android:fontFamily="@font/ibm_plex_sans_bold"
181+
android:visibility="gone" />
206182

207183
</LinearLayout>
208184

0 commit comments

Comments
 (0)