Merge pull request #21 from VB10/feature/test-mockito

feature/test mockito

Author: VB10

asset/lang/en-US.json

@@ -27,6 +27,14 @@
  "tab4":"Style"
  },
  "subTitle":"Recommended"
+ },
+ "social":{
+ "cancel":"Cancel",
+ "next":"Next",
+ "search":"Search",
+ "findFriends":"Find Friends",
+ "follow":"Follow",
+ "following":"Following"
  }
  }
 }

lib/core/extension/network_exntension.dart

@@ -4,11 +4,11 @@ extension NetworkTypeExtension on HttpTypes {
  String get rawValue {
  switch (this) {
  case HttpTypes.GET:
- return "GET";
+ return 'GET';
  case HttpTypes.POST:
- return "POST";
+ return 'POST';
  default:
- throw "ERROR TYPE";
+ throw 'ERROR TYPE';
  }
  }
 }

lib/core/init/lang/language_manager.dart

@@ -9,7 +9,7 @@ class LanguageManager {
 
  LanguageManager._init();
 
- final enLocale = Locale("en", "US");
+ final enLocale = Locale('en', 'US');
 
  List<Locale> get supportedLocales => [enLocale];
 }

lib/core/init/lang/locale_keys.g.dart

@@ -27,6 +27,13 @@ abstract class LocaleKeys {
  static const home_build_tabbar = 'home.build.tabbar';
  static const home_build_subTitle = 'home.build.subTitle';
  static const home_build = 'home.build';
+ static const home_social_cancel = 'home.social.cancel';
+ static const home_social_next = 'home.social.next';
+ static const home_social_search = 'home.social.search';
+ static const home_social_findFriends = 'home.social.findFriends';
+ static const home_social_follow = 'home.social.follow';
+ static const home_social_following = 'home.social.following';
+ static const home_social = 'home.social';
  static const home = 'home';
 
 }

lib/core/init/theme/app_theme_light.dart

@@ -7,13 +7,13 @@ import 'light/light_theme_interface.dart';
 class AppThemeLight extends AppTheme with ILightTheme {
  static AppThemeLight _instance;
  static AppThemeLight get instance {
- if (_instance == null) _instance = AppThemeLight._init();
- return _instance;
+ return _instance ??= AppThemeLight._init();
  }
 
  AppThemeLight._init();
 
  // ThemeData get theme => redTheme;
+ @override
  ThemeData get theme => ThemeData(
  fontFamily: ApplicationConstants.FONT_FAMILY,
  colorScheme: _appColorScheme,
@@ -22,11 +22,19 @@ class AppThemeLight extends AppTheme with ILightTheme {
  inputDecorationTheme: InputDecorationTheme(
  focusColor: Colors.black12,
  labelStyle: TextStyle(),
- enabledBorder: UnderlineInputBorder(borderSide: BorderSide(color: Colors.red)),
- border: UnderlineInputBorder(borderSide: BorderSide(color: Colors.red)),
- focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: Colors.red))),
+ fillColor: Colors.white,
+ contentPadding: EdgeInsets.zero,
+ filled: true,
+ enabledBorder: OutlineInputBorder(borderSide: BorderSide(width: 0.3)),
+ // border: OutlineInputBorder(borderSide: BorderSide(width: 0.3)),
+ focusedBorder: OutlineInputBorder()),
  scaffoldBackgroundColor: Color(0xfff1f3f8),
  floatingActionButtonTheme: ThemeData.light().floatingActionButtonTheme.copyWith(),
+ buttonTheme: ThemeData.light().buttonTheme.copyWith(
+ colorScheme: ColorScheme.light(
+ onError: Color(0xffFF2D55),
+ ),
+ ),
  tabBarTheme: tabBarTheme,
  );
 
