Merged in release/15.2.0 (pull request #30)

Release/15.2.0

Author: mstanic-shake

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 15.2.0
+
+Upgraded inspect screen
+
 # 15.1.0
 
 Real-time chat

README.md

@@ -27,14 +27,33 @@ Flutter plugin for [bug reporting](https://www.shakebugs.com).
 Add Shake to your `pubspec.yaml` file.
 ```yaml
 dependencies:
-      shake_flutter: ^15.1.0
+      shake_flutter: ^15.2.0
 ```
 
 Install package by running command in terminal.
 ```bash
 flutter packages get
 ```
 
+### Set compileSdkVersion version in the build.gradle file
+
+Since Shake requires `compileSdkVersion` 29 or greater, verify that `compileSdkVersion` is correctly set in the */android/app/build.gradle* file:
+
+```groovy title="build.gradle"
+android {
+    // highlight-next-line
+    compileSdkVersion 29
+
+    defaultConfig {
+        applicationId "com.shakebugs.flutter.example"
+        minSdkVersion 24
+        targetSdkVersion 29
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+    }
+}
+```
+
 ### Start Shake
 
 Add Shake import.

android/build.gradle

@@ -40,5 +40,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api "$System.env.ANDROID_DEPENDENCY:15.1.+"
+    api "$System.env.ANDROID_DEPENDENCY:15.2.+"
 }

android/src/main/kotlin/com/shakebugs/flutter/ShakePlugin.kt

@@ -61,7 +61,8 @@ class ShakePlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         when (call.method) {
             "start" -> start(call)
             "show" -> show(call)
-            "setEnabled" -> setEnabled(call)
+            "isUserFeedbackEnabled" -> isUserFeedbackEnabled(result)
+            "setUserFeedbackEnabled" -> setUserFeedbackEnabled(call)
             "setEnableBlackBox" -> setEnableBlackBox(call)
             "isEnableBlackBox" -> isEnableBlackBox(result)
             "setEnableActivityHistory" -> setEnableActivityHistory(call)
@@ -141,13 +142,18 @@ class ShakePlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         }
     }
 
