Skip to content

Commit f8d961f

Browse files
Tomasz KądziołkaTomasz Kądziołka
Tomasz Kądziołka
authored and
Tomasz Kądziołka
committed
Finished code card view
1 parent 4b7217c commit f8d961f

File tree

8 files changed

+249
-30
lines changed

8 files changed

+249
-30
lines changed

‎app/src/main/java/pl/tkadziolka/snipmeandroid/Messages.java

Lines changed: 124 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,30 @@ public void setLanguage(@Nullable SnippetLanguage setterArg) {
134134
this.language = setterArg;
135135
}
136136

137+
private @Nullable Owner owner;
138+
public @Nullable Owner getOwner() { return owner; }
139+
public void setOwner(@Nullable Owner setterArg) {
140+
this.owner = setterArg;
141+
}
142+
143+
private @Nullable String modifiedAt;
144+
public @Nullable String getModifiedAt() { return modifiedAt; }
145+
public void setModifiedAt(@Nullable String setterArg) {
146+
this.modifiedAt = setterArg;
147+
}
148+
149+
private @Nullable Long numberOfLikes;
150+
public @Nullable Long getNumberOfLikes() { return numberOfLikes; }
151+
public void setNumberOfLikes(@Nullable Long setterArg) {
152+
this.numberOfLikes = setterArg;
153+
}
154+
155+
private @Nullable Long numberOfDislikes;
156+
public @Nullable Long getNumberOfDislikes() { return numberOfDislikes; }
157+
public void setNumberOfDislikes(@Nullable Long setterArg) {
158+
this.numberOfDislikes = setterArg;
159+
}
160+
137161
public static final class Builder {
138162
private @Nullable String uuid;
139163
public @NonNull Builder setUuid(@Nullable String setterArg) {
@@ -155,12 +179,36 @@ public static final class Builder {
155179
this.language = setterArg;
156180
return this;
157181
}
182+
private @Nullable Owner owner;
183+
public @NonNull Builder setOwner(@Nullable Owner setterArg) {
184+
this.owner = setterArg;
185+
return this;
186+
}
187+
private @Nullable String modifiedAt;
188+
public @NonNull Builder setModifiedAt(@Nullable String setterArg) {
189+
this.modifiedAt = setterArg;
190+
return this;
191+
}
192+
private @Nullable Long numberOfLikes;
193+
public @NonNull Builder setNumberOfLikes(@Nullable Long setterArg) {
194+
this.numberOfLikes = setterArg;
195+
return this;
196+
}
197+
private @Nullable Long numberOfDislikes;
198+
public @NonNull Builder setNumberOfDislikes(@Nullable Long setterArg) {
199+
this.numberOfDislikes = setterArg;
200+
return this;
201+
}
158202
public @NonNull Snippet build() {
159203
Snippet pigeonReturn = new Snippet();
160204
pigeonReturn.setUuid(uuid);
161205
pigeonReturn.setTitle(title);
162206
pigeonReturn.setCode(code);
163207
pigeonReturn.setLanguage(language);
208+
pigeonReturn.setOwner(owner);
209+
pigeonReturn.setModifiedAt(modifiedAt);
210+
pigeonReturn.setNumberOfLikes(numberOfLikes);
211+
pigeonReturn.setNumberOfDislikes(numberOfDislikes);
164212
return pigeonReturn;
165213
}
166214
}
@@ -170,6 +218,10 @@ public static final class Builder {
170218
toMapResult.put("title", title);
171219
toMapResult.put("code", (code == null) ? null : code.toMap());
172220
toMapResult.put("language", (language == null) ? null : language.toMap());
221+
toMapResult.put("owner", (owner == null) ? null : owner.toMap());
222+
toMapResult.put("modifiedAt", modifiedAt);
223+
toMapResult.put("numberOfLikes", numberOfLikes);
224+
toMapResult.put("numberOfDislikes", numberOfDislikes);
173225
return toMapResult;
174226
}
175227
static @NonNull Snippet fromMap(@NonNull Map<String, Object> map) {
@@ -182,6 +234,14 @@ public static final class Builder {
182234
pigeonResult.setCode((code == null) ? null : SnippetCode.fromMap((Map)code));
183235
Object language = map.get("language");
184236
pigeonResult.setLanguage((language == null) ? null : SnippetLanguage.fromMap((Map)language));
237+
Object owner = map.get("owner");
238+
pigeonResult.setOwner((owner == null) ? null : Owner.fromMap((Map)owner));
239+
Object modifiedAt = map.get("modifiedAt");
240+
pigeonResult.setModifiedAt((String)modifiedAt);
241+
Object numberOfLikes = map.get("numberOfLikes");
242+
pigeonResult.setNumberOfLikes((numberOfLikes == null) ? null : ((numberOfLikes instanceof Integer) ? (Integer)numberOfLikes : (Long)numberOfLikes));
243+
Object numberOfDislikes = map.get("numberOfDislikes");
244+
pigeonResult.setNumberOfDislikes((numberOfDislikes == null) ? null : ((numberOfDislikes instanceof Integer) ? (Integer)numberOfDislikes : (Long)numberOfDislikes));
185245
return pigeonResult;
186246
}
187247
}
@@ -345,6 +405,54 @@ public static final class Builder {
345405
}
346406
}
347407

