Skip to content

Commit

Permalink
Merge remote-tracking branch 'alot_squawker/branch1'
Browse files Browse the repository at this point in the history
  • Loading branch information
j-fbriere committed Jun 16, 2024
2 parents 8324ac9 + 57d23b9 commit 6f4fc4b
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 39 deletions.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/46.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
* Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
* The released apk files also include apk files built for older Android KitKat (version 4.4.x).
* Fix issue #309 Toolbar icons are not aligned.
* PR #311 Add search button to profile view to find tweets from current user (thanks @alotbsol555).
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/default.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
* Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
* The released apk files also include apk files built for older Android KitKat (version 4.4.x).
* Fix issue #309 Toolbar icons are not aligned.
* PR #311 Add search button to profile view to find tweets from current user (thanks @alotbsol555).
12 changes: 11 additions & 1 deletion lib/profile/profile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,17 @@ class _ProfileScreenBodyState extends State<ProfileScreenBody> with TickerProvid
Container(
alignment: Alignment.topRight,
margin: EdgeInsets.fromLTRB(128, profileImageTop + 64, 16, 16),
child: FollowButton(user: UserSubscription.fromUser(user), color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children:[
IconButton(
icon: const Icon(Symbols.search),
color: Colors.white,
onPressed: () => pushNamedRoute(context, routeSearch, SearchArguments(1, focusInputOnOpen: true, query: 'from:@${(user.screenName!)} ')),
),
FollowButton(user: UserSubscription.fromUser(user), color: Colors.white),
],
),
),
Container(
alignment: Alignment.topLeft,
Expand Down
76 changes: 38 additions & 38 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ packages:
dependency: transitive
description:
name: archive
sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
url: "https://pub.dev"
source: hosted
version: "3.5.1"
version: "3.6.1"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -221,10 +221,10 @@ packages:
dependency: "direct main"
description:
name: extended_image
sha256: d7f091d068fcac7246c4b22a84b8dac59a62e04d29a5c172710c696e67a22f94
sha256: "9786aab821aac117763d6e4419cd49f5031fbaacfe3fd212c5b313d0334c37a9"
url: "https://pub.dev"
source: hosted
version: "8.2.0"
version: "8.2.1"
extended_image_library:
dependency: transitive
description:
Expand Down Expand Up @@ -323,10 +323,10 @@ packages:
description:
path: "."
ref: master
resolved-ref: "92bdb69a313a56c391ef148c12ef6539bd31253d"
resolved-ref: "6689dc52d5a915f9f223f2553c8f8b88f66b2820"
url: "https://github.com/mchome/flutter_colorpicker"
source: git
version: "1.0.3"
version: "1.1.0"
flutter_file_dialog:
dependency: "direct main"
description:
Expand Down Expand Up @@ -408,10 +408,10 @@ packages:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
url: "https://pub.dev"
source: hosted
version: "2.0.19"
version: "2.0.20"
flutter_staggered_grid_view:
dependency: transitive
description:
Expand Down Expand Up @@ -530,18 +530,18 @@ packages:
dependency: transitive
description:
name: idb_shim
sha256: "0566abfc41fa38889a4575f371d54860f069a7bcf6fcfdf8cf6a242e9d5e248f"
sha256: "8016b1c0bba245d8a88711ce8a801646d0f48c95d3f6a82a6463ef0157846acf"
url: "https://pub.dev"
source: hosted
version: "2.4.1+1"
version: "2.5.0+1"
image:
dependency: transitive
description:
name: image
sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
url: "https://pub.dev"
source: hosted
version: "4.1.7"
version: "4.2.0"
infinite_scroll_pagination:
dependency: "direct main"
description:
Expand Down Expand Up @@ -651,10 +651,10 @@ packages:
dependency: "direct main"
description:
name: material_symbols_icons
sha256: "36d4e5dd72f2fd282aca127cc4c4c29786d702cb506231ea73a5497fc324bf46"
sha256: a2c78726048c755f0f90fd2b7c8799cd94338e2e9b7ab6498ae56503262c14bc
url: "https://pub.dev"
source: hosted
version: "4.2741.0"
version: "4.2762.0"
measure_size:
dependency: "direct main"
description:
Expand Down Expand Up @@ -771,10 +771,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
url: "https://pub.dev"
source: hosted
version: "2.2.4"
version: "2.2.5"
path_provider_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -859,10 +859,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
url: "https://pub.dev"
source: hosted
version: "3.1.4"
version: "3.1.5"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -947,10 +947,10 @@ packages:
dependency: transitive
description:
name: sembast
sha256: dbe19600cff55d43f19405be79138c3fd2c08a87b0b152b18609b9427d113a64
sha256: "2a768b145bee5c72ae78c2641842ee348a6d345172af1070a497293c44f65ae1"
url: "https://pub.dev"
source: hosted
version: "3.7.1"
version: "3.7.1+2"
share_plus:
dependency: "direct main"
description:
Expand Down Expand Up @@ -979,10 +979,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_android
sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
url: "https://pub.dev"
source: hosted
version: "2.2.2"
version: "2.2.3"
shared_preferences_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -1040,10 +1040,10 @@ packages:
dependency: "direct main"
description:
name: socks5_proxy
sha256: "045cbba84f6e2b01c1c77634a63e926352bf110ef5f07fc462c6d43bbd4b6a83"
sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
url: "https://pub.dev"
source: hosted
version: "1.0.5+dev.2"
version: "1.0.6"
source_span:
dependency: transitive
description:
Expand Down Expand Up @@ -1192,18 +1192,18 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
url: "https://pub.dev"
source: hosted
version: "6.2.6"
version: "6.3.0"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
url: "https://pub.dev"
source: hosted
version: "6.3.1"
version: "6.3.3"
url_launcher_ios:
dependency: transitive
description:
Expand Down Expand Up @@ -1272,18 +1272,18 @@ packages:
dependency: "direct main"
description:
name: video_player
sha256: db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0
sha256: aced48e701e24c02b0b7f881a8819e4937794e46b5a5821005e2bf3b40a324cc
url: "https://pub.dev"
source: hosted
version: "2.8.6"
version: "2.8.7"
video_player_android:
dependency: transitive
description:
name: video_player_android
sha256: "134e1ad410d67e18a19486ed9512c72dfc6d8ffb284d0e8f2e99e903d1ba8fa3"
sha256: "9529001630e42988f755772972d5014d30121610700e8e502278a245939f8fc8"
url: "https://pub.dev"
source: hosted
version: "2.4.14"
version: "2.5.0"
video_player_avfoundation:
dependency: transitive
description:
Expand All @@ -1304,10 +1304,10 @@ packages:
dependency: transitive
description:
name: video_player_web
sha256: "41245cef5ef29c4585dbabcbcbe9b209e34376642c7576cabf11b4ad9289d6e4"
sha256: ff4d69a6614b03f055397c27a71c9d3ddea2b2a23d71b2ba0164f59ca32b8fe2
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.3.1"
visibility_detector:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1400,10 +1400,10 @@ packages:
dependency: "direct overridden"
description:
name: win32
sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
url: "https://pub.dev"
source: hosted
version: "5.5.0"
version: "5.5.1"
win32_registry:
dependency: transitive
description:
Expand Down Expand Up @@ -1437,5 +1437,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.3.0 <3.13.0"
flutter: ">=3.19.0"
dart: ">=3.4.0 <3.13.0"
flutter: ">=3.22.0"

0 comments on commit 6f4fc4b

Please sign in to comment.