clean states class

@@ -11,7 +11,10 @@ part 'rx_num.dart';
 RxInterface getObs;
 RxInterface getObs;
 
 
 /// Base Rx class that manages all the stream logic for any Type.
 /// Base Rx class that manages all the stream logic for any Type.
-class _RxImpl<T> implements RxInterface<T> {
+abstract class _RxImpl<T> implements RxInterface<T> {
+  _RxImpl(T initial) {
+    _value = initial;
+  }
   StreamController<T> subject = StreamController<T>.broadcast();
   StreamController<T> subject = StreamController<T>.broadcast();
   final _subscriptions = HashMap<Stream<T>, StreamSubscription>();
   final _subscriptions = HashMap<Stream<T>, StreamSubscription>();
 
 
@@ -183,9 +186,7 @@ class _RxImpl<T> implements RxInterface<T> {
 
 
 /// Rx class for `bool` Type.
 /// Rx class for `bool` Type.
 class RxBool extends _RxImpl<bool> {
 class RxBool extends _RxImpl<bool> {
-  RxBool([bool initial]) {
-    _value = initial;
-  }
+  RxBool([bool initial]) : super(initial);
 
 
   bool operator &(bool other) => other && value;
   bool operator &(bool other) => other && value;
 
 
@@ -210,9 +211,7 @@ class RxBool extends _RxImpl<bool> {
 
 
 /// Rx class for `String` Type.
 /// Rx class for `String` Type.
 class RxString extends _RxImpl<String> {
 class RxString extends _RxImpl<String> {
-  RxString([String initial]) {
-    _value = initial;
-  }
+  RxString([String initial]) : super(initial);
 
 
   String operator +(String val) => _value + val;
   String operator +(String val) => _value + val;
 }
 }
@@ -222,9 +221,7 @@ class RxString extends _RxImpl<String> {
 /// For example, any custom "Model" class, like User().obs will use `Rx` as
 /// For example, any custom "Model" class, like User().obs will use `Rx` as
 /// wrapper.
 /// wrapper.
 class Rx<T> extends _RxImpl<T> {
 class Rx<T> extends _RxImpl<T> {
-  Rx([T initial]) {
-    _value = initial;
-  }
+  Rx([T initial]) : super(initial);
 
 
   // TODO: Look for a way to throw the Exception with proper details when the
   // TODO: Look for a way to throw the Exception with proper details when the
   // value [T] doesn't implement toJson().
   // value [T] doesn't implement toJson().
@@ -233,37 +230,26 @@ class Rx<T> extends _RxImpl<T> {
 }
 }
 
 
 /// It's Experimental class, the Api can be change
 /// It's Experimental class, the Api can be change
-abstract class RxState<T> extends RxInterface<T> {
-  RxState(T initial) {
-    _value = initial;
-  }
+abstract class RxState<T> extends _RxImpl<T> {
+  RxState(T initial) : super(initial);
 
 
-  T _value;
-
-  StreamController<T> subject = StreamController<T>.broadcast();
-  final _subscriptions = HashMap<Stream<T>, StreamSubscription>();
+  @protected
+  void refresh() {
+    subject.add(_value);
+  }
 
 
-  bool get canUpdate => _subscriptions.isNotEmpty;
+  @protected
+  void update(void fn(T val)) {
+    fn(_value);
+    subject.add(_value);
+  }
 
 
   @protected
   @protected
   T call([T v]) {
   T call([T v]) {
-    if (v != null) {
-      value = v;
-    }
+    if (v != null) value = v;
     return value;
     return value;
   }
   }
 
 
-  bool firstRebuild = true;
-
-  void addListener(Stream<T> rxGetx) {
-    if (_subscriptions.containsKey(rxGetx)) {
-      return;
-    }
-    _subscriptions[rxGetx] = rxGetx.listen((data) {
-      subject.add(data);
-    });
-  }
-
   @protected
   @protected
   set value(T val) {
   set value(T val) {
     if (_value == val && !firstRebuild) return;
     if (_value == val && !firstRebuild) return;
@@ -272,24 +258,6 @@ abstract class RxState<T> extends RxInterface<T> {
     subject.add(_value);
     subject.add(_value);
   }
   }
 
 
-  /// Returns the current [value]
-  T get value {
-    if (getObs != null) {
-      getObs.addListener(subject.stream);
-    }
-    return _value;
-  }
-
-  Stream<T> get stream => subject.stream;
-
-  StreamSubscription<T> listen(void Function(T) onData,
-          {Function onError, void Function() onDone, bool cancelOnError}) =>
-      stream.listen(onData, onError: onError, onDone: onDone);
-
-  void bindStream(Stream<T> stream) {
-    _subscriptions[stream] = stream.listen((va) => value = va);
-  }
-
   @protected
   @protected
   void change(T newState) {
   void change(T newState) {
     if (newState != _value) {
     if (newState != _value) {

 part of 'rx_impl.dart';
 part of 'rx_impl.dart';
 
 
 /// Base Rx class for all num Rx's.
 /// Base Rx class for all num Rx's.
-class _BaseRxNum<T extends num> extends _RxImpl<T> {
+abstract class _BaseRxNum<T extends num> extends _RxImpl<T> {
+  _BaseRxNum(T initial) : super(initial);
+
   /// Addition operator. */
   /// Addition operator. */
 
 
   /// Multiplication operator.
   /// Multiplication operator.
@@ -267,6 +269,8 @@ class _BaseRxNum<T extends num> extends _RxImpl<T> {
 }
 }
 
 
 class RxNum extends _BaseRxNum<num> {
 class RxNum extends _BaseRxNum<num> {
+  RxNum(num initial) : super(initial);
+
   num operator +(num other) {
   num operator +(num other) {
     value += other;
     value += other;
     return value;
     return value;
@@ -280,9 +284,7 @@ class RxNum extends _BaseRxNum<num> {
 }
 }
 
 
 class RxDouble extends _BaseRxNum<double> {
 class RxDouble extends _BaseRxNum<double> {
-  RxDouble([double initial]) {
-    value = initial;
-  }
+  RxDouble([double initial]) : super(initial);
 
 
   /// Addition operator.
   /// Addition operator.
   RxDouble operator +(num other) {
   RxDouble operator +(num other) {
@@ -392,9 +394,7 @@ class RxDouble extends _BaseRxNum<double> {
 }
 }
 
 
 class RxInt extends _BaseRxNum<int> {
 class RxInt extends _BaseRxNum<int> {
-  RxInt([int initial]) {
-    value = initial;
-  }
+  RxInt([int initial]) : super(initial);
 
 
   /// Addition operator.
   /// Addition operator.
   RxInt operator +(int other) {
   RxInt operator +(int other) {