Merge branch 'coldfix-pbi7' into 'staging'

Coldfix pbi7

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-mobile!96

.gitlab-ci.yml

-image: michael09/flutter:latest
-
+image: tiangppl/pilarmobile:latest
 
 before_script:
   - export PATH=$PATH:/sdk/android-sdk-linux/platform-tools/

.gradle/buildOutputCleanup/cache.properties

+#Wed Dec 02 15:02:43 WIB 2020
+gradle.version=6.1.1

Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /sdk
 ENV ANDROID_COMPILE_SDK=29 \
     ANDROID_BUILD_TOOLS=29.0.3 \
     ANDROID_SDK_TOOLS=4333796 \
-    FLUTTER_VERSION="https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_1.17.1-stable.tar.xz" \
+    FLUTTER_VERSION="https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_1.20.4-stable.tar.xz" \
     ANDROID_HOME=/sdk/android-sdk-linux \
     PATH="$PATH:/sdk/android-sdk-linux/platform-tools" \
     PATH="/sdk/flutter/bin:$PATH" \
@@ -31,6 +31,4 @@ RUN wget -qO sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution
     unzip sonar-scanner-cli.zip -d /opt && \
     rm sonar-scanner-cli.zip && \
     chmod +x /opt/sonar-scanner-${SONAR_SCANNER_CLI_VERSION}-linux/bin/sonar-scanner  && \
-    ln -s /opt/sonar-scanner-${SONAR_SCANNER_CLI_VERSION}-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
-
-
+    ln -s /opt/sonar-scanner-${SONAR_SCANNER_CLI_VERSION}-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
\ No newline at end of file

build.gradle

+// Top-level build file where you can add configuration options common to all sub-projects/modules.

gradle/wrapper/gradle-wrapper.properties

+#Wed Dec 02 15:01:13 WIB 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

gradlew

+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

lib/Component/bottom_navigation_bar.dart

