Merge branch 'develop' into main

songpola · Jan 19, 2021 · 1d5125d · 1d5125d
2 parents 72e6809 + 8cd5b8a
commit 1d5125d
Show file tree

Hide file tree

Showing 43 changed files with 547 additions and 265 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -48,12 +48,20 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildToolsVersion '30.0.3'
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.github.songpola.flutter.chonchai_chana">
    <application
-        android:label="chonchai_chana"
+        android:label="ชลชายชนะ"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/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="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFFFF</color>
+</resources>
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.21'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon Jan 18 13:09:57 ICT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
diff --git a/assets/icons/DrCorona1.svg b/assets/icons/DrCorona1.svg
diff --git a/assets/icons/DrCorona2.svg b/assets/icons/DrCorona2.svg
diff --git a/assets/icons/Intersection.svg b/assets/icons/Intersection.svg
diff --git a/assets/icons/dropdown.svg b/assets/icons/dropdown.svg
diff --git a/assets/icons/forward.svg b/assets/icons/forward.svg
diff --git a/assets/icons/map.svg b/assets/icons/map.svg
diff --git a/assets/icons/maps-and-flags.svg b/assets/icons/maps-and-flags.svg
diff --git a/assets/icons/menu.svg b/assets/icons/menu.svg
diff --git a/assets/icons/shape_small.svg b/assets/icons/shape_small.svg
diff --git a/assets/images/cough.png b/assets/images/cough.png
diff --git a/assets/images/fever.png b/assets/images/fever.png
diff --git a/assets/images/headache.png b/assets/images/headache.png
diff --git a/assets/images/map.png b/assets/images/map.png
diff --git a/assets/images/virus.png b/assets/images/virus.png
diff --git a/assets/images/wash_hands.png b/assets/images/wash_hands.png
diff --git a/assets/images/wear_mask.png b/assets/images/wear_mask.png
diff --git a/assets/launcher/icon.png b/assets/launcher/icon.png
diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart
diff --git a/integration_test/driver.dart b/integration_test/driver.dart
diff --git a/lib/constants.dart b/lib/constants.dart
@@ -0,0 +1,5 @@
+import 'package:flutter/material.dart';
+
+// Colors
+const kBackgroundColor = Colors.white;
+final kShadowColor = Color(0xFF888888).withOpacity(0.5);