408+
/** Generated class from Pigeon that represents data sent in messages. */
409+
public static class Owner {
410+
private @Nullable Long id;
411+
public @Nullable Long getId() { return id; }
412+
public void setId(@Nullable Long setterArg) {
413+
this.id = setterArg;
414+
}
415+
416+
private @Nullable String login;
417+
public @Nullable String getLogin() { return login; }
418+
public void setLogin(@Nullable String setterArg) {
419+
this.login = setterArg;
420+
}
421+
422+
public static final class Builder {
423+
private @Nullable Long id;
424+
public @NonNull Builder setId(@Nullable Long setterArg) {
425+
this.id = setterArg;
426+
return this;
427+
}
428+
private @Nullable String login;
429+
public @NonNull Builder setLogin(@Nullable String setterArg) {
430+
this.login = setterArg;
431+
return this;
432+
}
433+
public @NonNull Owner build() {
434+
Owner pigeonReturn = new Owner();
435+
pigeonReturn.setId(id);
436+
pigeonReturn.setLogin(login);
437+
return pigeonReturn;
438+
}
439+
}
440+
@NonNull Map<String, Object> toMap() {
441+
Map<String, Object> toMapResult = new HashMap<>();
442+
toMapResult.put("id", id);
443+
toMapResult.put("login", login);
444+
return toMapResult;
445+
}
446+
static @NonNull Owner fromMap(@NonNull Map<String, Object> map) {
447+
Owner pigeonResult = new Owner();
448+
Object id = map.get("id");
449+
pigeonResult.setId((id == null) ? null : ((id instanceof Integer) ? (Integer)id : (Long)id));
450+
Object login = map.get("login");
451+
pigeonResult.setLogin((String)login);
452+
return pigeonResult;
453+
}
454+
}
455+
348456
/** Generated class from Pigeon that represents data sent in messages. */
349457
public static class SnippetFilter {
350458
private @Nullable SnippetFilterType type;
@@ -516,18 +624,21 @@ protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) {
516624
return MainModelStateData.fromMap((Map<String, Object>) readValue(buffer));
517625

518626
case (byte)130:
519-
return Snippet.fromMap((Map<String, Object>) readValue(buffer));
627+
return Owner.fromMap((Map<String, Object>) readValue(buffer));
520628

521629
case (byte)131:
522-
return SnippetCode.fromMap((Map<String, Object>) readValue(buffer));
630+
return Snippet.fromMap((Map<String, Object>) readValue(buffer));
523631

524632
case (byte)132:
525-
return SnippetFilter.fromMap((Map<String, Object>) readValue(buffer));
633+
return SnippetCode.fromMap((Map<String, Object>) readValue(buffer));
526634

527635
case (byte)133:
528-
return SnippetLanguage.fromMap((Map<String, Object>) readValue(buffer));
636+
return SnippetFilter.fromMap((Map<String, Object>) readValue(buffer));
529637

530638
case (byte)134:
639+
return SnippetLanguage.fromMap((Map<String, Object>) readValue(buffer));
640+
641+
case (byte)135:
531642
return SyntaxToken.fromMap((Map<String, Object>) readValue(buffer));
532643

533644
default:
@@ -545,24 +656,28 @@ protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value)
545656
stream.write(129);
546657
writeValue(stream, ((MainModelStateData) value).toMap());
547658
} else
548-
if (value instanceof Snippet) {
659+
if (value instanceof Owner) {
549660
stream.write(130);
661+
writeValue(stream, ((Owner) value).toMap());
662+
} else
663+
if (value instanceof Snippet) {
664+
stream.write(131);
550665
writeValue(stream, ((Snippet) value).toMap());
551666
} else
552667
if (value instanceof SnippetCode) {
553-
stream.write(131);
668+
stream.write(132);
554669
writeValue(stream, ((SnippetCode) value).toMap());
555670
} else
556671
if (value instanceof SnippetFilter) {
557-
stream.write(132);
672+
stream.write(133);
558673
writeValue(stream, ((SnippetFilter) value).toMap());
559674
} else
560675
if (value instanceof SnippetLanguage) {
561-
stream.write(133);
676+
stream.write(134);
562677
writeValue(stream, ((SnippetLanguage) value).toMap());
563678
} else
564679
if (value instanceof SyntaxToken) {
565-
stream.write(134);
680+
stream.write(135);
566681
writeValue(stream, ((SyntaxToken) value).toMap());
567682
} else
568683
{

‎app/src/main/java/pl/tkadziolka/snipmeandroid/PigeonPlugin.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ import pl.tkadziolka.snipmeandroid.ui.main.*
1717
import pl.tkadziolka.snipmeandroid.util.view.SnippetFilter
1818
import timber.log.Timber
1919

20-
// flutter pub run pigeon \
21-
// --input pigeons/messages.dart \
22-
// --dart_out lib/messages.dart \
23-
// --java_out ../app/src/main/java/pl/tkadziolka/snipmeandroid/Messages.java \
24-
// --java_package "pl.tkadziolka.snipmeandroid"
20+
/*
21+
flutter pub run pigeon \
22+
--input pigeons/messages.dart \
23+
--dart_out lib/messages.dart \
24+
--java_out ../app/src/main/java/pl/tkadziolka/snipmeandroid/Messages.java \
25+
--java_package "pl.tkadziolka.snipmeandroid"
26+
*/
2527

2628
@ExperimentalCoroutinesApi
2729
class PigeonPlugin : FlutterPlugin, Messages.MainModelApi, KoinComponent {

‎flutter_module/lib/messages.dart

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,31 @@ class Snippet {
7979
this.title,
8080
this.code,
8181
this.language,
82+
this.owner,
83+
this.modifiedAt,
84+
this.numberOfLikes,
85+
this.numberOfDislikes,
8286
});
8387

8488
String? uuid;
8589
String? title;
8690
SnippetCode? code;
8791
SnippetLanguage? language;
92+
Owner? owner;
93+
String? modifiedAt;
94+
int? numberOfLikes;
95+
int? numberOfDislikes;
8896

8997
Object encode() {
9098
final Map<Object?, Object?> pigeonMap = <Object?, Object?>{};
9199
pigeonMap['uuid'] = uuid;
92100
pigeonMap['title'] = title;
93101
pigeonMap['code'] = code?.encode();
94102
pigeonMap['language'] = language?.encode();
103+
pigeonMap['owner'] = owner?.encode();
104+
pigeonMap['modifiedAt'] = modifiedAt;
105+
pigeonMap['numberOfLikes'] = numberOfLikes;
106+
pigeonMap['numberOfDislikes'] = numberOfDislikes;
95107
return pigeonMap;
96108
}
97109

@@ -106,6 +118,12 @@ class Snippet {
106118
language: pigeonMap['language'] != null
107119
? SnippetLanguage.decode(pigeonMap['language']!)
108120
: null,
121+
owner: pigeonMap['owner'] != null
122+
? Owner.decode(pigeonMap['owner']!)
123+
: null,
124+
modifiedAt: pigeonMap['modifiedAt'] as String?,
125+
numberOfLikes: pigeonMap['numberOfLikes'] as int?,
126+
numberOfDislikes: pigeonMap['numberOfDislikes'] as int?,
109127
);
110128
}
111129
}
@@ -191,6 +209,31 @@ class SnippetLanguage {
191209
}
192210
}
193211

