Revert "Merge branch 'shanika_dev' into Oshi"

This reverts commit ccc5164, reversing changes made to 80a553e.
e-Pharma · Jul 4, 2020 · c7d77d9 · c7d77d9
1 parent ccc5164
commit c7d77d9
Show file tree

Hide file tree

Showing 654 changed files with 682 additions and 38,023 deletions.
diff --git a/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/.filecache b/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/.filecache
diff --git a/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/app.dill b/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/app.dill
diff --git a/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/debug_android_application.stamp b/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/debug_android_application.stamp
diff --git a/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/flutter_assets.d b/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/flutter_assets.d
diff --git a/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/kernel_snapshot.d b/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/kernel_snapshot.d
diff --git a/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/kernel_snapshot.stamp b/.dart_tool/flutter_build/a3e1a1f41a16b8745020767ab1319053/kernel_snapshot.stamp
diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
diff --git a/.packages b/.packages
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -22,23 +22,18 @@ 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.pharma"
+        applicationId "com.example.epharma"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
@@ -57,7 +52,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.pharma">
+    package="com.example.epharma">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.pharma">
+    package="com.example.epharma">
     <!-- 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="pharma"
+        android:label="epharma"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

diff --git a/android/app/src/main/kotlin/com/example/pharma/MainActivity.kt b/android/app/src/main/kotlin/com/example/pharma/MainActivity.kt
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.pharma">
+    package="com.example.epharma">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,13 +1,11 @@
 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"
     }
 }
 

diff --git a/android/pharma_android.iml b/android/pharma_android.iml