Merge pull request #4 from Thesmader/development

v0.1.0+1

.gitignore

@@ -19,3 +19,7 @@ doc/api/
 *.js_
 *.js.deps
 *.js.map
+
+#keystore
+gogrocy.jks
+gogrocy.jks.old

gogrocy/.gitignore

@@ -30,6 +30,7 @@
 .pub/
 /build/
 /android/app/google-services.json
+/android/key.properties
 
 
 # Web related

gogrocy/android/.gitignore

@@ -4,4 +4,5 @@ gradle-wrapper.jar
 /gradlew
 /gradlew.bat
 /local.properties
+/key.properties
 GeneratedPluginRegistrant.java

gogrocy/android/app/build.gradle

@@ -18,13 +18,20 @@ if (flutterVersionCode == null) {
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = '0.1.0'
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 28
 
@@ -46,11 +53,21 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
 }

gogrocy/android/app/src/main/AndroidManifest.xml

@@ -5,9 +5,10 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
+    <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="gogrocy"
+        android:label="GoGrocy"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

gogrocy/android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <!--<item android:drawable="@android:color/white" />-->
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@mipmap/gogrocy" />
+    </item>
 </layer-list>

gogrocy/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

gogrocy/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

gogrocy/android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#005E20</color>
+</resources>

gogrocy/android/build.gradle

@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.3.0'
     }
 }
 

gogrocy/android/gradle.properties

@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
+extra-gen-snapshot-options=--obfuscate

gogrocy/lib/core/enums/viewstate.dart

@@ -0,0 +1 @@
+enum ViewState { Idle, Busy }

gogrocy/lib/core/models/product.dart

@@ -0,0 +1,48 @@
+class Product {
+    String id;
+    String name;
+    String price;
+    String quantity;
+    String unit;
+    String description;
+    String timesSold;
+    String image;
+    String category;
+
+    Product(
+        {this.id,
+            this.name,
+            this.price,
+            this.quantity,
+            this.unit,
+            this.description,
+            this.timesSold,
+            this.image,
+            this.category});
+
+    Product.fromJson(Map<String, dynamic> json) {
+        id = json['id'];
+        name = json['name'];
+        price = json['price'];
+        quantity = json['quantity'];
+        unit = json['unit'];
+        description = json['description'];
+        timesSold = json['times_sold'];
+        image = json['image'];
+        category = json['category'];
+    }
+
+    Map<String, dynamic> toJson() {
+        final Map<String, dynamic> data = new Map<String, dynamic>();
+        data['id'] = this.id;
+        data['name'] = this.name;
+        data['price'] = this.price;
+        data['quantity'] = this.quantity;
+        data['unit'] = this.unit;
+        data['description'] = this.description;
+        data['times_sold'] = this.timesSold;
+        data['image'] = this.image;
+        data['category'] = this.category;
+        return data;
+    }
+}

gogrocy/lib/core/models/user.dart

@@ -0,0 +1 @@
+class User {}

gogrocy/lib/core/services/api.dart

@@ -0,0 +1,40 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:gogrocy/core/models/product.dart';
+import 'package:http/http.dart' as http;
+
+const String baseUrl = "https://gogrocy.in/api/";
+
+class Apis {
+  static String allProducts = baseUrl + "getProducts";
+  static String singleProduct = baseUrl + "getProduct";
+
+  Future<List<Product>> getAllProducts() async {
+    var client = new http.Client();
+    bool connectionState = await checkStatus();
+    if (connectionState) //TODO: Add a proper else return
+    {
+      var products = List<Product>();
+      var response = await client.post(allProducts);
+      var parsed = json.decode(response.body) as List<dynamic>;
+      for (var product in parsed) {
+        products.add(Product.fromJson(product));
+      }
+      return products;
+    } else
+      (print("Network failure"));
+  }
+
+  Future<bool> checkStatus() async {
+    try {
+      final result = await InternetAddress.lookup('google.com');
+      if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) {
+        print('connected');
+        return true;
+      }
+    } on SocketException catch (_) {
+      print('not connected');
+      return false;
+    }
+  }
+}

gogrocy/lib/core/services/authentication_service.dart