-    private fun setEnabled(call: MethodCall) {
+    private fun setUserFeedbackEnabled(call: MethodCall) {
         val enabled: Boolean? = call.argument("enabled")
         enabled?.let {
-            Shake.setEnabled(enabled)
+            Shake.setUserFeedbackEnabled(enabled)
         }
     }
 
+    private fun isUserFeedbackEnabled(result: Result) {
+        val enabled: Boolean = Shake.isUserFeedbackEnabled()
+        result.success(enabled)
+    }
+
     private fun setEnableBlackBox(call: MethodCall) {
         val enabled: Boolean? = call.argument("enabled")
         enabled?.let {

example/.scripts/run-dev.sh

@@ -9,10 +9,10 @@ PODS:
     - Flutter
   - path_provider (0.0.1):
     - Flutter
-  - Shake-Staging (15.1.0-rc.1447)
+  - Shake-Staging (15.2.0-rc.1505)
   - shake_flutter (0.0.1):
     - Flutter
-    - Shake-Staging (~> 15.1.0-rc.1447)
+    - Shake-Staging (~> 15.2.0-rc)
   - Toast (4.0.0)
   - url_launcher (0.0.1):
     - Flutter
@@ -54,8 +54,8 @@ SPEC CHECKSUMS:
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de
-  Shake-Staging: 1e48bab5826b8192d7c0a3917f3e1e7d44d6b02e
-  shake_flutter: f21bd5c31b35e9b3963146422751633b596672bb
+  Shake-Staging: c20bf6e9d2cfc7da6c219946809fd6d7a4720b64
+  shake_flutter: 2df7941cc763527410532da465476653135e819b
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649
 

example/.scripts/run-prd.sh

@@ -31,10 +31,10 @@ class Home extends StatefulWidget {
 class _HomeState extends State<Home> {
   NetworkTester networkTester = DartTester();
 
+  bool? userFeedbackEnabled = false;
   bool? shakeInvokingEnabled = false;
   bool? buttonInvokingEnabled = false;
   bool? screenshotInvokingEnabled = false;
-  bool? shakeEnabled = false;
   bool? blackboxEnabled = false;
   bool? inspectScreenEnabled = false;
   bool? activityHistoryEnabled = false;
@@ -57,10 +57,10 @@ class _HomeState extends State<Home> {
   }
 
   void _initialize() async {
+    final userFeedbackEnabled = await Shake.isUserFeedbackEnabled();
     final shakeInvokingEnabled = await Shake.isInvokeShakeOnShakeDeviceEvent();
     final buttonInvokingEnabled = await Shake.isShowFloatingReportButton();
     final screenshotInvokingEnabled = await Shake.isInvokeShakeOnScreenshot();
-    final shakeEnabled = true; // Not provided by native SDK
     final blackboxEnabled = await Shake.isEnableBlackBox();
     final inspectScreenEnabled = await Shake.isEnableInspectScreen();
     final activityHistoryEnabled = await Shake.isEnableActivityHistory();
@@ -73,10 +73,10 @@ class _HomeState extends State<Home> {
     final screenshotIncluded = await Shake.isScreenshotIncluded();
 
     setState(() {
+      this.userFeedbackEnabled = userFeedbackEnabled;
       this.shakeInvokingEnabled = shakeInvokingEnabled;
       this.buttonInvokingEnabled = buttonInvokingEnabled;
       this.screenshotInvokingEnabled = screenshotInvokingEnabled;
-      this.shakeEnabled = shakeEnabled;
       this.blackboxEnabled = blackboxEnabled;
       this.inspectScreenEnabled = inspectScreenEnabled;
       this.activityHistoryEnabled = activityHistoryEnabled;
@@ -181,9 +181,9 @@ class _HomeState extends State<Home> {
                       children: [
                         Header('Options'),
                         Toggle(
-                          'Enabled',
-                          shakeEnabled!,
-                          _onEnableShakeToggle,
+                          'User feedback',
+                          userFeedbackEnabled!,
+                          _onUserFeedbackToggle,
                         ),
                         Toggle(
                           'Blackbox',
@@ -381,11 +381,11 @@ class _HomeState extends State<Home> {
     Shake.show();
   }
 
-  void _onEnableShakeToggle(enabled) {
+  void _onUserFeedbackToggle(enabled) {
     setState(() {
-      shakeEnabled = enabled;
+      userFeedbackEnabled = enabled;
     });
-    Shake.setEnabled(enabled);
+    Shake.setUserFeedbackEnabled(enabled);
   }
 
   void _onShakeInvokingToggle(enabled) {

example/.scripts/run-stg.sh

@@ -30,8 +30,10 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         [self start:call result:result];
     } else if([@"show" isEqualToString:call.method]) {
         [self show:call result:result];
-    } else if([@"setEnabled" isEqualToString:call.method]) {
-        [self setEnabled:call result:result];
+    } else if([@"setUserFeedbackEnabled" isEqualToString:call.method]) {
+        [self setUserFeedbackEnabled:call result:result];
+    } else if([@"isUserFeedbackEnabled" isEqualToString:call.method]) {
+        [self isUserFeedbackEnabled:call result:result];
     } else if([@"setEnableActivityHistory" isEqualToString:call.method]) {
         [self setEnableActivityHistory:call result:result];
     } else if([@"isEnableActivityHistory" isEqualToString:call.method]) {
@@ -150,24 +152,31 @@ - (void)show:(FlutterMethodCall*) call result:(FlutterResult)result {
     result(nil);
 }
 
-- (void)setEnabled:(FlutterMethodCall*) call result:(FlutterResult)result {
-    BOOL shakeEnabled = [call.arguments[@"enabled"] boolValue];
-    SHKShake.isPaused = !shakeEnabled;
-    
+- (void)setUserFeedbackEnabled:(FlutterMethodCall*) call result:(FlutterResult)result {
+    BOOL enabled = [call.arguments[@"enabled"] boolValue];
+    SHKShake.configuration.isUserFeedbackEnabled = enabled;
+
     result(nil);
 }
 
+- (void)isUserFeedbackEnabled:(FlutterMethodCall*) call result:(FlutterResult)result {
+    BOOL isEnabled = SHKShake.configuration.isUserFeedbackEnabled;
+    NSNumber *isEnabledObj = [NSNumber numberWithBool:isEnabled];
+
+    result(isEnabledObj);
+}
+
 - (void)setEnableActivityHistory:(FlutterMethodCall*) call result:(FlutterResult)result {
     BOOL enableActivityHistory = [call.arguments[@"enabled"] boolValue];
     SHKShake.configuration.isActivityHistoryEnabled = enableActivityHistory;
-    
+
     result(nil);
 }
 
 - (void)isEnableActivityHistory:(FlutterMethodCall*) call result:(FlutterResult)result {
     BOOL isEnableActivityHistory = SHKShake.configuration.isActivityHistoryEnabled;
     NSNumber *isActivityHistoryEnabledObj = [NSNumber numberWithBool:isEnableActivityHistory];
-    
+
     result(isActivityHistoryEnabledObj);
 }
 

example/ios/Podfile.lock

@@ -20,5 +20,5 @@ Shake SDK wrapper
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
   s.swift_version = '5.0'
-  s.dependency "#{ENV['IOS_DEPENDENCY']}", "~> 15.1.0-rc"
+  s.dependency "#{ENV['IOS_DEPENDENCY']}", "~> 15.2.0-rc"
 end

example/lib/ui/main/home.dart

@@ -42,16 +42,18 @@ class Shake {
     });
   }
 
-  /// Enables or disables Shake.
-  ///
-  /// If false, Shake immediately stops tracking data
-  /// and Shake screen invoking becomes disabled.
-  static void setEnabled(bool enabled) async {
-    await _channel.invokeMethod('setEnabled', {
+  /// Sets if user feedback is enabled.
+  static void setUserFeedbackEnabled(bool enabled) async {
+    await _channel.invokeMethod('setUserFeedbackEnabled', {
       'enabled': enabled,
     });
   }
 
+  /// Checks if user feedback is enabled.
+  static Future<bool?> isUserFeedbackEnabled() async {
+    return await _channel.invokeMethod('isUserFeedbackEnabled');
+  }
+
   /// Sets if black-box is enabled.
   static void setEnableBlackBox(bool enabled) async {
     await _channel.invokeMethod('setEnableBlackBox', {