diff options
Diffstat (limited to 'app/src/normal')
| -rw-r--r-- | app/src/normal/res/drawable/background_red.xml | 26 | ||||
| -rw-r--r-- | app/src/normal/res/layout-xlarge-port/f_eip.xml | 95 | ||||
| -rw-r--r-- | app/src/normal/res/layout-xlarge/f_eip.xml | 103 |
3 files changed, 134 insertions, 90 deletions
diff --git a/app/src/normal/res/drawable/background_red.xml b/app/src/normal/res/drawable/background_red.xml deleted file mode 100644 index 0189357c..00000000 --- a/app/src/normal/res/drawable/background_red.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android" - - <item> - <shape android:shape="rectangle"> - <solid android:color="@color/bg_red_1"/> - <size android:width="200dp" android:height="250dp" /> - </shape> - </item> - <item - android:bottom="150dp" - - android:top="-100dp" - > - <shape android:shape="oval"> - <gradient - android:startColor="@color/bg_red_2" - android:endColor="@color/bg_red_3" - android:angle="270" - android:useLevel="false" - /> - <size android:width="200dp" android:height="250dp" /> - </shape> - </item> - -</layer-list>
\ No newline at end of file diff --git a/app/src/normal/res/layout-xlarge-port/f_eip.xml b/app/src/normal/res/layout-xlarge-port/f_eip.xml index c3d3fd36..26a90403 100644 --- a/app/src/normal/res/layout-xlarge-port/f_eip.xml +++ b/app/src/normal/res/layout-xlarge-port/f_eip.xml @@ -8,78 +8,96 @@ > <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_vertical_left" + android:layout_width="0dp" + android:layout_height="0dp" + android:orientation="vertical" + app:layout_constraintGuide_percent="0.3" + /> + + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_top" android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintGuide_percent="0.0" - app:layout_constraintRight_toRightOf="parent" /> + app:layout_constraintGuide_percent="0.025" + /> <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_vertical_left" + android:id="@+id/guideline_horizontal_center" + android:layout_width="0dp" + android:layout_height="0dp" + android:orientation="horizontal" + app:layout_constraintGuide_percent="0.175" + /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_vertical_outer_left" android:layout_width="0dp" android:layout_height="0dp" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintGuide_percent="0.2" + app:layout_constraintGuide_percent="0.15" /> + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_vertical_outer_right" + android:layout_width="0dp" + android:layout_height="0dp" + android:orientation="vertical" + app:layout_constraintGuide_percent="0.85" + /> <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_bottom" android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintGuide_percent="0.7" + app:layout_constraintGuide_percent="0.66" /> + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_right" android:layout_width="0dp" android:layout_height="0dp" android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintGuide_percent="0.8" + app:layout_constraintGuide_percent="0.7" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" + app:srcCompat="@drawable/bg_red" android:scaleType="fitXY" - app:srcCompat="@drawable/background_eip" /> + android:layout_marginTop="-300dp" + android:layout_marginBottom="-300dp" + android:layout_marginLeft="-300dp" + android:layout_marginRight="-300dp" + + /> - <se.leap.bitmaskclient.base.views.MainButton - android:id="@+id/main_button" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="@dimen/stdpadding" - app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom" - app:layout_constraintDimensionRatio="1:1" - app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right" - app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left" - app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top" - app:layout_constraintVertical_bias="0.425" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/main_description" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@id/main_button" + app:layout_constraintTop_toTopOf="@id/guideline_horizontal_top" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/sub_description" android:padding="@dimen/activity_margin" + android:layout_marginTop="@dimen/activity_margin" android:textAppearance="@android:style/TextAppearance.Large" android:textSize="45sp" android:textStyle="bold" + android:autoSizeMinTextSize="38sp" + android:autoSizeTextType="uniform" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" - tools:text="Connection Secure" + tools:text="Connection secure" android:gravity="center" android:maxLines="1" /> @@ -91,18 +109,40 @@ app:layout_constraintTop_toBottomOf="@id/main_description" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toTopOf="@+id/gateway_location_button" android:padding="@dimen/activity_margin" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" - tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk" + tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf" android:gravity="center" android:maxLines="2" android:ellipsize="end" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/state_view" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom" + app:layout_constraintTop_toTopOf="@id/guideline_horizontal_center" + app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_outer_left" + app:layout_constraintRight_toRightOf="@id/guideline_vertical_outer_right" + app:layout_constraintVertical_bias="1" + app:srcCompat="@drawable/red_mask" + /> + <se.leap.bitmaskclient.base.views.MainButton + android:id="@+id/main_button" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_margin="@dimen/stdpadding" + app:layout_constraintTop_toBottomOf="@+id/guideline_horizontal_bottom" + app:layout_constraintBottom_toTopOf="@id/gateway_location_button" + app:layout_constraintDimensionRatio="1:1" + app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right" + app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left" + /> + <se.leap.bitmaskclient.base.views.LocationButton android:id="@+id/gateway_location_button" android:layout_width="match_parent" @@ -113,9 +153,10 @@ android:layout_marginTop="@dimen/stdpadding" android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" - app:layout_constraintBottom_toBottomOf="@+id/background" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" tools:text="SEATTLE" android:gravity="center_vertical" /> + </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/normal/res/layout-xlarge/f_eip.xml b/app/src/normal/res/layout-xlarge/f_eip.xml index 4042933e..e1ecf321 100644 --- a/app/src/normal/res/layout-xlarge/f_eip.xml +++ b/app/src/normal/res/layout-xlarge/f_eip.xml @@ -5,20 +5,20 @@ --> <androidx.constraintlayout.widget.ConstraintLayout 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" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/eipServiceFragment" > + + <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_horizontal_top" + android:id="@+id/guideline_horizontal_center" android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintGuide_percent="0.0" + app:layout_constraintGuide_percent="0.25" /> <androidx.constraintlayout.widget.Guideline @@ -26,9 +26,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintGuide_percent="0.2" - /> + app:layout_constraintGuide_percent="0.3" /> <androidx.constraintlayout.widget.Guideline @@ -36,9 +34,22 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintGuide_percent="0.66" + app:layout_constraintGuide_percent="0.55" /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_horizontal_button_top" + android:layout_width="0dp" + android:layout_height="0dp" + android:orientation="horizontal" + app:layout_constraintGuide_percent="0.875" + /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_horizontal_button_bottom" + android:layout_width="0dp" + android:layout_height="0dp" + android:orientation="horizontal" + app:layout_constraintGuide_percent="0.98" /> <androidx.constraintlayout.widget.Guideline @@ -47,33 +58,25 @@ android:layout_height="0dp" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintGuide_percent="0.8" - /> + app:layout_constraintGuide_percent="0.7" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitXY" - app:srcCompat="@drawable/background_eip" /> - + android:layout_marginLeft="-300dp" + android:layout_marginRight="-300dp" + android:layout_marginTop="-300dp" + android:layout_marginBottom="-300dp" + app:srcCompat="@drawable/bg_red" /> - <se.leap.bitmaskclient.base.views.MainButton - android:id="@+id/main_button" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="@dimen/stdpadding" - app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom" - app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right" - app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left" - app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top" - app:layout_constraintDimensionRatio="1:1" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/main_description" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/sub_description" @@ -83,8 +86,7 @@ android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" - tools:text="CONNETION SECURE" - android:maxLines="1" + tools:text="Connection secure" /> <androidx.appcompat.widget.AppCompatTextView @@ -94,32 +96,59 @@ app:layout_constraintTop_toBottomOf="@id/main_description" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toTopOf="@+id/gateway_location_button" - android:padding="@dimen/stdpadding" + app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_center" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" + android:paddingLeft="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" + android:paddingBottom="@dimen/stdpadding" app:layout_constraintDimensionRatio="1:1" - android:maxLines="5" - android:ellipsize="end" - tools:text="Your traffic is securly routed through" + tools:text="Your traffic is securly routed through \n another" + android:maxLines="2" android:gravity="center" + /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/state_view" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom" + app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_center" + app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_left" + app:layout_constraintRight_toRightOf="@id/guideline_vertical_right" + app:layout_constraintVertical_bias="1" + app:srcCompat="@drawable/red_mask" + /> + <se.leap.bitmaskclient.base.views.MainButton + android:id="@+id/main_button" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_margin="@dimen/stdpadding" + app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom" + app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_button_top" + app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right" + app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left" + app:layout_constraintDimensionRatio="1:1" /> + <se.leap.bitmaskclient.base.views.LocationButton android:id="@+id/gateway_location_button" android:layout_width="match_parent" - android:layout_height="64dp" - android:layout_marginBottom="@dimen/stdpadding" + android:layout_height="0dp" android:layout_marginEnd="@dimen/stdpadding" android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" + android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" - app:layout_constraintBottom_toBottomOf="@+id/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_button_top" + app:layout_constraintBottom_toBottomOf="@+id/guideline_horizontal_button_bottom" tools:text="SEATTLE" android:gravity="center_vertical" /> |