Jelajahi Sumber

loader added on Login and Home TV screen

Khubaib 1 tahun lalu
induk
melakukan
8b60be3e64

+ 5 - 1
app/src/main/java/com/vpn/fastestvpnservice/activities/HomeActivityTV.kt

@@ -220,7 +220,9 @@ class HomeActivityTV : AppCompatActivity(), VPNConnectionCallBacks, CallBacks {
         profileViewModel.mutableLiveDataLogoutTv.observe(this, Observer {
 //            if (isVisible)
 //                mainActivity.hideLoading()
-                if (it) {
+            tvHomeBinding.progressBar?.visibility = View.GONE
+
+            if (it) {
                     prefHelper.clearAllData()
 
                     val i = Intent(this, LoginActivityTV::class.java)
@@ -283,6 +285,8 @@ class HomeActivityTV : AppCompatActivity(), VPNConnectionCallBacks, CallBacks {
 //                ivConnect.performClick()
 //            }
 
+            tvHomeBinding.progressBar?.visibility = View.VISIBLE
+
             if (App.connection_status == App.CONNECTION_STATE_CONNECTED || App.connection_status == App.CONNECTION_STATE_CONNECTED_2 || App.connection_status == App.CONNECTION_STATE_UP_WG) {
                 Handler(Looper.getMainLooper()).postDelayed({
                     tvHomeBinding.ivConnect?.performClick()

+ 11 - 0
app/src/main/res/layout-land/activity_home_tv.xml

@@ -376,6 +376,17 @@
                 app:layout_constraintStart_toStartOf="@id/connectRippleEffect"
                 app:layout_constraintTop_toBottomOf="@+id/tv_connect_status" />
 
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:indeterminateTint="@color/app_yellow_color"
+                android:visibility="gone" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </ScrollView>

+ 190 - 185
app/src/main/res/layout-land/activity_login_tv.xml

@@ -1,208 +1,213 @@
-
-
-<!--    <ScrollView-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="match_parent"-->
-<!--        android:background="@drawable/bg_app"-->
-<!--        android:fillViewport="false">-->
-<!--        -->
-<!--        -->
-<!--    </ScrollView>-->
-
 <layout
     android:id="@+id/main"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.constraintlayout.widget.ConstraintLayout
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/bg_app"
-        android:padding="@dimen/x5dp">
-
-        <LinearLayout
-            android:id="@+id/linearLayout2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/x30dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginRight="@dimen/x30dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            >
-
-            <TextView
-                android:id="@+id/textView6"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="30dp"
-                android:fontFamily="@font/outfit_semibold"
-                android:text="Welcome back!"
-                android:textColor="@color/white"
-                android:layout_gravity="center"
-                android:textSize="20sp" />
-
-            <TextView
-                android:id="@+id/textView7"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="1pt"
-                android:alpha="0.5"
-                android:fontFamily="@font/outfit_regular"
-                android:text="Please login to your account."
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:visibility="gone"
-                android:textStyle="normal" />
+        android:fillViewport="false">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="@dimen/x5dp">
 
             <LinearLayout
-                android:id="@+id/llemail"
-                android:layout_width="match_parent"
+                android:id="@+id/linearLayout2"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/border_round_gray"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:layout_marginStart="0dp"
-                android:layout_marginEnd="0dp"
-                >
-
-                <EditText
-                    android:id="@+id/etEmail"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/border_round_gray"
-                    android:drawablePadding="16dp"
-                    android:fontFamily="@font/outfit_regular"
-                    android:hint="@string/email"
-                    android:inputType="textEmailAddress"
-                    android:padding="18dp"
-                    android:textColor="@color/text_color_white"
-                    android:textColorHint="@color/text_color_white"
-                    android:textSize="16sp"
-                    >
+                android:layout_marginLeft="@dimen/x30dp"
+                android:layout_marginTop="@dimen/x30dp"
+                android:layout_marginRight="@dimen/x30dp"
+                android:gravity="center"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView7">
 
-                </EditText>
-            </LinearLayout>
+                <TextView
+                    android:id="@+id/textView6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="30dp"
+                    android:fontFamily="@font/outfit_semibold"
+                    android:text="Welcome back!"
+                    android:textColor="@color/white"
+                    android:layout_gravity="center"
+                    android:textSize="20sp" />
 
-            <LinearLayout
-                android:id="@+id/llPassword"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2pt"
-                android:background="@drawable/border_round_gray"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:layout_marginStart="0dp"
-                android:layout_marginEnd="0dp"
-                >
-
-                <EditText
-                    android:id="@+id/etPassword"
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/textView7"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="#00000000"
-                    android:drawablePadding="16dp"
-                    android:focusable="true"
+                    android:layout_marginTop="1pt"
+                    android:alpha="0.5"
                     android:fontFamily="@font/outfit_regular"
-                    android:hint="@string/pass"
-                    android:inputType="textPassword"
-                    android:padding="18dp"
-                    android:textColor="@color/text_color_white"
-                    android:textColorHint="@color/text_color_white"
-                    android:textSize="16sp" />
-
-                <ImageView
-                    android:id="@+id/ivEye"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="16dp"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_hide_password" />
-
-            </LinearLayout>
+                    android:text="Please login to your account."
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    android:textStyle="normal"
+                    android:visibility="gone" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/x10dp"
-                android:orientation="horizontal"
-                android:weightSum="2">
+                <LinearLayout
+                    android:id="@+id/llemail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:background="@drawable/border_round_gray"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="@dimen/x150dp"
+                    android:layout_marginEnd="@dimen/x150dp"
+                    >
 
-                <TextView
-                    android:id="@+id/tv_signup"
+                    <EditText
+                        android:id="@+id/etEmail"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@drawable/border_round_gray"
+                        android:drawablePadding="16dp"
+                        android:fontFamily="@font/outfit_regular"
+                        android:hint="@string/email"
+                        android:inputType="textEmailAddress"
+                        android:padding="18dp"
+                        android:textColor="@color/text_color_white"
+                        android:textColorHint="@color/text_color_white"
+                        android:textSize="16sp"
+                        >
+
+                    </EditText>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/llPassword"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:fontFamily="@font/outfit_regular"
-                    android:gravity="left"
-                    android:padding="@dimen/x5dp"
-                    android:text="@string/signup"
-                    android:textColor="@color/app_yellow_color"
-                    android:textSize="16dp"
-                    android:visibility="gone"
-                    android:textStyle="bold" />
+                    android:layout_marginTop="2pt"
+                    android:background="@drawable/border_round_gray"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="@dimen/x150dp"
+                    android:layout_marginEnd="@dimen/x150dp"
+                    >
 
-                <TextView
-                    android:id="@+id/tvForgotPassword"
+                    <EditText
+                        android:id="@+id/etPassword"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="#00000000"
+                        android:drawablePadding="16dp"
+                        android:focusable="true"
+                        android:fontFamily="@font/outfit_regular"
+                        android:hint="@string/pass"
+                        android:inputType="textPassword"
+                        android:padding="18dp"
+                        android:textColor="@color/text_color_white"
+                        android:textColorHint="@color/text_color_white"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:id="@+id/ivEye"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="16dp"
+                        android:visibility="gone"
+                        android:src="@drawable/ic_hide_password" />
+
+                </LinearLayout>
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:fontFamily="@font/outfit_regular"
-                    android:gravity="right"
-                    android:padding="@dimen/x5dp"
-                    android:text="@string/forgot_password"
-                    android:textColor="@color/app_yellow_color"
-                    android:textSize="16dp"
-                    android:visibility="gone"
-                    android:textStyle="bold" />
+                    android:layout_marginTop="@dimen/x10dp"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
+
+                    <TextView
+                        android:id="@+id/tv_signup"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:fontFamily="@font/outfit_regular"
+                        android:gravity="left"
+                        android:padding="@dimen/x5dp"
+                        android:text="@string/signup"
+                        android:textColor="@color/app_yellow_color"
+                        android:textSize="16dp"
+                        android:visibility="gone"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tvForgotPassword"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:fontFamily="@font/outfit_regular"
+                        android:gravity="right"
+                        android:padding="@dimen/x5dp"
+                        android:text="@string/forgot_password"
+                        android:textColor="@color/app_yellow_color"
+                        android:textSize="16dp"
+                        android:visibility="gone"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
             </LinearLayout>
 
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/tvLogin"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/x30dp"
-            android:background="@drawable/button_selector_state"
-            android:focusable="true"
-            android:fontFamily="@font/outfit_regular"
-            android:gravity="center"
-            android:letterSpacing="0.1"
-            android:shadowColor="@color/white"
-            android:text="@string/login"
-            android:textAllCaps="false"
-            android:textColor="@color/textviewhover"
-            android:textSize="16sp"
-            android:visibility="visible"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="0dp"
-            app:layout_constraintEnd_toEndOf="@+id/linearLayout2"
-            app:layout_constraintStart_toStartOf="@+id/linearLayout2"
-            app:layout_constraintTop_toBottomOf="@id/linearLayout2" />
-
-        <ImageView
-            android:id="@+id/imageView7"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginBottom="@dimen/x30dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/linearLayout2"
-            app:srcCompat="@drawable/ic_logo1" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+            <Button
+                android:id="@+id/tvLogin"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/x20dp"
+                android:background="@drawable/button_selector_state"
+                android:focusable="true"
+                android:fontFamily="@font/outfit_regular"
+                android:gravity="center"
+                android:letterSpacing="0.1"
+                android:shadowColor="@color/white"
+                android:text="@string/login"
+                android:textAllCaps="false"
+                android:textColor="@color/textviewhover"
+                android:textSize="16sp"
+                android:visibility="visible"
+                android:layout_marginStart="@dimen/x150dp"
+                android:layout_marginEnd="@dimen/x150dp"
+                app:layout_constraintEnd_toEndOf="@+id/linearLayout2"
+                app:layout_constraintStart_toStartOf="@+id/linearLayout2"
+                app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
+
+            <ImageView
+                android:id="@+id/imageView7"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_marginTop="@dimen/x30dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_logo1" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:indeterminateTint="@color/app_yellow_color"
+                android:visibility="gone" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+</layout>

+ 13 - 1
app/src/main/res/layout/activity_home_tv.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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:id="@+id/main"
@@ -360,6 +361,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintVertical_bias="1.0" />
 
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:indeterminateTint="@color/app_yellow_color"
+            android:visibility="gone" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>