diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..0d15693
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e9969a1..ae2297a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,13 +1,12 @@
-
-
diff --git a/README.md b/README.md
index 4e14826..c5047ff 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
BMI Calculator
=================
@@ -46,3 +47,7 @@ Library & Features
Additional credits
--------------------
This App UI design inspiration is from [Ruben Vaalt](https://dribbble.com/shots/4585382-Simple-BMI-Calculator) Dribbbles account
+=======
+# BMI-Calculator
+
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
diff --git a/app/build.gradle b/app/build.gradle
index dcef9b5..5f04683 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,7 @@ android {
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables.useSupportLibrary = true
}
buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 91dd04d..64d3994 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,11 +3,9 @@
package="com.tharun.bmicalculator">
{
"very severely underweight"
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 475f2ba..a09dac8 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -3,19 +3,19 @@
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
-
-
-
-
-
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd..ef01a2a 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,6 @@
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd..005acba 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,7 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4898431..914f995 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,10 +7,9 @@
#6200EE#0B0A24
-
#FE0049
- #5ADC65
+ #5ADC65#0B0A24#11122A
@@ -18,5 +17,4 @@
#1C1D34#8D8E99
-
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c7dfcf3..92ff5b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,10 @@
buildscript {
repositories {
google()
- mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.4"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0"
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
}
}
diff --git a/gradle.properties b/gradle.properties
index cd0519b..6a6c3d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
@@ -20,4 +21,4 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
diff --git a/gradlew b/gradlew
index 4f906e0..f116711 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,6 @@
#!/usr/bin/env sh
+<<<<<<< HEAD
#
# Copyright 2015 the original author or authors.
#
@@ -16,6 +17,8 @@
# limitations under the License.
#
+=======
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
##############################################################################
##
## Gradle start up script for UN*X
@@ -44,7 +47,11 @@ 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.
+<<<<<<< HEAD
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+=======
+DEFAULT_JVM_OPTS=""
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -82,7 +89,10 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+<<<<<<< HEAD
+=======
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -126,11 +136,18 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
+<<<<<<< HEAD
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+=======
+# 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"`
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
@@ -156,6 +173,7 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else
eval `echo args$i`="\"$arg\""
fi
+<<<<<<< HEAD
i=`expr $i + 1`
done
case $i in
@@ -169,6 +187,21 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
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" ;;
+=======
+ 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" ;;
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
esac
fi
@@ -177,9 +210,21 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
+<<<<<<< HEAD
APP_ARGS=`save "$@"`
+=======
+APP_ARGS=$(save "$@")
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
# 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"
+<<<<<<< HEAD
+=======
+# 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
+
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..437d7cb 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
@rem
@rem Copyright 2015 the original author or authors.
@rem
@@ -14,6 +15,8 @@
@rem limitations under the License.
@rem
+=======
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -29,18 +32,27 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+<<<<<<< HEAD
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@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="-Xmx64m" "-Xms64m"
+=======
+@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=
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
+<<<<<<< HEAD
if "%ERRORLEVEL%" == "0" goto execute
+=======
+if "%ERRORLEVEL%" == "0" goto init
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +66,11 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+<<<<<<< HEAD
if exist "%JAVA_EXE%" goto execute
+=======
+if exist "%JAVA_EXE%" goto init
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +80,37 @@ echo location of your Java installation.
goto fail
+<<<<<<< HEAD
+=======
+: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=%*
+
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+<<<<<<< HEAD
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+=======
+@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%
+>>>>>>> 5428ae08b054eba7bfde28f2912f029b02e54b12
:end
@rem End local scope for the variables with windows NT shell