Minor UI fixes and adjustments

app/src/main/res/drawable/ic_choose_apps.xml

@@ -17,10 +17,4 @@
       android:fillColor="#ffffff"
       android:strokeColor="#ffffff"
       android:fillAlpha="0.8"/>
-  <path
-      android:pathData="M20,0L20,0A4,4 0,0 1,24 4L24,4A4,4 0,0 1,20 8L20,8A4,4 0,0 1,16 4L16,4A4,4 0,0 1,20 0z"
-      android:fillColor="#A06DDF"/>
-  <path
-      android:pathData="M20,0L20,0A4,4 0,0 1,24 4L24,4A4,4 0,0 1,20 8L20,8A4,4 0,0 1,16 4L16,4A4,4 0,0 1,20 0z"
-      android:fillColor="#9DCD2B"/>
 </vector>

app/src/main/res/layout/action_list_view.xml

@@ -65,7 +65,7 @@
         <LinearLayout
             android:orientation="horizontal"
             android:id="@+id/llBoxShortcutsInner"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
                     >
             <TextView

app/src/main/res/layout/config_connection_bottom_sheet.xml

@@ -2,7 +2,6 @@
 
 <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"
     android:background="#272030"
@@ -14,7 +13,9 @@
         style="@style/BottomSheetHeader"
         android:text="@string/btn_configure"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="64dp"/>
 
     <TextView
         android:id="@+id/tvConfigSubHeader"

app/src/main/res/layout/custom_bridge_bottom_sheet.xml

@@ -14,7 +14,9 @@
         android:text="@string/custom_bridge"
         style="@style/BottomSheetHeader"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="118dp" />
 
     <TextView
         android:textColor="@android:color/white"
@@ -39,7 +41,6 @@
         app:layout_constraintStart_toStartOf="parent"/>
 
 
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/mainGuideline"
         android:layout_width="wrap_content"
@@ -51,21 +52,19 @@
         android:id="@+id/tvCancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="144dp"
         android:text="@android:string/cancel"
         android:textColor="@android:color/white"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@id/btnAction"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainGuideline" />
 
-
     <Button
         android:id="@+id/btnAction"
         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:layout_marginTop="128dp"
         android:backgroundTint="@color/orbot_btn_enabled_purple"
         android:text="@string/connect"
         android:enabled="false"
@@ -75,5 +74,4 @@
         app:layout_constraintTop_toBottomOf="@id/mainGuideline"
         app:layout_goneMarginBottom="20dp" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_connect.xml

@@ -21,22 +21,27 @@
 
     <ImageView
         android:id="@+id/ivStatus"
+        android:contentDescription="Orbie"
         android:layout_width="148dp"
         android:layout_height="166dp"
         android:layout_marginTop="20dp"
         android:src="@drawable/orbioff"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="HardcodedText" />
+
     <ImageView
         android:id="@+id/ivShadow"
+        android:contentDescription="Shadow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="15dp"
         android:src="@drawable/orbieshadow"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ivStatus" />
+        app:layout_constraintTop_toBottomOf="@id/ivStatus"
+        tools:ignore="HardcodedText,ImageContrastCheck" />
 
     <TextView
         android:layout_marginTop="16dp"
@@ -64,7 +69,9 @@
         app:layout_constraintTop_toBottomOf="@+id/tvTitle"
         android:gravity="center_horizontal"
         android:paddingLeft="@dimen/activity_horizontal_large_margin"
-        android:paddingRight="@dimen/activity_horizontal_large_margin" />
+        android:paddingRight="@dimen/activity_horizontal_large_margin"
+        android:layout_marginTop="8dp"
+        app:layout_constraintHorizontal_bias="0.0" />
 
     <Button
         tools:enabled="false"
@@ -78,8 +85,7 @@
         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:layout_marginTop="32dp"
         android:paddingLeft="@dimen/button_horizontal_large_margin"
         android:paddingRight="@dimen/button_horizontal_large_margin"
         android:paddingTop="@dimen/activity_horizontal_margin"

app/src/main/res/layout/kindess_config_bottom_sheet.xml

@@ -14,7 +14,9 @@
         android:text="@string/kindness_adjust_title"
         style="@style/BottomSheetHeader"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="106dp" />
 
     <TextView
         android:textColor="@android:color/white"
@@ -41,7 +43,7 @@
             android:layout_width="220dp"
             android:layout_height="wrap_content"
             android:text="@string/option_only_on_wifi"
-            android:textSize="24dp"
+            android:textSize="24sp"
             android:paddingTop="@dimen/activity_horizontal_margin"
             android:textColor="@android:color/white"
 
@@ -52,10 +54,9 @@
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:showText="false"
-            android:textSize="24dp"
+            android:textSize="24sp"
             android:padding="@dimen/activity_horizontal_margin"
             android:textColor="@android:color/white"
