Skip to content

Commit 6f4fc4b

Browse files
committed
Merge remote-tracking branch 'alot_squawker/branch1'
2 parents 8324ac9 + 57d23b9 commit 6f4fc4b

File tree

4 files changed

+51
-39
lines changed

4 files changed

+51
-39
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
22
* The released apk files also include apk files built for older Android KitKat (version 4.4.x).
33
* Fix issue #309 Toolbar icons are not aligned.
4+
* PR #311 Add search button to profile view to find tweets from current user (thanks @alotbsol555).
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
22
* The released apk files also include apk files built for older Android KitKat (version 4.4.x).
33
* Fix issue #309 Toolbar icons are not aligned.
4+
* PR #311 Add search button to profile view to find tweets from current user (thanks @alotbsol555).

lib/profile/profile.dart

+11-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,17 @@ class _ProfileScreenBodyState extends State<ProfileScreenBody> with TickerProvid
520520
Container(
521521
alignment: Alignment.topRight,
522522
margin: EdgeInsets.fromLTRB(128, profileImageTop + 64, 16, 16),
523-
child: FollowButton(user: UserSubscription.fromUser(user), color: Colors.white),
523+
child: Row(
524+
mainAxisAlignment: MainAxisAlignment.end,
525+
children:[
526+
IconButton(
527+
icon: const Icon(Symbols.search),
528+
color: Colors.white,
529+
onPressed: () => pushNamedRoute(context, routeSearch, SearchArguments(1, focusInputOnOpen: true, query: 'from:@${(user.screenName!)} ')),
530+
),
531+
FollowButton(user: UserSubscription.fromUser(user), color: Colors.white),
532+
],
533+
),
524534
),
525535
Container(
526536
alignment: Alignment.topLeft,

pubspec.lock

+38-38
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: archive
24-
sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
24+
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "3.5.1"
27+
version: "3.6.1"
2828
args:
2929
dependency: transitive
3030
description:
@@ -221,10 +221,10 @@ packages:
221221
dependency: "direct main"
222222
description:
223223
name: extended_image
224-
sha256: d7f091d068fcac7246c4b22a84b8dac59a62e04d29a5c172710c696e67a22f94
224+
sha256: "9786aab821aac117763d6e4419cd49f5031fbaacfe3fd212c5b313d0334c37a9"
225225
url: "https://pub.dev"
226226
source: hosted
227-
version: "8.2.0"
227+
version: "8.2.1"
228228
extended_image_library:
229229
dependency: transitive
230230
description:
@@ -323,10 +323,10 @@ packages:
323323
description:
324324
path: "."
325325
ref: master
326-
resolved-ref: "92bdb69a313a56c391ef148c12ef6539bd31253d"
326+
resolved-ref: "6689dc52d5a915f9f223f2553c8f8b88f66b2820"
327327
url: "https://github.com/mchome/flutter_colorpicker"
328328
source: git
329-
version: "1.0.3"
329+
version: "1.1.0"
330330
flutter_file_dialog:
331331
dependency: "direct main"
332332
description:
@@ -408,10 +408,10 @@ packages:
408408
dependency: transitive
409409
description:
410410
name: flutter_plugin_android_lifecycle
411-
sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
411+
sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
412412
url: "https://pub.dev"
413413
source: hosted
414-
version: "2.0.19"
414+
version: "2.0.20"
415415
flutter_staggered_grid_view:
416416
dependency: transitive
417417
description:
@@ -530,18 +530,18 @@ packages:
530530
dependency: transitive
531531
description:
532532
name: idb_shim
533-
sha256: "0566abfc41fa38889a4575f371d54860f069a7bcf6fcfdf8cf6a242e9d5e248f"
533+
sha256: "8016b1c0bba245d8a88711ce8a801646d0f48c95d3f6a82a6463ef0157846acf"
534534
url: "https://pub.dev"
535535
source: hosted
536-
version: "2.4.1+1"
536+
version: "2.5.0+1"
537537
image:
538538
dependency: transitive
539539
description:
540540
name: image
541-
sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
541+
sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
542542
url: "https://pub.dev"
543543
source: hosted
544-
version: "4.1.7"
544+
version: "4.2.0"
545545
infinite_scroll_pagination:
546546
dependency: "direct main"
547547
description:
@@ -651,10 +651,10 @@ packages:
651651
dependency: "direct main"
652652
description:
653653
name: material_symbols_icons
654-
sha256: "36d4e5dd72f2fd282aca127cc4c4c29786d702cb506231ea73a5497fc324bf46"
654+
sha256: a2c78726048c755f0f90fd2b7c8799cd94338e2e9b7ab6498ae56503262c14bc
655655
url: "https://pub.dev"
656656
source: hosted
657-
version: "4.2741.0"
657+
version: "4.2762.0"
658658
measure_size:
659659
dependency: "direct main"
660660
description:
@@ -771,10 +771,10 @@ packages:
771771
dependency: transitive
772772
description:
773773
name: path_provider_android
774-
sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
774+
sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
775775
url: "https://pub.dev"
776776
source: hosted
777-
version: "2.2.4"
777+
version: "2.2.5"
778778
path_provider_foundation:
779779
dependency: transitive
780780
description:
@@ -859,10 +859,10 @@ packages:
859859
dependency: transitive
860860
description:
861861
name: platform
862-
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
862+
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
863863
url: "https://pub.dev"
864864
source: hosted
865-
version: "3.1.4"
865+
version: "3.1.5"
866866
plugin_platform_interface:
867867
dependency: transitive
868868
description:
@@ -947,10 +947,10 @@ packages:
947947
dependency: transitive
948948
description:
949949
name: sembast
950-
sha256: dbe19600cff55d43f19405be79138c3fd2c08a87b0b152b18609b9427d113a64
950+
sha256: "2a768b145bee5c72ae78c2641842ee348a6d345172af1070a497293c44f65ae1"
951951
url: "https://pub.dev"
952952
source: hosted
953-
version: "3.7.1"
953+
version: "3.7.1+2"
954954
share_plus:
955955
dependency: "direct main"
956956
description:
@@ -979,10 +979,10 @@ packages:
979979
dependency: transitive
980980
description:
981981
name: shared_preferences_android
982-
sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
982+
sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
983983
url: "https://pub.dev"
984984
source: hosted
985-
version: "2.2.2"
985+
version: "2.2.3"
986986
shared_preferences_foundation:
987987
dependency: transitive
988988
description:
@@ -1040,10 +1040,10 @@ packages:
10401040
dependency: "direct main"
10411041
description:
10421042
name: socks5_proxy
1043-
sha256: "045cbba84f6e2b01c1c77634a63e926352bf110ef5f07fc462c6d43bbd4b6a83"
1043+
sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
10441044
url: "https://pub.dev"
10451045
source: hosted
1046-
version: "1.0.5+dev.2"
1046+
version: "1.0.6"
10471047
source_span:
10481048
dependency: transitive
10491049
description:
@@ -1192,18 +1192,18 @@ packages:
11921192
dependency: "direct main"
11931193
description:
11941194
name: url_launcher
1195-
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
1195+
sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
11961196
url: "https://pub.dev"
11971197
source: hosted
1198-
version: "6.2.6"
1198+
version: "6.3.0"
11991199
url_launcher_android:
12001200
dependency: transitive
12011201
description:
12021202
name: url_launcher_android
1203-
sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
1203+
sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
12041204
url: "https://pub.dev"
12051205
source: hosted
1206-
version: "6.3.1"
1206+
version: "6.3.3"
12071207
url_launcher_ios:
12081208
dependency: transitive
12091209
description:
@@ -1272,18 +1272,18 @@ packages:
12721272
dependency: "direct main"
12731273
description:
12741274
name: video_player
1275-
sha256: db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0
1275+
sha256: aced48e701e24c02b0b7f881a8819e4937794e46b5a5821005e2bf3b40a324cc
12761276
url: "https://pub.dev"
12771277
source: hosted
1278-
version: "2.8.6"
1278+
version: "2.8.7"
12791279
video_player_android:
12801280
dependency: transitive
12811281
description:
12821282
name: video_player_android
1283-
sha256: "134e1ad410d67e18a19486ed9512c72dfc6d8ffb284d0e8f2e99e903d1ba8fa3"
1283+
sha256: "9529001630e42988f755772972d5014d30121610700e8e502278a245939f8fc8"
12841284
url: "https://pub.dev"
12851285
source: hosted
1286-
version: "2.4.14"
1286+
version: "2.5.0"
12871287
video_player_avfoundation:
12881288
dependency: transitive
12891289
description:
@@ -1304,10 +1304,10 @@ packages:
13041304
dependency: transitive
13051305
description:
13061306
name: video_player_web
1307-
sha256: "41245cef5ef29c4585dbabcbcbe9b209e34376642c7576cabf11b4ad9289d6e4"
1307+
sha256: ff4d69a6614b03f055397c27a71c9d3ddea2b2a23d71b2ba0164f59ca32b8fe2
13081308
url: "https://pub.dev"
13091309
source: hosted
1310-
version: "2.3.0"
1310+
version: "2.3.1"
13111311
visibility_detector:
13121312
dependency: "direct main"
13131313
description:
@@ -1400,10 +1400,10 @@ packages:
14001400
dependency: "direct overridden"
14011401
description:
14021402
name: win32
1403-
sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
1403+
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
14041404
url: "https://pub.dev"
14051405
source: hosted
1406-
version: "5.5.0"
1406+
version: "5.5.1"
14071407
win32_registry:
14081408
dependency: transitive
14091409
description:
@@ -1437,5 +1437,5 @@ packages:
14371437
source: hosted
14381438
version: "3.1.2"
14391439
sdks:
1440-
dart: ">=3.3.0 <3.13.0"
1441-
flutter: ">=3.19.0"
1440+
dart: ">=3.4.0 <3.13.0"
1441+
flutter: ">=3.22.0"

0 commit comments

Comments
 (0)