## [0.1.56] - 21st November, 2018

* Introducing few commonly used widgets: Fetching, NoData, Paginator, PullToRefresh

(cherry picked from commit 1dfb720)

Author: tiholic

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.56] - 21st November, 2018
+
+* Introducing few commonly used widgets: Fetching, NoData, Paginator, PullToRefresh
+
 ## [0.1.55] - 14th November, 2018
 
 * AdharaStatefulWidget~isFirstLoadComplete was returning wrong status, issue fixed.

example/main.dart

@@ -113,4 +113,4 @@ class _AppState extends AdharaState<App> {
 //import 'appconfig.dart'; //TODO uncomment
 //import 'package:adhara/adhara.dart'; //TODO uncomment
 
-void main() => AdharaApp.initWithConfig(AppConfig());
+void main() => AdharaApp.init(AppConfig());

lib/styles/colors.dart

@@ -0,0 +1,5 @@
+class AdharaColors {
+
+
+
+}

lib/styles/text_styles.dart

@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+
+class AdharaStyles {
+
+  static const textMuted = const TextStyle(
+    color:  Colors.black12,
+    fontWeight: FontWeight.w400,
+    fontFamily: "SFProText",
+    fontStyle:  FontStyle.normal,
+    fontSize: 18.0
+  );
+
+}

lib/widgets/fetching.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+
+import '../resources/r.dart';
+import '../styles/text_styles.dart';
+import 'no_data.dart';
+
+
+class Fetching extends NoData{
+
+  final String text;
+  final Widget bottom;
+  final TextStyle textStyle;
+  final String assetPath;
+
+  Fetching({
+    Key key,
+    this.bottom,
+    this.text: "Loading...",
+    this.textStyle: AdharaStyles.textMuted,
+    this.assetPath
+  }): super(key: key);
+
+  @override
+  Widget buildWithResources(BuildContext context, Resources r){
+    String _assetPath = assetPath ?? r.config.fromFile['fetchingImage'] ?? "assets/animations/fetching.gif";
+    return Center(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Container(
+            width: 120.0,
+            child: Center(
+              child: Image.asset(_assetPath)
+            ),
+          ),
+          bottom ?? text!=null?Text(text, style: textStyle, textAlign: TextAlign.center,):Container(),
+        ]
+      )
+    );
+  }
+
+}

lib/widgets/no_data.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+import '../resources/r.dart';
+import '../styles/text_styles.dart';
+import 'stateless_widget.dart';
+
+
+class NoData extends AdharaStatelessWidget{
+
+  final String displayText;
+  final TextStyle textStyle;
+
+  NoData({
+    Key key,
+    this.displayText: "No Data Availalbe",
+    this.textStyle: AdharaStyles.textMuted
+  }) : super(key: key);
+
+  @override
+  Widget buildWithResources(BuildContext context, Resources r){
+    return Center(
+      child: Text(displayText, style: textStyle)
+    );
+  }
+
+}

lib/widgets/paginator.dart

