Skip to content

Commit 3a9b171

Browse files
authored
Merge pull request #85 from usetrmnl/more-image
More image
2 parents eefd037 + 6464d0d commit 3a9b171

File tree

7 files changed

+72
-8
lines changed

7 files changed

+72
-8
lines changed

app/src/main/java/ink/trmnl/android/network/TrmnlApiService.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import ink.trmnl.android.network.model.TrmnlCurrentImageResponse
77
import ink.trmnl.android.network.model.TrmnlDisplayResponse
88
import retrofit2.http.GET
99
import retrofit2.http.Header
10+
import retrofit2.http.Headers
1011
import retrofit2.http.Url
1112

1213
/**
@@ -49,13 +50,6 @@ interface TrmnlApiService {
4950
* @see setupNewDevice
5051
*/
5152
internal const val SETUP_API_PATH = "api/setup/"
52-
53-
/**
54-
* Default content type for API requests.
55-
*
56-
* This is used when setting up a new device or making other API calls that require a content type header.
57-
*/
58-
private const val DEFAULT_CONTENT_TYPE = "application/json"
5953
}
6054

6155
/**
@@ -101,10 +95,10 @@ interface TrmnlApiService {
10195
* @param deviceMacId The device's MAC address, sent in the "ID" header.
10296
* @return An [ApiResult] containing [TrmnlSetupResponse] on success.
10397
*/
98+
@Headers("Content-Type: application/json")
10499
@GET
105100
suspend fun setupNewDevice(
106101
@Url fullApiUrl: String,
107102
@Header("ID") deviceMacId: String,
108-
@Header("Content-Type") contentType: String = DEFAULT_CONTENT_TYPE,
109103
): ApiResult<TrmnlSetupResponse, Unit>
110104
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="200dp"
3+
android:height="120dp"
4+
android:viewportWidth="200"
5+
android:viewportHeight="120">
6+
<path
7+
android:pathData="M160.99,22.5L160.99,98.25C160.99,99.46 160.01,100.43 158.82,100.43L41.5,100.43C40.3,100.43 39.33,99.46 39.33,98.25L39.33,22.5C39.33,21.3 40.3,20.33 41.5,20.33L158.82,20.33C160.01,20.33 160.99,21.3 160.99,22.5Z"
8+
android:strokeWidth="0.65"
9+
android:fillColor="#ffffff"
10+
android:strokeColor="#000000"/>
11+
<path
12+
android:pathData="M158.16,25.05L158.16,90.09C158.16,91.05 157.38,91.84 156.41,91.84L43.9,91.84C42.93,91.84 42.15,91.05 42.15,90.09L42.15,25.05C42.15,24.08 42.93,23.3 43.9,23.3L156.41,23.3C157.38,23.3 158.16,24.08 158.16,25.05Z"
13+
android:strokeWidth="0.5"
14+
android:fillColor="#00000000"
15+
android:strokeColor="#000000"/>
16+
<path
17+
android:pathData="M157.47,25.24L157.47,89.89C157.47,90.58 156.91,91.14 156.22,91.14L44.09,91.14C43.4,91.14 42.84,90.58 42.84,89.89L42.84,25.24C42.84,24.55 43.4,23.99 44.09,23.99L156.22,23.99C156.91,23.99 157.47,24.55 157.47,25.24Z"
18+
android:strokeWidth="0.25"
19+
android:fillColor="#00000000"
20+
android:strokeColor="#000000"/>
21+
<path
22+
android:fillColor="#FF000000"
23+
android:pathData="M108.32,97.21L110.23,97.21L110.23,96.86L108.71,96.86L108.71,94.84L108.32,94.84L108.32,97.21Z"
24+
android:strokeWidth="0.07"
25+
android:strokeColor="#000000"
26+
android:fillType="nonZero"/>
27+
<path
28+
android:fillColor="#FF000000"
29+
android:pathData="M107.35,97.21L107.72,97.21L107.72,94.84L107.34,94.84L107.34,94.88L107.35,96.68L105.63,94.86L105.61,94.84L105.23,94.84L105.23,97.21L105.61,97.21L105.61,97.17L105.61,95.36L107.34,97.19L107.35,97.21Z"
30+
android:strokeWidth="0.07"
31+
android:strokeColor="#000000"
32+
android:fillType="nonZero"/>
33+
<path
34+
android:fillColor="#FF000000"
35+
android:pathData="M104.11,97.21L104.49,97.21L104.49,94.84L103.99,94.84L103.98,94.86L103.08,96.74L102.18,94.86L102.17,94.84L101.66,94.84L101.66,97.21L102.04,97.21L102.04,97.17L102.02,95.36L102.89,97.19L102.9,97.21L103.25,97.21L103.26,97.19L104.13,95.36L104.11,97.17L104.11,97.21Z"
36+
android:strokeWidth="0.07"
37+
android:strokeColor="#000000"
38+
android:fillType="nonZero"/>
39+
<path
40+
android:fillColor="#FF000000"
41+
android:pathData="M100.37,94.92L100.38,94.88C100.28,94.85 100.2,94.84 100.01,94.84L98.41,94.84L98.41,97.21L98.81,97.21L98.81,96.29L99.86,96.29L100.63,97.19L100.64,97.21L101.16,97.21L101.11,97.15L100.3,96.22C100.39,96.21 100.45,96.19 100.5,96.17L100.5,96.17C100.86,96.02 100.89,95.68 100.89,95.55C100.89,95.22 100.7,94.97 100.38,94.88L100.37,94.92ZM100.37,94.92C100.68,95 100.86,95.24 100.86,95.55C100.86,95.67 100.83,96 100.48,96.14L98.48,94.88L100.01,94.88C100.2,94.88 100.27,94.89 100.37,94.92ZM100.43,95.36L100.43,95.36C100.48,95.44 100.48,95.52 100.48,95.56C100.48,95.69 100.43,95.76 100.41,95.79L100.4,95.79C100.35,95.86 100.27,95.9 100.18,95.93C100.09,95.95 100,95.95 99.9,95.95L98.81,95.95L98.81,95.19L100.03,95.19C100.12,95.19 100.2,95.19 100.26,95.21C100.33,95.24 100.38,95.28 100.43,95.36Z"
42+
android:strokeWidth="0.07"
43+
android:strokeColor="#000000"
44+
android:fillType="nonZero"/>
45+
<path
46+
android:fillColor="#FF000000"
47+
android:pathData="M96.72,95.18L97.83,95.18L97.83,94.84L95.16,94.84L95.16,95.18L96.27,95.18L96.27,97.19L96.72,97.19L96.72,95.18Z"
48+
android:strokeWidth="0.07"
49+
android:strokeColor="#000000"
50+
android:fillType="nonZero"/>
51+
</vector>
1.16 MB
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Loading
14.4 KB
Binary file not shown.
Lines changed: 17 additions & 0 deletions
Loading

project-resources/trmnl-art/trmnl-frame-original.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)