Skip to content

Commit

Permalink
fix screenshot 1 in #838
Browse files Browse the repository at this point in the history
  • Loading branch information
@bitmold
bitmold committed Mar 29, 2023
1 parent 70c7380 commit c1406a8
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 103 deletions.
3 changes: 1 addition & 2 deletions app/src/main/res/layout/activity_orbot.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:menu="@menu/main_bottom_nav"
app:itemTextColor="@color/bottom_nav_color"
app:itemIconTint="@color/bottom_nav_color"
/>
app:itemIconTint="@color/bottom_nav_color" />

</androidx.constraintlayout.widget.ConstraintLayout>
202 changes: 101 additions & 101 deletions app/src/main/res/layout/fragment_connect.xml
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>

<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:backgroundTint="@color/new_background"
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"
>
xmlns:tools="http://schemas.android.com/tools">


<ProgressBar
tools:visibility="visible"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/progressBar"
style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
tools:progress="33"
android:progressTint="@color/progress_bar_purple"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="match_parent"
android:backgroundTint="@color/new_background">
<ProgressBar
tools:visibility="visible"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/progressBar"
style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
tools:progress="33"
android:progressTint="@color/progress_bar_purple"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<ImageView
android:id="@+id/ivStatus"
android:layout_width="148dp"
android:layout_height="166dp"
android:layout_marginTop="100dp"
android:src="@drawable/orbioff"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/progressBar" />
<ImageView
android:id="@+id/ivStatus"
android:layout_width="148dp"
android:layout_height="166dp"
android:layout_marginTop="100dp"
android:src="@drawable/orbioff"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/progressBar" />

<ImageView
android:id="@+id/ivShadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:src="@drawable/orbieshadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivStatus" />
<ImageView
android:id="@+id/ivShadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:src="@drawable/orbieshadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivStatus" />

<TextView
android:layout_marginTop="16dp"
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ready to Connect"
android:textColor="@android:color/white"
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
android:fontFamily="sans-serif-black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivShadow" />
<TextView
android:layout_marginTop="16dp"
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ready to Connect"
android:textColor="@android:color/white"
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
android:fontFamily="sans-serif-black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivShadow" />

<TextView
android:textAlignment="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvSubtitle"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:text="@string/hide_apps"
android:textColor="@android:color/white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvTitle"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/activity_horizontal_large_margin"
android:paddingRight="@dimen/activity_horizontal_large_margin" />
<TextView
android:textAlignment="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvSubtitle"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:text="@string/hide_apps"
android:textColor="@android:color/white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvTitle"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/activity_horizontal_large_margin"
android:paddingRight="@dimen/activity_horizontal_large_margin" />

<Button
tools:enabled="false"
android:background="@drawable/btn_shape_round"
android:backgroundTint="@color/orbot_btn_enabled_purple"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSubtitle"
android:text="@string/btn_start_vpn"
android:id="@+id/btnStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/button_horizontal_large_margin"
android:paddingRight="@dimen/button_horizontal_large_margin"
android:paddingTop="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_horizontal_margin"
/>
<Button
tools:enabled="false"
android:background="@drawable/btn_shape_round"
android:backgroundTint="@color/orbot_btn_enabled_purple"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSubtitle"
android:text="@string/btn_start_vpn"
android:id="@+id/btnStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/button_horizontal_large_margin"
android:paddingRight="@dimen/button_horizontal_large_margin"
android:paddingTop="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_horizontal_margin" />

<TextView
android:id="@+id/tvConfigure"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_configure"
android:layout_marginTop="24dp"
android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
<TextView
android:id="@+id/tvConfigure"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_configure"
android:layout_marginTop="24dp"
android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />

/>
<ListView
android:drawSelectorOnTop="true"
android:layout_marginTop="10dp"
tools:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tvConfigure"
android:visibility="invisible"
android:dividerHeight="1dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/lvConnected"/>

<ListView
android:drawSelectorOnTop="true"
android:layout_marginTop="10dp"
tools:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tvConfigure"
android:visibility="invisible"
android:dividerHeight="1dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/lvConnected"/>
</androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

0 comments on commit c1406a8

Please sign in to comment.