-
             />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -69,13 +70,13 @@
         app:layout_constraintTop_toBottomOf="@+id/rowKindnessConfigWifi"
         android:padding="@dimen/activity_horizontal_margin"
         android:background="@color/panel_widget_background"
-        android:layout_margin="10dp"
-        >
+        android:layout_margin="10dp">
+
         <TextView
             android:layout_width="220dp"
             android:layout_height="wrap_content"
             android:text="@string/option_only_when_charging"
-            android:textSize="24dp"
+            android:textSize="24sp"
             android:paddingTop="@dimen/activity_horizontal_margin"
             android:textColor="@android:color/white"
 
@@ -86,7 +87,7 @@
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:showText="false"
-            android:textSize="24dp"
+            android:textSize="24sp"
             android:padding="@dimen/activity_horizontal_margin"
             android:textColor="@android:color/white"
 
@@ -99,27 +100,26 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent=".65"/>
+        app:layout_constraintGuide_percent="0.63" />
+
 
     <TextView
         android:id="@+id/tvCancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="148dp"
         android:text="@android:string/cancel"
         android:textColor="@android:color/white"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@id/btnAction"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainGuideline" />
 
-
     <Button
         android:id="@+id/btnAction"
         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:layout_marginTop="132dp"
         android:backgroundTint="@color/orbot_btn_enabled_purple"
         android:text="@string/save"
         android:textColor="@android:color/white"

app/src/main/res/layout/layout_apps.xml

@@ -17,7 +17,7 @@
         android:visibility="gone" />
 
     <GridView
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:id="@+id/applistview"

app/src/main/res/layout/layout_apps_item.xml

@@ -9,7 +9,7 @@
     <TextView
         android:visibility="visible"
         android:id="@+id/tvHeader"
-        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
         tools:text="@string/apps_suggested_title"
         android:textColor="@color/text_purple"
         android:layout_width="wrap_content"
@@ -24,8 +24,8 @@
         android:id="@+id/tvSubheader"
         tools:text="@string/app_suggested_subtitle"
         android:textColor="@android:color/white"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="4dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -41,10 +41,10 @@
             android:layout_height="match_parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginRight="@dimen/activity_horizontal_margin" />
+            android:layout_marginEnd="@dimen/activity_horizontal_margin" />
 
         <ImageView
-            android:layout_marginLeft="4dp"
+            android:layout_marginStart="4dp"
             android:id="@+id/itemicon"
             android:layout_width="48dp"
             android:layout_height="match_parent"
@@ -68,10 +68,10 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@id/itemicon"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginRight="2dp"
+            android:layout_marginEnd="2dp"
             tools:text="App Name Here that is really long"
             android:gravity="center_vertical"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin" />
+            android:layout_marginStart="@dimen/activity_horizontal_margin" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/layout_hs_list_item.xml

@@ -12,7 +12,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="10dp"
-        android:paddingRight="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         android:orientation="vertical">
 
         <TextView
@@ -42,7 +43,8 @@
             android:id="@+id/hs_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
             android:paddingBottom="10dp"
             android:textSize="24sp"
             tools:text="My Service" />
@@ -51,7 +53,8 @@
             android:id="@+id/hs_onion"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
             android:paddingBottom="10dp"
             android:textSize="18sp"
             tools:text="abcdefg.onion" />

app/src/main/res/layout/log_bottom_sheet.xml

@@ -4,9 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/new_background"
-    android:padding="10dp"
-    >
-
+    android:padding="10dp">
 
         <TextView
             android:id="@+id/orbotLogHeader"
@@ -36,8 +34,8 @@
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/orbotLogHeader"
-            android:paddingBottom="@dimen/button_horizontal_large_margin"
-            >
+            android:paddingBottom="@dimen/button_horizontal_large_margin">
+
         <TextView
             android:id="@+id/orbotLog"
             android:layout_width="match_parent"
@@ -48,11 +46,8 @@
             android:textIsSelectable="true"
             android:textSize="12sp"
             android:text=""
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
+            android:textAppearance="?android:attr/textAppearanceSmallInverse"/>
 
-            />
         </ScrollView>
 
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -269,7 +269,7 @@
     <string name="asking">ASKING...</string>
     <string name="no_interent_title">Connect to internet</string>
     <string name="no_internet_subtitle">You need an internet connection to use Orbot.</string>
-    <string name="kindness_adjust_title">Adjust when it runs…</string>
+    <string name="kindness_adjust_title">Adjust Run Time</string>
     <string name="kindess_config_detail">Configure how and when your device can act as a Snowflake proxy for other Tor users.</string>
     <string name="menu_kindness">Kindness</string>
     <string name="menu_more">More</string>