Skip to content

Commit 64d1121

Browse files
pimterrypimterry
committed
Merge branch 'rebrand'
2 parents fc50328 + cc2fd19 commit 64d1121

38 files changed

+115
-162
lines changed

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
4848
implementation 'com.beust:klaxon:5.5'
4949
implementation 'com.squareup.okhttp3:okhttp:4.3.0'
50-
implementation 'com.google.android.material:material:1.1.0-beta02'
50+
implementation 'com.google.android.material:material:1.4.0'
5151
implementation 'net.swiftzer.semver:semver:1.1.1'
5252
implementation 'io.sentry:sentry-android:1.7.27'
5353
implementation 'org.slf4j:slf4j-nop:1.7.25'

‎app/src/main/ic_launcher-playstore-dark.png

41.1 KB
Loading

‎app/src/main/ic_launcher-playstore-light.png

52.4 KB
Loading

‎app/src/main/ic_launcher-playstore.png

-9.02 KB
Binary file not shown.

‎app/src/main/java/tech/httptoolkit/android/ApplicationListActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.view.MenuItem
99
import android.view.View
1010
import android.widget.PopupMenu
1111
import androidx.appcompat.app.AppCompatActivity
12+
import androidx.appcompat.view.ContextThemeWrapper
1213
import androidx.core.widget.doAfterTextChanged
1314
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
1415
import kotlinx.android.synthetic.main.apps_list.*
@@ -146,7 +147,7 @@ class ApplicationListActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefres
146147
override fun onClick(v: View?) {
147148
when (v?.id) {
148149
R.id.apps_list_more_menu -> {
149-
PopupMenu(this, apps_list_more_menu).apply {
150+
PopupMenu(ContextThemeWrapper(this, R.style.PopupMenu), apps_list_more_menu).apply {
150151
this.inflate(R.menu.menu_app_list)
151152
this.menu.findItem(R.id.action_show_system).isChecked = showSystem
152153
this.menu.findItem(R.id.action_show_enabled).isChecked = showEnabledOnly

‎app/src/main/java/tech/httptoolkit/android/PortListActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Intent
44
import android.os.Bundle
55
import android.widget.PopupMenu
66
import androidx.appcompat.app.AppCompatActivity
7+
import androidx.appcompat.view.ContextThemeWrapper
78
import androidx.core.widget.doAfterTextChanged
89
import kotlinx.android.synthetic.main.ports_list.*
910
import kotlinx.coroutines.*
@@ -55,7 +56,7 @@ class PortListActivity : AppCompatActivity(), CoroutineScope by MainScope() {
5556

5657
// Show the menu, and listen for clicks:
5758
ports_list_more_menu.setOnClickListener {
58-
PopupMenu(this, ports_list_more_menu).apply {
59+
PopupMenu(ContextThemeWrapper(this, R.style.PopupMenu), ports_list_more_menu).apply {
5960
this.inflate(R.menu.menu_ports_list)
6061

6162
this.menu.findItem(R.id.action_reset_ports).isEnabled =

‎app/src/main/res/drawable-night/ic_launcher_background.png

28.5 KB
Loading

‎app/src/main/res/drawable/ic_launcher_background.png

114 KB
Loading

‎app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎app/src/main/res/drawable/ic_launcher_foreground.xml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
android:width="108dp"
33
android:height="108dp"
4-
android:viewportWidth="99.301"
5-
android:viewportHeight="99.301">
6-
<group android:scaleX="0.43"
7-
android:scaleY="0.43"
8-
android:translateX="28.300785"
9-
android:translateY="28.300785">
4+
android:viewportWidth="120"
5+
android:viewportHeight="120">
6+
<group android:scaleX="0.44"
7+
android:scaleY="0.44"
8+
android:translateX="33.6"
9+
android:translateY="33.6">
1010
<path
11-
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"
12-
android:strokeWidth="0.43270186"
13-
android:fillColor="#e1421f"
14-
android:strokeColor="#00000000"/>
11+
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"
12+
android:fillColor="#E24120"/>
1513
<path
16-
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"
17-
android:strokeWidth="0.4361468"
18-
android:fillColor="#e1421f"
19-
android:strokeColor="#00000000"/>
14+
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"
15+
android:fillColor="#E24120"/>
2016
<path
21-
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"
22-
android:strokeWidth="0.43270186"
23-
android:fillColor="#e1421f"
24-
android:strokeColor="#00000000"/>
17+
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"
18+
android:fillColor="#E24120"/>
2519
<path
26-
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"
27-
android:strokeWidth="0.4361468"
28-
android:fillColor="#e1421f"
29-
android:strokeColor="#00000000"/>
20+
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"
21+
android:fillColor="#E24120"/>
3022
</group>
3123
</vector>

‎app/src/main/res/drawable/ic_transparent_icon.xml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="99.301315dp"
3-
android:height="99.301315dp"
4-
android:viewportWidth="99.301315"
5-
android:viewportHeight="99.301315">
2+
android:width="120dp"
3+
android:height="120dp"
4+
android:viewportWidth="120"
5+
android:viewportHeight="120">
66
<path
7-
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"
8-
android:strokeWidth="0.43270186"
9-
android:fillColor="#e1421f"
10-
android:strokeColor="#00000000"
11-
android:fillAlpha="1"/>
7+
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"
8+
android:fillColor="#E24120"/>
129
<path
13-
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"
14-
android:strokeWidth="0.4361468"
15-
android:fillColor="#e1421f"
16-
android:strokeColor="#00000000"
17-
android:fillAlpha="1"/>
10+
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"
11+
android:fillColor="#E24120"/>
1812
<path
19-
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"
20-
android:strokeWidth="0.43270186"
21-
android:fillColor="#e1421f"
22-
android:strokeColor="#00000000"
23-
android:fillAlpha="1"/>
13+
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"
14+
android:fillColor="#E24120"/>
2415
<path
25-
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"
26-
android:strokeWidth="0.4361468"
27-
android:fillColor="#e1421f"
28-
android:strokeColor="#00000000"
29-
android:fillAlpha="1"/>
16+
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"
17+
android:fillColor="#E24120"/>
3018
</vector>

‎app/src/main/res/font/dmsans.ttf

55 KB
Binary file not shown.

‎app/src/main/res/font/dmsans_bold.ttf

54.9 KB
Binary file not shown.

‎app/src/main/res/font/lato.ttf

-117 KB
Binary file not shown.

‎app/src/main/res/font/lato_bold.ttf

-119 KB
Binary file not shown.

‎app/src/main/res/layout/app_interception_status.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
style="@style/ConnectionStatusButtonText"
2727
android:layout_width="wrap_content"
2828
android:layout_height="match_parent"
29-
android:drawableStart="@drawable/ic_apps_24"
29+
app:drawableStartCompat="@drawable/ic_apps_24"
3030
android:text="@string/all_apps" />
3131

3232
</com.google.android.material.card.MaterialCardView>
@@ -47,7 +47,7 @@
4747
style="@style/ConnectionStatusButtonText"
4848
android:layout_width="wrap_content"
4949
android:layout_height="wrap_content"
50-
android:drawableStart="@drawable/ic_network_ports_24"
50+
app:drawableStartCompat="@drawable/ic_network_ports_24"
5151
android:text="@string/default_ports" />
5252

5353
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/apps_list.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
android:layout_height="wrap_content"
1212
android:layout_marginLeft="16dp"
1313
android:layout_marginRight="16dp"
14-
app:cardBackgroundColor="#FFFFFF"
14+
15+
app:cardBackgroundColor="@color/textInputBackground"
1516
app:cardCornerRadius="2dp"
1617
app:cardElevation="4dp"
1718
app:cardUseCompatPadding="true">
@@ -26,6 +27,8 @@
2627
android:layout_height="match_parent"
2728
android:layout_weight="1"
2829
android:background="@android:color/transparent"
30+
android:textColor="@color/textInputColor"
31+
android:textColorHint="@color/textInputPlaceholderColor"
2932
android:hint="@string/all_applications"
3033
android:padding="16dp"
3134
android:textSize="18sp"
@@ -37,6 +40,7 @@
3740
android:layout_height="wrap_content"
3841
android:id="@+id/apps_list_more_menu"
3942
android:padding="16dp"
43+
app:tint="@color/textInputColor"
4044
app:srcCompat="@drawable/ic_baseline_more_vert_24"
4145
tools:ignore="ContentDescription" />
4246
</LinearLayout>

‎app/src/main/res/layout/connection_status_user.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
style="@style/ConnectionStatusText"
4343
android:layout_width="wrap_content"
4444
android:layout_height="wrap_content"
45-
android:textColorLink="@color/primaryInputBackground"
4645
android:text="@string/user_connection_status_details" />
4746
</LinearLayout>
4847
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/item_app_row.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
android:layout_toEndOf="@id/row_app_icon_image"
2525
android:paddingStart="16dp"
2626
android:paddingEnd="16dp"
27+
android:textColor="@color/textColor"
2728
tools:text="@tools:sample/full_names" />
2829

2930
<TextView
@@ -37,6 +38,7 @@
3738
android:maxLines="2"
3839
android:paddingStart="16dp"
3940
android:paddingEnd="16dp"
41+
android:textColor="@color/textColor"
4042
tools:text="@tools:sample/lorem/random" />
4143

4244
<com.google.android.material.switchmaterial.SwitchMaterial

‎app/src/main/res/layout/item_port_row.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
android:layout_toStartOf="@id/row_port_delete"
1515
android:paddingStart="16dp"
1616
android:paddingEnd="16dp"
17+
android:textColor="@color/textColor"
1718
tools:text="@tools:sample/us_phones" />
1819

1920
<TextView
@@ -26,6 +27,7 @@
2627
android:maxLines="2"
2728
android:paddingStart="16dp"
2829
android:paddingEnd="16dp"
30+
android:textColor="@color/textColor"
2931
tools:text="@tools:sample/lorem/random" />
3032

3133
<ImageView
@@ -36,6 +38,7 @@
3638
android:layout_height="wrap_content"
3739
android:layout_alignParentEnd="true"
3840
android:layout_centerVertical="true"
41+
android:tint="@color/textColor"
3942
android:minWidth="0dp"
4043
android:minHeight="0dp" />
4144
</RelativeLayout>

‎app/src/main/res/layout/main_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_width="match_parent"
1919
android:layout_height="match_parent"
2020
android:alpha="0.3"
21-
android:tint="#fff"
21+
app:tint="@color/mainBackground"
2222
android:layout_marginBottom="120dp"
2323
app:srcCompat="@drawable/ic_transparent_icon"
2424
tools:ignore="ContentDescription" />

0 commit comments

Comments
 (0)