Merge branch 'shanika_dev' into Oshi

.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/debug_android_application.stamp

@@ -0,0 +1 @@
+{"inputs":["/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/app.dill","/home/sankha/gitFlutter/flutter/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart","/home/sankha/gitFlutter/flutter/bin/cache/artifacts/engine/linux-x64/const_finder.dart.snapshot","/home/sankha/gitFlutter/flutter/bin/cache/artifacts/engine/linux-x64/font-subset","/home/sankha/gitFlutter/flutter/bin/cache/artifacts/engine/linux-x64/vm_isolate_snapshot.bin","/home/sankha/gitFlutter/flutter/bin/cache/artifacts/engine/linux-x64/isolate_snapshot.bin","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/pubspec.yaml","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/assets/CupertinoIcons.ttf","/home/sankha/gitFlutter/flutter/bin/cache/artifacts/material_fonts/MaterialIcons-Regular.ttf","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.13/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.6.0/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.4.1/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.0.0/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.4/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_spinkit-4.1.2+1/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.12/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.1.3/LICENSE","/home/sankha/gitFlutter/flutter/bin/cache/pkg/sky_engine/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.15/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/LICENSE","/home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.6.1/LICENSE"],"outputs":["/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/vm_snapshot_data","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/isolate_snapshot_data","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/kernel_blob.bin","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/flutter_assets/fonts/MaterialIcons-Regular.ttf","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/flutter_assets/AssetManifest.json","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/flutter_assets/FontManifest.json","/home/sankha/Documents/CS/_UCSC/3rd Year/Group Project II (C-3)/e-Pharma org/pharma/build/app/intermediates/flutter/debug/flutter_assets/LICENSE"]}

.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/flutter_assets.d

@@ -0,0 +1 @@
+ /home/sankha/Documents/CS/_UCSC/3rd\ Year/Group\ Project\ II\ (C-3)/e-Pharma\ org/pharma/build/app/intermediates/flutter/debug/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf /home/sankha/Documents/CS/_UCSC/3rd\ Year/Group\ Project\ II\ (C-3)/e-Pharma\ org/pharma/build/app/intermediates/flutter/debug/flutter_assets/fonts/MaterialIcons-Regular.ttf /home/sankha/Documents/CS/_UCSC/3rd\ Year/Group\ Project\ II\ (C-3)/e-Pharma\ org/pharma/build/app/intermediates/flutter/debug/flutter_assets/AssetManifest.json /home/sankha/Documents/CS/_UCSC/3rd\ Year/Group\ Project\ II\ (C-3)/e-Pharma\ org/pharma/build/app/intermediates/flutter/debug/flutter_assets/FontManifest.json /home/sankha/Documents/CS/_UCSC/3rd\ Year/Group\ Project\ II\ (C-3)/e-Pharma\ org/pharma/build/app/intermediates/flutter/debug/flutter_assets/LICENSE:  /home/sankha/Documents/CS/_UCSC/3rd\ Year/Group\ Project\ II\ (C-3)/e-Pharma\ org/pharma/pubspec.yaml /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/assets/CupertinoIcons.ttf /home/sankha/gitFlutter/flutter/bin/cache/artifacts/material_fonts/MaterialIcons-Regular.ttf /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.13/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.6.0/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.4.1/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.0.0/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.4/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_spinkit-4.1.2+1/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.12/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.1.3/LICENSE /home/sankha/gitFlutter/flutter/bin/cache/pkg/sky_engine/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.15/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/LICENSE /home/sankha/gitFlutter/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.6.1/LICENSE

.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"image_picker","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+2\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+2\\\\","dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2020-06-24 18:07:34.737680","version":"1.17.0"}

.packages

@@ -0,0 +1,37 @@
+# Generated by pub on 2020-06-24 18:07:34.056504.
+archive:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.13/lib/
+args:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.6.0/lib/
+async:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.4.1/lib/
+boolean_selector:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.0.0/lib/
+charcode:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3/lib/
+collection:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12/lib/
+convert:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/
+crypto:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.4/lib/
+cupertino_icons:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/
+flutter:file:///C:/src/flutter/packages/flutter/lib/
+flutter_plugin_android_lifecycle:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/lib/
+flutter_spinkit:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_spinkit-4.1.2+1/lib/
+flutter_test:file:///C:/src/flutter/packages/flutter_test/lib/
+http:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.1/lib/
+http_parser:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/
+image:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.12/lib/
+image_picker:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+2/lib/
+image_picker_platform_interface:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker_platform_interface-1.1.0/lib/
+matcher:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6/lib/
+meta:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/lib/
+path:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/
+pedantic:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.9.0/lib/
+petitparser:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/lib/
+plugin_platform_interface:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/plugin_platform_interface-1.0.2/lib/
+quiver:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.1.3/lib/
+sky_engine:file:///C:/src/flutter/bin/cache/pkg/sky_engine/lib/
+source_span:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0/lib/
+stack_trace:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib/
+stream_channel:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/lib/
+string_scanner:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/
+term_glyph:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/
+test_api:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.15/lib/
+typed_data:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/
+vector_math:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib/
+xml:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.6.1/lib/
+pharma:lib/

android/app/build.gradle

@@ -22,18 +22,23 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 28
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.epharma"
+        applicationId "com.example.pharma"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
@@ -52,3 +57,7 @@ android {
 flutter {
     source '../..'
 }
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.epharma">
+    package="com.example.pharma">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.epharma">
+    package="com.example.pharma">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          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. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="epharma"
+        android:label="pharma"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

android/app/src/main/kotlin/com/example/pharma/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.example.pharma
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.epharma">
+    package="com.example.pharma">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/build.gradle

@@ -1,11 +1,13 @@
 buildscript {
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

android/pharma_android.iml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/app/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/app/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/app/src/main/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/app/src/main/libs" />
+        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/app/src/main/proguard_logs" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/app/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/app/src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Flutter for Android" level="project" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+  </component>
+</module>