Skip to content

Commit

Permalink
Merge pull request #4 from ryanaidilp/4.1.5
Browse files Browse the repository at this point in the history 
minor update from v4.1.4 to v4.1.5
  • Loading branch information
@ryanaidilp
ryanaidilp committed Dec 31, 2020
2 parents a6e36af + c57f162 commit aeab88f
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 30 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ android {
applicationId "com.banuacoders.siap"
minSdkVersion 24
targetSdkVersion 30
versionCode 23
versionName '4.1.4'
versionCode 24
versionName '4.1.5'
}

signingConfigs {
Expand Down
Binary file added assets/flare/not_found.flr
View file
Binary file not shown.
19 changes: 14 additions & 5 deletions lib/screen/employee_outstation.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:auto_size_text/auto_size_text.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flare_flutter/flare_actor.dart';
import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:progress_dialog/progress_dialog.dart';
Expand Down Expand Up @@ -89,17 +90,22 @@ class _EmployeeOutstationScreenState extends State<EmployeeOutstationScreen> {
}

Widget _buildBody() {
if (_isLoading) return Center(child: CircularProgressIndicator());
if (_isLoading)
return Center(
child: SpinKitFadingFour(
size: 45,
color: Colors.blueAccent,
));
if (_outstations.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
width: 150,
height: 150,
width: Get.width * 0.5,
height: Get.height * 0.3,
child: FlareActor(
'assets/flare/empty.flr',
'assets/flare/not_found.flr',
fit: BoxFit.contain,
animation: 'empty',
alignment: Alignment.center,
Expand Down Expand Up @@ -227,7 +233,10 @@ class _EmployeeOutstationScreenState extends State<EmployeeOutstationScreen> {
'assets/images/upload_placeholder.png'),
Center(
child: SizedBox(
child: CircularProgressIndicator(),
child: SpinKitFadingGrid(
size: 25,
color: Colors.blueAccent,
),
width: 25.0,
height: 25.0,
),
Expand Down
19 changes: 14 additions & 5 deletions lib/screen/employee_permission.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:auto_size_text/auto_size_text.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flare_flutter/flare_actor.dart';
import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:progress_dialog/progress_dialog.dart';
Expand Down Expand Up @@ -87,17 +88,22 @@ class _EmployeePermissionScreenState extends State<EmployeePermissionScreen> {
}

Widget _buildBody() {
if (_isLoading) return Center(child: CircularProgressIndicator());
if (_isLoading)
return Center(
child: SpinKitFadingCircle(
size: 45,
color: Colors.blueAccent,
));
if (_permissions.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
width: 150,
height: 150,
width: Get.width * 0.5,
height: Get.height * 0.3,
child: FlareActor(
'assets/flare/empty.flr',
'assets/flare/not_found.flr',
fit: BoxFit.contain,
animation: 'empty',
alignment: Alignment.center,
Expand Down Expand Up @@ -225,7 +231,10 @@ class _EmployeePermissionScreenState extends State<EmployeePermissionScreen> {
'assets/images/upload_placeholder.png'),
Center(
child: SizedBox(
child: CircularProgressIndicator(),
child: SpinKitFadingGrid(
size: 25,
color: Colors.blueAccent,
),
width: 25.0,
height: 25.0,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/screen/login_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ class _LoginScreenState extends State<LoginScreen> {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
'v4.1.4',
'v4.1.5',
style: TextStyle(
color: Colors.grey,
fontSize: 12.0,
Expand Down
14 changes: 10 additions & 4 deletions lib/screen/notification_list_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:convert';

import 'package:flare_flutter/flare_actor.dart';
import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import 'package:progress_dialog/progress_dialog.dart';
Expand Down Expand Up @@ -125,17 +126,22 @@ class _NotificationListScreenState extends State<NotificationListScreen> {
}

Widget _buildBody() {
if (_isLoading) return Center(child: CircularProgressIndicator());
if (_isLoading)
return Center(
child: SpinKitChasingDots(
size: 45,
color: Colors.blueAccent,
));
if (notifications.isEmpty)
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
width: 150,
height: 150,
width: Get.width * 0.5,
height: Get.height * 0.3,
child: FlareActor(
'assets/flare/empty.flr',
'assets/flare/not_found.flr',
fit: BoxFit.contain,
animation: 'empty',
alignment: Alignment.center,
Expand Down
19 changes: 14 additions & 5 deletions lib/screen/outstation_list_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:auto_size_text/auto_size_text.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flare_flutter/flare_actor.dart';
import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:spo_balaesang/models/outstation.dart';
Expand Down Expand Up @@ -54,17 +55,22 @@ class _OutstationListScreenState extends State<OutstationListScreen> {
}

Widget _buildBody() {
if (_isLoading) return Center(child: CircularProgressIndicator());
if (_isLoading)
return Center(
child: SpinKitFadingFour(
size: 45,
color: Colors.blueAccent,
));
if (_outstations.isEmpty)
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
width: 150,
height: 150,
width: Get.width * 0.5,
height: Get.height * 0.3,
child: FlareActor(
'assets/flare/empty.flr',
'assets/flare/not_found.flr',
fit: BoxFit.contain,
animation: 'empty',
alignment: Alignment.center,
Expand Down Expand Up @@ -174,7 +180,10 @@ class _OutstationListScreenState extends State<OutstationListScreen> {
'assets/images/upload_placeholder.png'),
Center(
child: SizedBox(
child: CircularProgressIndicator(),
child: SpinKitFadingGrid(
size: 25,
color: Colors.blueAccent,
),
width: 25.0,
height: 25.0,
),
Expand Down
19 changes: 14 additions & 5 deletions lib/screen/permission_list_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:auto_size_text/auto_size_text.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flare_flutter/flare_actor.dart';
import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:spo_balaesang/models/absent_permission.dart';
Expand Down Expand Up @@ -49,18 +50,23 @@ class _PermissionListScreenState extends State<PermissionListScreen> {
}

Widget _buildBody() {
if (_isLoading) return Center(child: CircularProgressIndicator());
if (_isLoading)
return Center(
child: SpinKitWanderingCubes(
size: 45,
color: Colors.blueAccent,
));

if (_permissions.isEmpty)
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
width: 150,
height: 150,
width: Get.width * 0.5,
height: Get.height * 0.3,
child: FlareActor(
'assets/flare/empty.flr',
'assets/flare/not_found.flr',
fit: BoxFit.contain,
animation: 'empty',
alignment: Alignment.center,
Expand Down Expand Up @@ -171,7 +177,10 @@ class _PermissionListScreenState extends State<PermissionListScreen> {
'assets/images/upload_placeholder.png'),
Center(
child: SizedBox(
child: CircularProgressIndicator(),
child: SpinKitFadingGrid(
size: 25,
color: Colors.blueAccent,
),
width: 25.0,
height: 25.0,
),
Expand Down
6 changes: 3 additions & 3 deletions lib/screen/splash_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ class _SplashScreenState extends State<SplashScreen> {
Future<void> _checkGps() async {
if (!(await Geolocator().isLocationServiceEnabled())) {
Get.defaultDialog(
title: 'Tidak dapat mendeteksi lokasi saat ini!',
title: 'Perhatian',
content: Center(
child: const Text(
'Pastikan GPS sudah aktif dan coba lagi!',
'Tidak dapat mendeteksi lokasi saat ini! Pastikan GPS sudah aktif dan coba lagi!',
textAlign: TextAlign.center,
),
),
Expand Down Expand Up @@ -194,7 +194,7 @@ class _SplashScreenState extends State<SplashScreen> {
color: Colors.white,
fontWeight: FontWeight.w700)),
const SizedBox(width: 2.0),
Text('v4.1.4', style: TextStyle(color: Colors.white)),
Text('v4.1.5', style: TextStyle(color: Colors.white)),
const Spacer()
],
),
Expand Down

0 comments on commit aeab88f

Please sign in to comment.