Skip to content

Commit d5e3bdf

Browse files
authored
Merge pull request #61 from nimblehq/release/0.3.0
[Release] 0.3.0
2 parents 3382c2e + dd86778 commit d5e3bdf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1439
-72
lines changed

assets/images/2.0x/next.png

548 Bytes
Loading

assets/images/3.0x/next.png

683 Bytes
Loading

assets/images/dummy_avatar.png

2.98 KB
Loading

assets/images/dummy_background.png

234 KB
Loading

assets/images/next.png

314 Bytes
Loading

ios/Podfile.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PODS:
22
- Flutter (1.0.0)
33
- flutter_config (0.0.1):
44
- Flutter
5+
- flutter_secure_storage (6.0.0):
6+
- Flutter
57
- integration_test (0.0.1):
68
- Flutter
79
- package_info_plus (0.4.5):
@@ -12,6 +14,7 @@ PODS:
1214
DEPENDENCIES:
1315
- Flutter (from `Flutter`)
1416
- flutter_config (from `.symlinks/plugins/flutter_config/ios`)
17+
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
1518
- integration_test (from `.symlinks/plugins/integration_test/ios`)
1619
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
1720
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
@@ -21,6 +24,8 @@ EXTERNAL SOURCES:
2124
:path: Flutter
2225
flutter_config:
2326
:path: ".symlinks/plugins/flutter_config/ios"
27+
flutter_secure_storage:
28+
:path: ".symlinks/plugins/flutter_secure_storage/ios"
2429
integration_test:
2530
:path: ".symlinks/plugins/integration_test/ios"
2631
package_info_plus:
@@ -31,6 +36,7 @@ EXTERNAL SOURCES:
3136
SPEC CHECKSUMS:
3237
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
3338
flutter_config: 2226c1df19c78fe34a05eb7f1363445f18e76fc1
39+
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
3440
integration_test: 13825b8a9334a850581300559b8839134b124670
3541
package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
3642
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6

lib/api/response_decoder.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import 'package:japx/japx.dart';
22

33
class ResponseDecoder {
4-
static Map<String, dynamic> decode(Map<String, dynamic> json) {
4+
static Map<String, dynamic> decodeData(Map<String, dynamic> json) {
55
return Japx.decode(json)['data'];
66
}
7+
8+
static Map<String, dynamic> decode(Map<String, dynamic> json) =>
9+
Japx.decode(json);
710
}

lib/api/survey_api_service.dart

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import 'package:dio/dio.dart';
2+
import 'package:retrofit/http.dart';
3+
import 'package:survey_flutter/model/response/surveys_container_response.dart';
4+
5+
part 'survey_api_service.g.dart';
6+
7+
@RestApi()
8+
abstract class SurveyApiService {
9+
factory SurveyApiService(Dio dio, {String baseUrl}) = _SurveyApiService;
10+
11+
@GET('/surveys')
12+
Future<SurveysContainerResponse> getSurveys(
13+
@Query('page[number]') int pageNumber,
14+
@Query('page[size]') int pageSize,
15+
);
16+
}

lib/di/provider/dio_provider.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'package:dio/dio.dart';
22
import 'package:flutter/foundation.dart';
33
import 'package:survey_flutter/di/interceptor/app_interceptor.dart';
4+
import 'package:survey_flutter/env.dart';
45

5-
const String headerContentType = 'Content-Type';
6-
const String defaultContentType = 'application/json; charset=utf-8';
6+
const String _headerContentType = 'Content-Type';
7+
const String _defaultContentType = 'application/json; charset=utf-8';
78

89
class DioProvider {
910
Dio? _dio;
@@ -31,9 +32,10 @@ class DioProvider {
3132
}
3233

3334
return dio
34-
..options.connectTimeout = const Duration(seconds: 3000)
35-
..options.receiveTimeout = const Duration(seconds: 5000)
36-
..options.headers = {headerContentType: defaultContentType}
37-
..interceptors.addAll(interceptors);
35+
..options.connectTimeout = const Duration(seconds: 3)
36+
..options.receiveTimeout = const Duration(seconds: 5)
37+
..options.headers = {_headerContentType: _defaultContentType}
38+
..interceptors.addAll(interceptors)
39+
..options.baseUrl = Env.restApiEndpoint;
3840
}
3941
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
2+
3+
class FlutterSecureStorageProvider {
4+
FlutterSecureStorage? _storage;
5+
6+
FlutterSecureStorage getStorage() {
7+
_storage ??= _createStorage();
8+
return _storage!;
9+
}
10+
11+
FlutterSecureStorage _createStorage() {
12+
return const FlutterSecureStorage(
13+
aOptions: AndroidOptions(
14+
encryptedSharedPreferences: true,
15+
),
16+
);
17+
}
18+
}

0 commit comments

Comments
 (0)