212+
class Owner {
213+
Owner({
214+
this.id,
215+
this.login,
216+
});
217+
218+
int? id;
219+
String? login;
220+
221+
Object encode() {
222+
final Map<Object?, Object?> pigeonMap = <Object?, Object?>{};
223+
pigeonMap['id'] = id;
224+
pigeonMap['login'] = login;
225+
return pigeonMap;
226+
}
227+
228+
static Owner decode(Object message) {
229+
final Map<Object?, Object?> pigeonMap = message as Map<Object?, Object?>;
230+
return Owner(
231+
id: pigeonMap['id'] as int?,
232+
login: pigeonMap['login'] as String?,
233+
);
234+
}
235+
}
236+
194237
class SnippetFilter {
195238
SnippetFilter({
196239
this.type,
@@ -288,26 +331,30 @@ class _MainModelApiCodec extends StandardMessageCodec{
288331
buffer.putUint8(129);
289332
writeValue(buffer, value.encode());
290333
} else
291-
if (value is Snippet) {
334+
if (value is Owner) {
292335
buffer.putUint8(130);
293336
writeValue(buffer, value.encode());
294337
} else
295-
if (value is SnippetCode) {
338+
if (value is Snippet) {
296339
buffer.putUint8(131);
297340
writeValue(buffer, value.encode());
298341
} else
299-
if (value is SnippetFilter) {
342+
if (value is SnippetCode) {
300343
buffer.putUint8(132);
301344
writeValue(buffer, value.encode());
302345
} else
303-
if (value is SnippetLanguage) {
346+
if (value is SnippetFilter) {
304347
buffer.putUint8(133);
305348
writeValue(buffer, value.encode());
306349
} else
307-
if (value is SyntaxToken) {
350+
if (value is SnippetLanguage) {
308351
buffer.putUint8(134);
309352
writeValue(buffer, value.encode());
310353
} else
354+
if (value is SyntaxToken) {
355+
buffer.putUint8(135);
356+
writeValue(buffer, value.encode());
357+
} else
311358
{
312359
super.writeValue(buffer, value);
313360
}
@@ -322,18 +369,21 @@ class _MainModelApiCodec extends StandardMessageCodec{
322369
return MainModelStateData.decode(readValue(buffer)!);
323370

324371
case 130:
325-
return Snippet.decode(readValue(buffer)!);
372+
return Owner.decode(readValue(buffer)!);
326373

327374
case 131:
328-
return SnippetCode.decode(readValue(buffer)!);
375+
return Snippet.decode(readValue(buffer)!);
329376

330377
case 132:
331-
return SnippetFilter.decode(readValue(buffer)!);
378+
return SnippetCode.decode(readValue(buffer)!);
332379

333380
case 133:
334-
return SnippetLanguage.decode(readValue(buffer)!);
381+
return SnippetFilter.decode(readValue(buffer)!);
335382

336383
case 134:
384+
return SnippetLanguage.decode(readValue(buffer)!);
385+
386+
case 135:
337387
return SyntaxToken.decode(readValue(buffer)!);
338388

339389
default:

0 commit comments

Comments
 (0)