@@ -0,0 +1,69 @@
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:flutter/cupertino.dart';
+
+class AuthenticationService {
+  final firebaseInstance = FirebaseAuth.instance;
+  String verificationId;
+
+  Future verifyPhoneNumber(BuildContext context, String phoneNumber) async {
+    final PhoneVerificationCompleted verificationCompleted =
+        (AuthCredential credential) {
+      print('Verification Complete');
+      signInWithNumber(context, credential);
+    };
+
+    final PhoneVerificationFailed verificationFailed =
+        (AuthException exception) {
+      print(exception.message);
+    };
+
+    final PhoneCodeSent phoneCodeSent =
+        (String verificationId, [int forceResendingToken]) async {
+      this.verificationId = verificationId;
+      print('Code sent: $verificationId');
+    };
+
+    final PhoneCodeAutoRetrievalTimeout retrievalTimeout =
+        (String verificationId) {
+      print('Retrieval Timeout: $verificationId');
+    };
+
+    try {
+      await firebaseInstance.verifyPhoneNumber(
+          phoneNumber: phoneNumber,
+          timeout: Duration(seconds: 60),
+          verificationCompleted: verificationCompleted,
+          verificationFailed: verificationFailed,
+          codeSent: phoneCodeSent,
+          codeAutoRetrievalTimeout: retrievalTimeout);
+      FirebaseUser currentUser = await firebaseInstance.currentUser();
+      return currentUser != null;
+    } catch (e) {
+      return e.message;
+    }
+  }
+
+  signInWithNumber(BuildContext context, AuthCredential credential) async {
+    FirebaseUser user =
+        (await firebaseInstance.signInWithCredential(credential)).user;
+    FirebaseUser currentUser = await firebaseInstance.currentUser();
+    assert(user.uid == currentUser.uid);
+  }
+
+  Future signInWithOtp(String verificationId, String otp) async {
+    try {
+      AuthCredential credential = PhoneAuthProvider.getCredential(
+          verificationId: verificationId, smsCode: otp);
+      FirebaseUser currentUser =
+          (await firebaseInstance.signInWithCredential(credential)).user;
+      return currentUser != null;
+    } catch (e) {
+      return e.message;
+    }
+  }
+
+  Future<bool> isUserLoggedIn() async {
+    var user = await firebaseInstance.currentUser();
+    return user != null;
+  }
+}

gogrocy/lib/core/services/bottom_appbar_provider.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+
+class BottomNavBarProvider with ChangeNotifier{
+  int _currentIndex=0;
+
+  get currentIndex=> _currentIndex;
+
+  set currentIndex(int index){
+    print("Changed index to $index");
+    _currentIndex=index;
+    notifyListeners();
+  }
+
+}

gogrocy/lib/core/services/navigation_service.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+
+class NavigationService {
+  static final GlobalKey<NavigatorState> navigatorKey =
+      GlobalKey<NavigatorState>();
+
+  Future<dynamic> navigateTo(String routeName, {dynamic arguments}) async {
+    return navigatorKey.currentState.pushNamed(routeName, arguments: arguments);
+  }
+
+  bool goBack() {
+    return navigatorKey.currentState.pop();
+  }
+}

gogrocy/lib/core/services/shared_prefs.dart

@@ -0,0 +1,23 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+class SharedPrefs {
+  SharedPreferences _sharedPrefs;
+
+  SharedPrefs() {
+    initSharedPrefs();
+  }
+
+  initSharedPrefs() async{
+    _sharedPrefs=await SharedPreferences.getInstance();
+  }
+
+  setJWT(String s) async{
+    _sharedPrefs.setString("jwt",s);
+  }
+
+  Future<String> getJWT() async{
+    String jwt =  _sharedPrefs.getString("jwt");
+    return jwt;
+  }
+
+}

gogrocy/lib/core/viewModels/allProducts_model.dart

@@ -0,0 +1,19 @@
+import 'package:gogrocy/core/enums/viewstate.dart';
+import 'package:gogrocy/core/models/product.dart';
+import 'package:gogrocy/core/services/api.dart';
+import 'package:gogrocy/core/viewModels/base_model.dart';
+import 'package:gogrocy/service_locator.dart';
+
+class AllProductsModel extends BaseModel{
+  Apis _apis=locator<Apis>();
+
+  List<Product> allProducts;
+
+  Future getAllProducts() async{
+    setState(ViewState.Busy);
+    allProducts=await _apis.getAllProducts();
+    setState(ViewState.Idle);
+  }
+
+
+}