@@ -47,7 +47,7 @@ class _BottomNavigationState extends State<BottomNavigation> {
         BlocBuilder<ProfileBloc, ProfileState>(builder: (context, state) {
           if (state is ProfileLoaded) {
             return IconButton(
-                icon: Icon(
+                icon: const Icon(
                   Icons.edit,
                 ),
                 onPressed: () {
@@ -62,7 +62,7 @@ class _BottomNavigationState extends State<BottomNavigation> {
       const CartIcon(),
       if (_selectedIndex == 0)
         IconButton(
-            icon: Icon(Icons.info_outline),
+            icon: const Icon(Icons.info_outline),
             onPressed: () {
               showModalInfoAdmin(context);
             })
@@ -147,7 +147,7 @@ class _BottomNavigationState extends State<BottomNavigation> {
         currentIndex: _selectedIndex,
         selectedItemColor: Theme.of(context).primaryColor,
         onTap: _onItemTapped,
-        unselectedLabelStyle: TextStyle(color: Colors.grey),
+        unselectedLabelStyle: const TextStyle(color: Colors.grey),
         unselectedItemColor: Colors.grey,
       ),
     );

lib/Component/modal_bottom_admin_info.dart

@@ -32,7 +32,7 @@ class _AdminInfoState extends State<AdminInfo> {
       heightFactor: 0.4,
       child: Column(
         children: <Widget>[
-          Center(
+          const Center(
             child: Icon(Icons.arrow_drop_down),
           ),
           Expanded(
@@ -59,7 +59,7 @@ class _AdminInfoState extends State<AdminInfo> {
                                 style: Theme.of(context).textTheme.headline6,
                               ),
                               IconButton(
-                                  icon: Icon(
+                                  icon: const Icon(
                                     Icons.content_copy,
                                     color: Colors.black54,
                                   ),

lib/Component/theme.dart

@@ -6,7 +6,7 @@ class AppTheme {
     return base.copyWith(
       appBarTheme: base.appBarTheme.copyWith(
           color: Colors.white,
-          iconTheme: IconThemeData(color: Colors.black87),
+          iconTheme: const IconThemeData(color: Colors.black87),
           elevation: 0.5,
           textTheme: GoogleFonts.montserratTextTheme(base.textTheme)),
       textTheme: GoogleFonts.montserratTextTheme(base.textTheme).apply(
@@ -14,7 +14,7 @@ class AppTheme {
         displayColor: Colors.black,
       ),
       primaryColor: const Color(0xff3C8DBC),
-      iconTheme: IconThemeData(color: Colors.grey),
+      iconTheme: const IconThemeData(color: Colors.grey),
       scaffoldBackgroundColor: Colors.white,
       backgroundColor: Colors.white,
       inputDecorationTheme: const InputDecorationTheme(

lib/Pages/Bank/rekening.dart

@@ -56,7 +56,7 @@ class __RekeningBankState extends State<_RekeningBank> {
           } else if (state is ListBankLoaded) {
             return Column(
               children: <Widget>[
-                Center(
+                const Center(
                   child: Icon(Icons.arrow_drop_down),
                 ),
                 Expanded(
@@ -119,8 +119,8 @@ class _ListItemBank extends StatelessWidget {
               style: Theme.of(context).textTheme.headline6,
             ),
             trailing: context.watch<SelectedBank>().selectedBank?.id == bank.id
-                ? Icon(Icons.check)
-                : Icon(Icons.navigate_next),
+                ? const Icon(Icons.check)
+                : const Icon(Icons.navigate_next),
           ),
         ),
       ),
@@ -205,7 +205,7 @@ class _RekeningState extends State<Rekening> {
             },
             borderSide:
                 BorderSide(color: Theme.of(context).primaryColor, width: 2),
-            icon: Icon(Icons.payment),
+            icon: const Icon(Icons.payment),
             label: const Text('Pilih bank tujuan'))
       ],
     );

lib/Pages/Cart/cart.dart

@@ -26,9 +26,9 @@ class CartView extends StatelessWidget {
         builder: (BuildContext context, CartState state) {
           if (state is CartLoaded) {
             return Container(
-              decoration: BoxDecoration(
+              decoration: const BoxDecoration(
                   color: Colors.black12,
-                  borderRadius: const BorderRadius.only(
+                  borderRadius: BorderRadius.only(
                       topLeft: Radius.circular(10),
                       topRight: Radius.circular(10))),
               width: double.infinity,
@@ -213,7 +213,7 @@ class _CartDescription extends StatelessWidget {
                         key: ValueKey<int>(cartItem.quantity),
                         text: TextSpan(
                             text: 'Jumlah: ',
-                            style: TextStyle(color: Colors.black, fontSize: 15),
+                            style: const TextStyle(color: Colors.black, fontSize: 15),
                             children: <TextSpan>[
                               TextSpan(
                                   text: '${cartItem.quantity}',
@@ -294,7 +294,7 @@ class _ModalCartItem extends StatelessWidget {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: <Widget>[
-                Center(
+                const Center(
                   child: Icon(Icons.arrow_drop_down),
                 ),
                 Expanded(
@@ -359,7 +359,7 @@ class _ModalCartItem extends StatelessWidget {
                                               shape: CircleBorder(),
                                             ),
                                             child: IconButton(
-                                                icon: Icon(Icons.remove),
+                                                icon: const Icon(Icons.remove),
                                                 onPressed: () {
                                                   context
                                                       .read<CounterItem>()
@@ -375,12 +375,12 @@ class _ModalCartItem extends StatelessWidget {
                                           ),
                                         ),
                                         Ink(
-                                            decoration: ShapeDecoration(
+                                            decoration: const ShapeDecoration(
                                               color: Colors.green,
-                                              shape: const CircleBorder(),
+                                              shape: CircleBorder(),
                                             ),
                                             child: IconButton(
-                                              icon: Icon(Icons.add),
+                                              icon: const Icon(Icons.add),
                                               onPressed: () {
                                                 context
                                                     .read<CounterItem>()

lib/Pages/Donation/donation_dialog.dart

@@ -28,7 +28,7 @@ class ChooseDonationDialog extends StatelessWidget {
                         fontWeight: FontWeight.bold,
                         letterSpacing: 1.2)),
               ),
-              Divider(
+              const Divider(
                 color: Colors.black,
                 height: 0.2,
               ),