diff --git a/lib/screens/twitter_widget.dart b/lib/screens/twitter_widget.dart index 0dcc477..dcf40b4 100644 --- a/lib/screens/twitter_widget.dart +++ b/lib/screens/twitter_widget.dart @@ -18,7 +18,16 @@ class TwitterFeed extends StatelessWidget{ body: Container( color: Colors.black12, child: - VerticalTwitterFeed(), + FutureBuilder( + future: _buildTwitter(), + builder: (ctx, snapshot){ + if(!snapshot.hasData){ + return Center(child: CircularProgressIndicator()); + }else{ + return snapshot.data; + } + }, + ), ), drawer: Drawer( child: ListView( @@ -48,3 +57,7 @@ class TwitterFeed extends StatelessWidget{ } } +Future _buildTwitter() async { + final feed = TwitterFeedCreation(); + return VerticalTwitterFeed(twitterFeed: feed); +} diff --git a/lib/twitter_assets/twitterFeed.dart b/lib/twitter_assets/twitterFeed.dart index 1e08d25..349f9f2 100644 --- a/lib/twitter_assets/twitterFeed.dart +++ b/lib/twitter_assets/twitterFeed.dart @@ -14,22 +14,10 @@ import 'tweet.dart'; final twitterBase = 'https://api.twitter.com/1.1/search'; final _twitterOauth = new twitterApi( - consumerKey: 'AFBfOqx8uXIUBZMxAFoQyO3zA', - consumerSecret: '48Gp7nczz9SqExorwYuWpA6Nmviuox6Beq83kjH1XtYtunorym', - token: '910563313108574211-NNlQlPdbHWlNyFglwzrtD1dMpyDrNrF', - tokenSecret: 'aW4aJBQH2EPvoyc3gtR0qSKepccmuEtAj2sH7dzh2w8sN;', -); - -Future twitterRequest = _twitterOauth.getTwitterRequest( - "GET", - "/statuses/user_timeline.json", - options: { - "user_id": "19025957", - "screen_name": "TTCnotices", - "count": "20", - "trim_user": "true", - "tweet_mode": "extended", - } + consumerKey: "gsa3eHPVGK90dt6fgUC2ZSbTE", + consumerSecret: "rwEjykGOfapPLTVkWgedSCU8Eld130EEHFyu3W0Ye3fDcKj5Vf", + token: "910563313108574211-WynoAeUKJrnE6uXPv8vJGx4ITGS1ggG", + tokenSecret: "dWFYYbn6J1QTyV86femOdriX7MfMSANSjH3m48ZtEZUNW", ); @@ -39,7 +27,17 @@ class TwitterFeedCreation { Future> getPage() async { - var response = await twitterRequest; + var response = await _twitterOauth.getTwitterRequest( + "GET", + "/statuses/user_timeline.json", + options: { + "user_id": "19025957", + "screen_name": "TTCnotices", + "count": "20", + "trim_user": "true", + "tweet_mode": "extended", + } + ); Iterable tweets = json.decode(response.body); print(tweets); return tweets.map((e) => Tweet.fromJson(e)).toList(); @@ -49,7 +47,12 @@ class TwitterFeedCreation { class VerticalTwitterFeed extends StatelessWidget{ - final twitterFeed = TwitterFeedCreation(); + final TwitterFeedCreation twitterFeed; + + const VerticalTwitterFeed({ + Key key, + @required this.twitterFeed, +}) : super(key: key); diff --git a/pubspec.yaml b/pubspec.yaml index 06cb5a6..363e4bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: http: ^0.12.0+4 shared_preferences: ^0.5.6+3 - twitter_api: + twitter_api: ^0.1.2 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.