@@ -53,7 +61,7 @@ class AppThemeLight extends AppTheme with ILightTheme {
  secondary: Colors.green,
  secondaryVariant: colorSchemeLight.azure,
  surface: Colors.blue, //xx
- background: Colors.white,
+ background: Color(0xfff6f9fc), //xx
  error: Colors.red[900],
  onPrimary: Colors.greenAccent,
  onSecondary: Colors.black, //x

lib/main.dart

@@ -9,7 +9,7 @@ import 'core/init/navigation/navigation_route.dart';
 import 'core/init/navigation/navigation_service.dart';
 import 'core/init/notifier/provider_list.dart';
 import 'core/init/notifier/theme_notifer.dart';
-import 'view/home/build/feed/view/build_feed_view.dart';
+import 'view/home/social/view/social_view.dart';
 
 void main() {
  WidgetsFlutterBinding.ensureInitialized();
@@ -24,8 +24,9 @@ class MyApp extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
  return MaterialApp(
+ debugShowCheckedModeBanner: false,
  theme: Provider.of<ThemeNotifier>(context, listen: false).currentTheme,
- home: BuildFeedView(),
+ home: SocialView(),
  onGenerateRoute: NavigationRoute.instance.generateRoute,
  navigatorKey: NavigationService.instance.navigatorKey,
  );

lib/view/_product/_model/query/friend_query.dart

@@ -0,0 +1,6 @@
+class FriendQuery {
+ final int limit;
+ final String q;
+
+ FriendQuery({this.limit, this.q});
+}

lib/view/_product/_model/query/friend_query_enum.dart

@@ -0,0 +1,14 @@
+enum FriendQueryEnum { LIMIT, Q }
+
+extension FriendQueryEnumString on FriendQueryEnum {
+ String get rawValue {
+ switch (this) {
+ case FriendQueryEnum.LIMIT:
+ return 'limit';
+ case FriendQueryEnum.Q:
+ return 'q';
+ default:
+ throw Exception('Routes Not FouND');
+ }
+ }
+}

lib/view/_product/_utilty/thorottle_helper.dart

@@ -0,0 +1,35 @@
+import 'dart:async';
+
+class ThrottleStringHelper {
+ String _pastText;
+
+ final int _maxTimerValue = 5;
+ int _timerValue = 0;
+ ThrottleStringHelper() {
+ _onSetMaxValue();
+ }
+ void onDelayTouch(String text, Function(String text) onComplete) {
+ _pastText = text;
+ if (_timerValue == _maxTimerValue) {
+ Timer.periodic(Duration(milliseconds: 100), (timer) {
+ _timerValue--;
+
+ if (_timerValue == 0) {
+ onComplete(_pastText);
+ timer.cancel();
+ _onSetMaxValue();
+ }
+ });
+ } else {
+ _onSetMaxNearValue();
+ }
+ }
+
+ void _onSetMaxValue() {
+ _timerValue = _maxTimerValue;
+ }
+
+ void _onSetMaxNearValue() {
+ _timerValue = _maxTimerValue - 1;
+ }
+}

lib/view/_product/_widgets/animation/social_card_animation.dart

@@ -0,0 +1,32 @@
+import 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
+
+import '../../../home/social/model/social_user_model.dart';
+import '../../../home/social/view/social_view_detial.dart';
+
+class OpenContainerSocailWrapper extends StatelessWidget {
+ final ContainerTransitionType _transitionType = ContainerTransitionType.fade;
+ const OpenContainerSocailWrapper({
+ this.closedBuilder,
+ this.onClosed,
+ this.socialUser,
+ });
+
+ final OpenContainerBuilder closedBuilder;
+ final ClosedCallback<bool> onClosed;
+ final SocialUser socialUser;
+ @override
+ Widget build(BuildContext context) {
+ return OpenContainer<bool>(
+ transitionType: _transitionType,
+ openBuilder: (BuildContext context, VoidCallback _) {
+ return SocialUserViewDetail(
+ socialUser: socialUser,
+ );
+ },
+ onClosed: onClosed,
+ tappable: false,
+ closedBuilder: closedBuilder,
+ );
+ }
+}