diff --git a/android/app/build.gradle b/android/app/build.gradle index 293285c9..e5f46421 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,6 +27,12 @@ apply plugin: 'kotlin-android' apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +configurations.all { + resolutionStrategy { + force 'androidx.core:core-ktx:1.6.0' + } +} + android { compileSdkVersion 31 @@ -55,7 +61,7 @@ android { signingConfigs { config{ storeFile file('key') - keyAlias 'HMG' + keyAlias 'hmg' storePassword 'HmGsa123' keyPassword 'HmGsa123' } @@ -63,9 +69,11 @@ android { buildTypes { debug { + debuggable true signingConfig signingConfigs.config } release { + debuggable false signingConfig signingConfigs.config minifyEnabled true shrinkResources true diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index cfab1fd6..4a6fbc03 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -24,4 +24,16 @@ -keep class io.flutter.plugins.** { *; } -dontwarn io.flutter.embedding.** -keep class com.huawei.hms.flutter.** { *; } --repackageclasses \ No newline at end of file +-repackageclasses + +## Flutter WebRTC +-keep class com.cloudwebrtc.webrtc.** { *; } +-keep class org.webrtc.** { *; } + +## Flutter OpenTok +-keep class com.opentok.android.** { *; } +-keep class com.opentok.otc.** { *; } +-keep class org.otwebrtc.** { *; } + +-dontwarn com.opentok.android.** +-dontwarn com.opentok.otc.** \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7089bdc6..5d6bb39c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,5 @@ - - + + - + - + - + + android:exported="true" + android:enabled="true" /> = Build.VERSION_CODES.O) { +// val mChannel = NotificationChannel("video_call_noti", "video call", NotificationManager.IMPORTANCE_HIGH) +// val soundUri = Uri.parse("android.resource://" + getApplicationContext() +// .getPackageName() + "/" + R.raw.alert) +// System.out.println("soundUri"); +// System.out.println("soundUri: $soundUri"); +// System.out.println("soundUri : ${soundUri.path}"); +// val att = AudioAttributes.Builder() +// .setUsage(AudioAttributes.USAGE_NOTIFICATION) +// .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH) +// .build(); +// mChannel.setSound(soundUri , att) +// mChannel.description = "Video Call Notifications" +// val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager +// notificationManager.createNotificationChannel(mChannel) +// } - -// val d1 = Logs.list(this) -// val d2 = Logs.raw(this) -// val d3 = Logs.RegisterGeofence.list(this) -// val d4 = Logs.RegisterGeofence.raw(this) -// val d5 = Logs.GeofenceEvent.list(this) -// val d6 = Logs.GeofenceEvent.raw(this) +// val time = timeToMillis("04:00:00", "HH:mm:ss") } diff --git a/lib/widgets/charts/sampleChart.dart b/lib/widgets/charts/sampleChart.dart new file mode 100644 index 00000000..e69de29b diff --git a/lib/widgets/charts/show_chart.dart b/lib/widgets/charts/show_chart.dart index 0e89238d..49273611 100644 --- a/lib/widgets/charts/show_chart.dart +++ b/lib/widgets/charts/show_chart.dart @@ -145,6 +145,12 @@ class ShowChart extends StatelessWidget { interval: _fetchLeftTileInterval(), margin: 12, ), + topTitles: SideTitles( + showTitles: false + ), + rightTitles: SideTitles( + showTitles: false + ), ), borderData: FlBorderData( show: true, @@ -156,12 +162,12 @@ class ShowChart extends StatelessWidget { left: BorderSide( color: Colors.black, ), - right: BorderSide( - color: Colors.black, - ), - top: BorderSide( - color: Colors.transparent, - ), + // right: BorderSide( + // color: Colors.black, + // ), + // top: BorderSide( + // color: Colors.transparent, + // ), ), ), minX: minX,