Merge branch 'rebrand'

httptoolkit · Aug 29, 2024 · 64d1121 · 64d1121
2 parents fc50328 + cc2fd19
commit 64d1121
Show file tree

Hide file tree

Showing 38 changed files with 115 additions and 162 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation 'com.beust:klaxon:5.5'
     implementation 'com.squareup.okhttp3:okhttp:4.3.0'
-    implementation 'com.google.android.material:material:1.1.0-beta02'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'net.swiftzer.semver:semver:1.1.1'
     implementation 'io.sentry:sentry-android:1.7.27'
     implementation 'org.slf4j:slf4j-nop:1.7.25'

diff --git a/app/src/main/ic_launcher-playstore-dark.png b/app/src/main/ic_launcher-playstore-dark.png
diff --git a/app/src/main/ic_launcher-playstore-light.png b/app/src/main/ic_launcher-playstore-light.png
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/tech/httptoolkit/android/ApplicationListActivity.kt b/app/src/main/java/tech/httptoolkit/android/ApplicationListActivity.kt
@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.widget.doAfterTextChanged
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import kotlinx.android.synthetic.main.apps_list.*
@@ -146,7 +147,7 @@ class ApplicationListActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefres
     override fun onClick(v: View?) {
         when (v?.id) {
             R.id.apps_list_more_menu -> {
-                PopupMenu(this, apps_list_more_menu).apply {
+                PopupMenu(ContextThemeWrapper(this, R.style.PopupMenu), apps_list_more_menu).apply {
                     this.inflate(R.menu.menu_app_list)
                     this.menu.findItem(R.id.action_show_system).isChecked = showSystem
                     this.menu.findItem(R.id.action_show_enabled).isChecked = showEnabledOnly

diff --git a/app/src/main/java/tech/httptoolkit/android/PortListActivity.kt b/app/src/main/java/tech/httptoolkit/android/PortListActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.widget.doAfterTextChanged
 import kotlinx.android.synthetic.main.ports_list.*
 import kotlinx.coroutines.*
@@ -55,7 +56,7 @@ class PortListActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
         // Show the menu, and listen for clicks:
         ports_list_more_menu.setOnClickListener {
-            PopupMenu(this, ports_list_more_menu).apply {
+            PopupMenu(ContextThemeWrapper(this, R.style.PopupMenu), ports_list_more_menu).apply {
                 this.inflate(R.menu.menu_ports_list)
 
                 this.menu.findItem(R.id.action_reset_ports).isEnabled =

diff --git a/app/src/main/res/drawable-night/ic_launcher_background.png b/app/src/main/res/drawable-night/ic_launcher_background.png
diff --git a/app/src/main/res/drawable/ic_launcher_background.png b/app/src/main/res/drawable/ic_launcher_background.png
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,31 +1,23 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="99.301"
-    android:viewportHeight="99.301">
-  <group android:scaleX="0.43"
-      android:scaleY="0.43"
-      android:translateX="28.300785"
-      android:translateY="28.300785">
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+  <group android:scaleX="0.44"
+      android:scaleY="0.44"
+      android:translateX="33.6"
+      android:translateY="33.6">
     <path
-        android:pathData="m32.491,4.478h11.662q0.623,0 1.076,0.47 0.453,0.47 0.453,1.117L45.681,44.047q0,0.647 -0.453,1.117 -0.453,0.47 -1.076,0.47L32.491,45.634q-0.623,0 -1.076,-0.47 -0.453,-0.47 -0.453,-1.117L30.962,31.524L19.64,31.524v12.523q0,0.647 -0.453,1.117 -0.453,0.47 -1.076,0.47L6.449,45.634q-0.623,0 -1.076,-0.412 -0.453,-0.47 -0.453,-1.176L4.92,6.065q0,-0.647 0.453,-1.117 0.453,-0.47 1.076,-0.47h11.662q0.623,0 1.076,0.47 0.453,0.47 0.453,1.117L19.64,18.118L30.962,18.118L30.962,6.065q0,-0.647 0.453,-1.117 0.453,-0.47 1.076,-0.47z"
-        android:strokeWidth="0.43270186"
-        android:fillColor="#e1421f"
-        android:strokeColor="#00000000"/>
+        android:pathData="M39,107.6L64,22.1l0,0c0.2,-0.8 1,-1.4 1.9,-1.4H75c0.9,0 1.5,0.8 1.3,1.7l-27.9,95.8c-0.3,1.1 -1.3,1.9 -2.5,1.9H23.6C10.6,120 0,109.4 0,96.4V23.6C0,10.6 10.6,0 23.6,0H81c0.9,0 1.5,0.8 1.3,1.7L79.6,11c-0.2,0.8 -1,1.4 -1.9,1.4H23.4c-6.1,0 -11,4.9 -11,11v73.2c0,6.1 4.9,11 11,11H39z"
+        android:fillColor="#E24120"/>
     <path
-        android:pathData="m53.141,4.478h39.687q0.633,0 1.093,0.47 0.46,0.47 0.46,1.117v9.466q0,0.647 -0.46,1.117 -0.46,0.47 -1.093,0.47h-12.366v26.928q0,0.647 -0.46,1.117 -0.46,0.47 -1.093,0.47L67.06,45.634q-0.633,0 -1.093,-0.47 -0.46,-0.47 -0.46,-1.117L65.507,17.119h-12.366q-0.633,0 -1.093,-0.47 -0.46,-0.47 -0.46,-1.117v-9.466q0,-0.647 0.46,-1.117 0.46,-0.47 1.093,-0.47z"
-        android:strokeWidth="0.4361468"
-        android:fillColor="#e1421f"
-        android:strokeColor="#00000000"/>
+        android:pathData="M96.4,0c13,0 23.6,10.6 23.6,23.6v72.8c0,13 -10.6,23.6 -23.6,23.6H57.8c-0.9,0 -1.5,-0.8 -1.3,-1.7l2.7,-9.3c0.2,-0.8 1,-1.4 1.9,-1.4h35.5c6.1,0 11,-4.9 11,-11V23.4c0,-5 -3.3,-9.2 -7.9,-10.6l-24.8,85c-0.2,0.8 -1,1.4 -1.9,1.4h-9.2c-0.9,0 -1.5,-0.8 -1.3,-1.7L90.5,1.9C90.8,0.8 91.8,0 93,0H96.4L96.4,0z"
+        android:fillColor="#E24120"/>
     <path
-        android:pathData="m55.771,53.667h21.173q8.039,0 12.738,4.057 4.699,4.057 4.699,10.407 0,6.35 -3.963,10.113 -3.963,3.704 -13.474,3.704h-7.473v11.289q0,0.647 -0.453,1.117 -0.453,0.47 -1.076,0.47h-12.172q-0.623,0 -1.076,-0.47 -0.453,-0.47 -0.453,-1.117v-37.982q0,-0.647 0.453,-1.117 0.453,-0.47 1.076,-0.47zM69.528,64.603v6.467h7.19q1.302,0 2.095,-0.823 0.849,-0.823 0.849,-2.293 0,-1.47 -0.793,-2.411 -0.793,-0.941 -2.151,-0.941z"
-        android:strokeWidth="0.43270186"
-        android:fillColor="#e1421f"
-        android:strokeColor="#00000000"/>
+        android:pathData="M34.2,37.2h2c2.9,0 5.2,2.3 5.2,5.2v2c0,2.9 -2.3,5.2 -5.2,5.2h-2c-2.9,0 -5.2,-2.3 -5.2,-5.2v-2C29,39.6 31.3,37.2 34.2,37.2z"
+        android:fillColor="#E24120"/>
     <path
-        android:pathData="M6.473,53.667L46.161,53.667q0.633,0 1.093,0.47 0.46,0.47 0.46,1.117v9.466q0,0.647 -0.46,1.117 -0.46,0.47 -1.093,0.47L33.794,66.308v26.928q0,0.647 -0.46,1.117 -0.46,0.47 -1.093,0.47L20.393,94.824q-0.633,0 -1.093,-0.47 -0.46,-0.47 -0.46,-1.117L18.84,66.308L6.473,66.308q-0.633,0 -1.093,-0.47 -0.46,-0.47 -0.46,-1.117v-9.466q0,-0.647 0.46,-1.117 0.46,-0.47 1.093,-0.47z"
-        android:strokeWidth="0.4361468"
-        android:fillColor="#e1421f"
-        android:strokeColor="#00000000"/>
+        android:pathData="M34.2,66.2h2c2.9,0 5.2,2.3 5.2,5.2v2c0,2.9 -2.3,5.2 -5.2,5.2h-2c-2.9,0 -5.2,-2.3 -5.2,-5.2v-2C29,68.5 31.3,66.2 34.2,66.2z"
+        android:fillColor="#E24120"/>
   </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_transparent_icon.xml b/app/src/main/res/drawable/ic_transparent_icon.xml
@@ -1,30 +1,18 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="99.301315dp"
-    android:height="99.301315dp"
-    android:viewportWidth="99.301315"
-    android:viewportHeight="99.301315">
+    android:width="120dp"
+    android:height="120dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
   <path
-      android:pathData="m32.4906,4.4778h11.6623q0.6227,0 1.0756,0.4704 0.4529,0.4704 0.4529,1.1171L45.6814,44.0468q0,0.6467 -0.4529,1.1171 -0.4529,0.4703 -1.0756,0.4703L32.4906,45.6343q-0.6227,0 -1.0756,-0.4703 -0.4529,-0.4704 -0.4529,-1.1171L30.9621,31.5235L19.6395,31.5235v12.5233q0,0.6467 -0.4529,1.1171 -0.4529,0.4703 -1.0757,0.4703L6.4487,45.6343q-0.6227,0 -1.0756,-0.4115 -0.4529,-0.4704 -0.4529,-1.1759L4.9202,6.0653q0,-0.6467 0.4529,-1.1171 0.4529,-0.4704 1.0756,-0.4704h11.6623q0.6227,0 1.0757,0.4704 0.4529,0.4704 0.4529,1.1171L19.6395,18.1183L30.9621,18.1183L30.9621,6.0653q0,-0.6467 0.4529,-1.1171 0.4529,-0.4704 1.0756,-0.4704z"
-      android:strokeWidth="0.43270186"
-      android:fillColor="#e1421f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:pathData="M39,107.6L64,22.1l0,0c0.2,-0.8 1,-1.4 1.9,-1.4H75c0.9,0 1.5,0.8 1.3,1.7l-27.9,95.8c-0.3,1.1 -1.3,1.9 -2.5,1.9H23.6C10.6,120 0,109.4 0,96.4V23.6C0,10.6 10.6,0 23.6,0H81c0.9,0 1.5,0.8 1.3,1.7L79.6,11c-0.2,0.8 -1,1.4 -1.9,1.4H23.4c-6.1,0 -11,4.9 -11,11v73.2c0,6.1 4.9,11 11,11H39z"
+      android:fillColor="#E24120"/>
   <path
-      android:pathData="m53.1408,4.4778h39.6874q0.6327,0 1.0928,0.4704 0.4601,0.4704 0.4601,1.1171v9.466q0,0.6467 -0.4601,1.1171 -0.4601,0.4704 -1.0928,0.4704h-12.3664v26.9281q0,0.6467 -0.4602,1.1171 -0.4601,0.4704 -1.0928,0.4704L67.0601,45.6343q-0.6327,0 -1.0928,-0.4704 -0.4601,-0.4704 -0.4601,-1.1171L65.5072,17.1187h-12.3664q-0.6327,0 -1.0928,-0.4704 -0.4602,-0.4703 -0.4602,-1.1171v-9.466q0,-0.6468 0.4602,-1.1171 0.4601,-0.4704 1.0928,-0.4704z"
-      android:strokeWidth="0.4361468"
-      android:fillColor="#e1421f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:pathData="M96.4,0c13,0 23.6,10.6 23.6,23.6v72.8c0,13 -10.6,23.6 -23.6,23.6H57.8c-0.9,0 -1.5,-0.8 -1.3,-1.7l2.7,-9.3c0.2,-0.8 1,-1.4 1.9,-1.4h35.5c6.1,0 11,-4.9 11,-11V23.4c0,-5 -3.3,-9.2 -7.9,-10.6l-24.8,85c-0.2,0.8 -1,1.4 -1.9,1.4h-9.2c-0.9,0 -1.5,-0.8 -1.3,-1.7L90.5,1.9C90.8,0.8 91.8,0 93,0H96.4L96.4,0z"
+      android:fillColor="#E24120"/>
   <path
-      android:pathData="m55.7712,53.667h21.1732q8.039,0 12.7379,4.0569 4.6989,4.0568 4.6989,10.4067 0,6.3498 -3.9629,10.1127 -3.9629,3.7041 -13.4739,3.7041h-7.4729v11.2886q0,0.6467 -0.4529,1.1171 -0.4529,0.4704 -1.0756,0.4704h-12.1718q-0.6227,0 -1.0756,-0.4704 -0.4529,-0.4704 -0.4529,-1.1171v-37.9815q0,-0.6467 0.4529,-1.1171 0.4529,-0.4704 1.0756,-0.4704zM69.5281,64.6029v6.4674h7.1898q1.3021,0 2.0947,-0.8231 0.8492,-0.8231 0.8492,-2.293 0,-1.4699 -0.7926,-2.4106 -0.7926,-0.9407 -2.1513,-0.9407z"
-      android:strokeWidth="0.43270186"
-      android:fillColor="#e1421f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:pathData="M34.2,37.2h2c2.9,0 5.2,2.3 5.2,5.2v2c0,2.9 -2.3,5.2 -5.2,5.2h-2c-2.9,0 -5.2,-2.3 -5.2,-5.2v-2C29,39.6 31.3,37.2 34.2,37.2z"
+      android:fillColor="#E24120"/>
   <path
-      android:pathData="M6.4732,53.6671L46.1605,53.6671q0.6327,0 1.0928,0.4704 0.4601,0.4703 0.4601,1.1171v9.466q0,0.6467 -0.4601,1.1171 -0.4601,0.4704 -1.0928,0.4704L33.7942,66.308v26.928q0,0.6468 -0.4602,1.1171 -0.4601,0.4704 -1.0928,0.4704L20.3925,94.8235q-0.6327,0 -1.0928,-0.4704 -0.4601,-0.4703 -0.4601,-1.1171L18.8395,66.308L6.4732,66.308q-0.6327,0 -1.0928,-0.4704 -0.4601,-0.4703 -0.4601,-1.1171v-9.466q0,-0.6468 0.4601,-1.1171 0.4601,-0.4704 1.0928,-0.4704z"
-      android:strokeWidth="0.4361468"
-      android:fillColor="#e1421f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:pathData="M34.2,66.2h2c2.9,0 5.2,2.3 5.2,5.2v2c0,2.9 -2.3,5.2 -5.2,5.2h-2c-2.9,0 -5.2,-2.3 -5.2,-5.2v-2C29,68.5 31.3,66.2 34.2,66.2z"
+      android:fillColor="#E24120"/>
 </vector>
diff --git a/app/src/main/res/font/dmsans.ttf b/app/src/main/res/font/dmsans.ttf
diff --git a/app/src/main/res/font/dmsans_bold.ttf b/app/src/main/res/font/dmsans_bold.ttf
diff --git a/app/src/main/res/font/lato.ttf b/app/src/main/res/font/lato.ttf
diff --git a/app/src/main/res/font/lato_bold.ttf b/app/src/main/res/font/lato_bold.ttf
diff --git a/app/src/main/res/layout/app_interception_status.xml b/app/src/main/res/layout/app_interception_status.xml
@@ -26,7 +26,7 @@
                     style="@style/ConnectionStatusButtonText"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_apps_24"
+                    app:drawableStartCompat="@drawable/ic_apps_24"
                     android:text="@string/all_apps" />
 
         </com.google.android.material.card.MaterialCardView>
@@ -47,7 +47,7 @@
                     style="@style/ConnectionStatusButtonText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/ic_network_ports_24"
+                    app:drawableStartCompat="@drawable/ic_network_ports_24"
                     android:text="@string/default_ports" />
 
         </com.google.android.material.card.MaterialCardView>

diff --git a/app/src/main/res/layout/apps_list.xml b/app/src/main/res/layout/apps_list.xml
@@ -11,7 +11,8 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
-            app:cardBackgroundColor="#FFFFFF"
+
+            app:cardBackgroundColor="@color/textInputBackground"
             app:cardCornerRadius="2dp"
             app:cardElevation="4dp"
             app:cardUseCompatPadding="true">
@@ -26,6 +27,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
+                    android:textColor="@color/textInputColor"
+                    android:textColorHint="@color/textInputPlaceholderColor"
                     android:hint="@string/all_applications"
                     android:padding="16dp"
                     android:textSize="18sp"
@@ -37,6 +40,7 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/apps_list_more_menu"
                     android:padding="16dp"
+                    app:tint="@color/textInputColor"
                     app:srcCompat="@drawable/ic_baseline_more_vert_24"
                     tools:ignore="ContentDescription" />
         </LinearLayout>

diff --git a/app/src/main/res/layout/connection_status_user.xml b/app/src/main/res/layout/connection_status_user.xml
@@ -42,7 +42,6 @@
                     style="@style/ConnectionStatusText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColorLink="@color/primaryInputBackground"
                     android:text="@string/user_connection_status_details" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>

diff --git a/app/src/main/res/layout/item_app_row.xml b/app/src/main/res/layout/item_app_row.xml
@@ -24,6 +24,7 @@
             android:layout_toEndOf="@id/row_app_icon_image"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="@color/textColor"
             tools:text="@tools:sample/full_names" />
 
     <TextView
@@ -37,6 +38,7 @@
             android:maxLines="2"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="@color/textColor"
             tools:text="@tools:sample/lorem/random" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial

diff --git a/app/src/main/res/layout/item_port_row.xml b/app/src/main/res/layout/item_port_row.xml
@@ -14,6 +14,7 @@
             android:layout_toStartOf="@id/row_port_delete"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="@color/textColor"
             tools:text="@tools:sample/us_phones" />
 
     <TextView
@@ -26,6 +27,7 @@
             android:maxLines="2"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="@color/textColor"
             tools:text="@tools:sample/lorem/random" />
 
     <ImageView
@@ -36,6 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
+            android:tint="@color/textColor"
             android:minWidth="0dp"
             android:minHeight="0dp" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/main_layout.xml b/app/src/main/res/layout/main_layout.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:alpha="0.3"
-            android:tint="#fff"
+            app:tint="@color/mainBackground"
             android:layout_marginBottom="120dp"
             app:srcCompat="@drawable/ic_transparent_icon"
             tools:ignore="ContentDescription" />