@@ -0,0 +1,161 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import 'pull_to_refresh.dart';
+import 'stateful_widget.dart';
+
+enum PaginatorTypes{
+  CUSTOM_SCROLL_VIEW, LIST_VIEW
+}
+
+typedef Future<bool> OnPageChange(int);
+
+class Paginator extends AdharaStatefulWidget{
+
+  final List<Widget> children;
+  final OnPageChange onPageChange;
+  final Function onPageLoaded;
+  final PaginatorTypes listType;
+  final IndexedWidgetBuilder itemBuilder;
+  final bool reverse;
+  final int itemCount;
+  final bool endNavigationOnLastPage;
+  final Widget loadingWidget;
+
+  Paginator({
+    Key key,
+    @required this.onPageChange,
+    @required this.onPageLoaded,
+    this.children,
+    this.itemBuilder,
+    this.listType: PaginatorTypes.CUSTOM_SCROLL_VIEW,
+    this.itemCount,
+    this.reverse: false,
+    this.endNavigationOnLastPage: false,
+    this.loadingWidget
+  }):
+      assert(children!=null || itemBuilder!=null),
+      super(key: key);
+
+  @override
+  _PaginatorState createState() => new _PaginatorState();
+
+}
+
+class _PaginatorState extends AdharaState<Paginator>{
+
+  String get tag => "Paginator";
+  ScrollController _scrollController;
+  bool isLoading = false;
+  int page = 0;
+
+  @override
+  initState(){
+    super.initState();
+    _scrollController = ScrollController();
+    _scrollController.addListener(onScroll);
+  }
+
+  @override
+  void dispose() {
+    _scrollController.removeListener(onScroll);
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  get didHitBottom{
+    return _scrollController.position.pixels == _scrollController.position.maxScrollExtent;
+  }
+
+  bool hasMore = true;
+  onScroll() async {
+    if(!isLoading && didHitBottom){
+      isLoading = true;
+      setState((){});
+      if(widget.endNavigationOnLastPage && !hasMore){
+        return;
+      }
+//      _scrollController.position.setPixels(_scrollController.position.pixels+10.0); //Throwing exception - Need to check back
+      hasMore = await widget.onPageChange(page+1);
+      if(hasMore) page++;
+      await widget.onPageLoaded(page);
+      isLoading = false;
+      setState((){});
+    }
+  }
+
+  bool get isListView{
+    return widget.listType == PaginatorTypes.LIST_VIEW;
+  }
+
+  Widget get indicator{
+    if(isLoading){
+      return widget.loadingWidget ?? Container(
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisSize: MainAxisSize.max,
+          children: <Widget>[
+            Container(
+              width: 20.0,
+              height: 20.0,
+              padding: EdgeInsets.all(5.0),
+              child: CircularProgressIndicator(strokeWidth: 2.0),
+            ),
+            Text('${r.getString("loading")}')
+          ],
+        ),
+        height: 30.0,
+      );
+    }
+    return Container(
+      height: 0.1,
+    );
+  }
+
+  get children{
+    List<Widget> _children = List<Widget>.from(widget.children);
+    //adding the loading text...
+    if(isListView) _children.add(indicator);
+    else _children.add(SliverList(delegate: SliverChildListDelegate([indicator])));
+    //return all elements including loading text
+    return _children;
+  }
+
+  Widget get paginator{
+    if(widget.itemBuilder!=null){
+      return ListView.builder(
+        reverse: widget.reverse,
+        itemBuilder: widget.itemBuilder,
+        itemCount: widget.itemCount,
+        controller: _scrollController,
+      );
+    }
+    if(isListView){
+      return ListView(
+        controller: _scrollController,
+        children: children,
+      );
+    }
+    return CustomScrollView(
+      controller: _scrollController,
+      slivers: children,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context){
+    return PullToRefresh(
+      processing: () async {
+        page = 0;
+        await widget.onPageChange(page);
+      },
+      postRefresh: () async {
+        await widget.onPageLoaded(page);
+      },
+      child: paginator
+    );
+  }
+
+}

lib/widgets/pull_to_refresh.dart

@@ -0,0 +1,53 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import 'stateful_widget.dart';
+
+
+class PullToRefresh extends AdharaStatefulWidget{
+
+  final Widget child;
+  final Function postRefresh;
+  final Function processing;
+
+  PullToRefresh({
+    Key key,
+    this.postRefresh,
+    @required this.processing,
+    @required this.child
+  }): super(key: key);
+
+  @override
+  _PullToRefreshState createState() => new _PullToRefreshState();
+
+}
+
+class _PullToRefreshState extends AdharaState<PullToRefresh>{
+
+  String get tag => "PullToRefresh";
+
+
+  final GlobalKey<RefreshIndicatorState> _refreshIndicatorKey = new GlobalKey<RefreshIndicatorState>();
+
+  Future<Null> _handleRefresh() async {
+//    AppDataInterface dataInterface = r.dataInterface;
+    if(widget.processing!=null) {
+      await widget.processing();
+    }
+//    await dataInterface.sync();
+    if(widget.postRefresh!=null){
+      widget.postRefresh();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context){
+    return RefreshIndicator(
+      key: _refreshIndicatorKey,
+      onRefresh: _handleRefresh,
+      child: widget.child,
+    );
+  }
+
+}

pubspec.lock

@@ -81,15 +81,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
-  socket_io:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: db2f26b8cd457f82830aa5598966fcaa5444da2f
-      url: "https://github.com/AlexeySemigradsky/socket_io.git"
-    source: git
-    version: "0.1.0"
   source_span:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: adhara
 description: Base framework for Flutter Apps with intense networking and data interactivity
-version: 0.1.55
+version: 0.1.56
 author: Rohit R. Abbadi <[email protected]>
 homepage: https://infitio.com