evan/imagini
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Woooo! Login & Gallery Loading Working!

Browse Source
This commit is contained in:
Evan Reichard
2021-02-21 22:36:25 -05:00
parent 901a69bb91
commit f46db58ed1
12 changed files with 155 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web_native/lib/api/api_provider.dart
View File

@@ -6,6 +6,7 @@ import 'package:imagini/api/cookie_client/cookie_client.dart'
if (dart.library.io) 'package:imagini/api/cookie_client/io_cookie_client.dart';
import 'package:imagini/core/storage_client/base_storage_client.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:graphql_flutter/graphql_flutter.dart';
import 'package:imagini/graphql/imagini_graphql.dart';
@@ -18,12 +19,15 @@ class APIProvider{
APIProvider(BaseStorageClient storage) {
_storage = storage;
init();
}
Future<void> init() async {
String _server = await _storage.get("server");
// Initialize
if (_server == null)
_server = "http://localhost";
httpLink = HttpLink(_server + _GRAPHQL_ENDPOINT,
httpClient: getCookieClient(_storage),
);
@@ -43,7 +47,7 @@ class APIProvider{
(username != null && password != null && server != null)
);
// Initialize Connection
// Initialize New Connection
await _storage.set("server", server);
await init();
@@ -59,12 +63,19 @@ class APIProvider{
return response;
}
Image getImage(String fileName) {
// TODO: Get headers & Server
String fullURL = fileName;
return new Image.network(
fullURL,
headers: {},
Future<CachedNetworkImage> getImage(String fileName, int derivedContentWidth) async {
String server = await _storage.get("server");
String accessToken = await _storage.get("accessToken");
String refreshToken = await _storage.get("refreshToken");
String fullURL = "$server/media/$fileName?width=$derivedContentWidth";
return CachedNetworkImage(
imageUrl: fullURL,
imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
httpHeaders: {
"X-Imagini-AccessToken": accessToken,
"X-Imagini-RefreshToken": refreshToken,
},
fit: BoxFit.contain,
);
}

6
web_native/lib/api/imagini_api_repository.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:imagini/api/api_provider.dart';
import 'package:imagini/graphql/imagini_graphql.dart';
import 'package:graphql_flutter/graphql_flutter.dart';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
class ImaginiAPIRepository {
APIProvider _apiProvider;
@@ -41,7 +41,7 @@ class ImaginiAPIRepository {
}));
}
Image getImage(String fileName) {
return _apiProvider.getImage(fileName);
Future<CachedNetworkImage> getImage(String fileName, int derivedContentWidth) {
return _apiProvider.getImage(fileName, derivedContentWidth);
}
}

6
web_native/lib/blocs/home_bloc.dart
View File

@@ -1,9 +1,9 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:imagini/core/imagini_application.dart';
import 'package:imagini/api/imagini_api_repository.dart';
import 'package:imagini/graphql/imagini_graphql.dart';
import 'package:cached_network_image/cached_network_image.dart';
class HomeBloc{
@@ -34,8 +34,8 @@ class HomeBloc{
_mediaItemsController.close();
}
Image getImage(String fileName){
return _imaginiAPI.getImage(fileName);
Future<CachedNetworkImage> getImage(String fileName, int derivedContentWidth){
return _imaginiAPI.getImage(fileName, derivedContentWidth);
}
getMediaItems(){

5
web_native/lib/core/imagini_application.dart
View File

@@ -17,7 +17,7 @@ class ImaginiApplication {
Future<void> onCreate() async {
_initRouter();
_initStorageClient();
_initAPIRepository();
await _initAPIRepository();
}
Future<void> onTerminate() async {}
@@ -31,9 +31,10 @@ class ImaginiApplication {
storageClient = getStorageClient();
}
_initAPIRepository() {
_initAPIRepository() async {
// TODO: Get from config
APIProvider apiProvider = new APIProvider(storageClient);
await apiProvider.init();
imaginiAPI = ImaginiAPIRepository(apiProvider);
}
}

1
web_native/lib/core/storage_client/browser_storage_client.dart
View File

@@ -5,7 +5,6 @@ import './base_storage_client.dart';
BaseStorageClient getStorageClient() => BrowserStorageClient();
class BrowserStorageClient extends BaseStorageClient {
@override
Future<String> get(String key) async {
var requestedValue = window.localStorage.containsKey(key) ? window.localStorage[key] : "";

63
web_native/lib/screens/home_screen.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:imagini/blocs/home_bloc.dart';
import 'package:imagini/core/app_provider.dart';
@@ -72,36 +73,6 @@ class _HomeScreenState extends State<HomeScreen> {
}
Widget _buildGridView() {
// return GridView.builder(
// itemCount: 5,
// gridDelegate: new SliverGridDelegateWithFixedCrossAxisCount(
// childAspectRatio: (1 / 1),
// crossAxisCount: 2),
// itemBuilder: (BuildContext context, int index) {
// return _buildCard("https://i.imgur.com/CgSGqUz.jpeg");
// }
// );
// return new StaggeredGridView.countBuilder(
// crossAxisCount: 4,
// itemCount: 80,
// itemBuilder: (BuildContext context, int index) => _buildCard("https://i.imgur.com/CgSGqUz.jpeg"),
// // itemBuilder: (BuildContext context, int index) => new Container(
// // color: Colors.green,
// // child: new Center(
// // child: new CircleAvatar(
// // backgroundColor: Colors.white,
// // child: new Text('$index'),
// // ),
// // )),
// staggeredTileBuilder: (int index) =>
// // new StaggeredTile.count(2, index.isEven ? 2 : 1),
// new StaggeredTile.fit(2),
// mainAxisSpacing: 4.0,
// crossAxisSpacing: 4.0,
// );
return StreamBuilder<MediaItems$Query>(
stream: bloc.mediaItemsResult,
builder: (context, snapshot) {
@@ -110,17 +81,20 @@ class _HomeScreenState extends State<HomeScreen> {
List<MediaItems$Query$MediaItemResponse$MediaItem> allItems = snapshot.data.mediaItems.data;
MediaQueryData queryData = MediaQuery.of(context);
final double screenWidthSize = queryData.size.width * queryData.devicePixelRatio;
final int crossAxisCount = (screenWidthSize / 500).ceil();
final int derivedContentWidth = (screenWidthSize / crossAxisCount).ceil();
return new StaggeredGridView.countBuilder(
crossAxisCount: 4,
crossAxisCount: crossAxisCount,
itemCount: allItems.length,
itemBuilder: (BuildContext context, int index) {
String fileName = allItems[index].fileName;
print(fileName);
return _buildCard("https://i.imgur.com/CgSGqUz.jpeg");
return _buildCard(fileName, derivedContentWidth);
},
staggeredTileBuilder: (int index) =>
// new StaggeredTile.count(2, index.isEven ? 2 : 1),
new StaggeredTile.fit(2),
staggeredTileBuilder: (int index) => new StaggeredTile.fit(1),
mainAxisSpacing: 4.0,
crossAxisSpacing: 4.0,
);
@@ -153,11 +127,18 @@ class _HomeScreenState extends State<HomeScreen> {
);
}
Widget _buildCard(charImageUrl) {
return new Image.network(
charImageUrl,
headers: {},
fit: BoxFit.contain,
Widget _buildCard(charImageUrl, derivedContentWidth) {
return FutureBuilder<CachedNetworkImage>(
future: bloc.getImage(charImageUrl, derivedContentWidth),
builder: (context, snapshot) {
if (!snapshot.hasData) {
return PlatformCircularProgressIndicator();
}
return snapshot.data;
// Image newImage = snapshot.data;
// return newImage;
}
);
}
}

40
web_native/lib/widgets/imagini_image_provider.dart.tmp
View File

@@ -1,40 +0,0 @@
import 'dart:ui';
import 'package:flutter/material.dart';
class ImaginiImageProvider extends ImageProvider<ImaginiImageProvider> {
@override
final String url;
@override
final double scale;
@override
final Map<String, String> headers;
ImaginiImageProvider(this.url, {this.scale = 1.0, this.headers})
: assert(url != null),
assert(scale != null);
NetworkImage _netImg;
@override
ImageStreamCompleter load(ImaginiImageProvider key, DecoderCallback decode) {
return MultiFrameImageStreamCompleter(
codec: _loadAsync(decode),
scale: 1.0,
debugLabel: fileId,
informationCollector: () sync* {
yield ErrorDescription('Path: $fileId');
},
);
}
Future<Codec> _loadAsync(DecoderCallback decode) async {
_netImg._loadAsync(decode);
}
@override
Future<ImaginiImageProvider> obtainKey(ImageConfiguration configuration) {
}
}