diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..e58b775
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,17 +1,19 @@
+
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..f072907
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..f07c917 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-
@@ -8,36 +7,43 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 87b21f7..8b13d86 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,11 @@
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/About.java b/About.java
index 0d74683..a7103c8 100644
--- a/About.java
+++ b/About.java
@@ -13,7 +13,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.NavigationView;
-import android.support.v4.widget.DrawerLayout;
+import androidx.core.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
diff --git a/app/build.gradle b/app/build.gradle
index 6c8f7ff..341bef6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ compileSdkVersion 31
defaultConfig {
applicationId "com.example.maxmoons.usarmy_fatcalculator"
minSdkVersion 17
- targetSdkVersion 25
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ targetSdkVersion 32
+ versionCode 2
+ versionName "1.1"
+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
@@ -17,23 +16,27 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ namespace 'com.example.maxmoons.usarmy_fatcalculator'
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
-
- compile 'com.android.support:appcompat-v7:25.1.1'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile 'com.android.support:design:25.3.1'
- compile 'com.android.support:cardview-v7:25.1.1'
- compile 'com.android.support:recyclerview-v7:25.1.1'
- compile 'com.android.support:support-annotations:25.1.1'
- compile 'com.android.support:support-v13:25.1.1'
- compile 'com.github.bumptech.glide:glide:3.6.1'
- compile 'com.jakewharton:butterknife:7.0.1'
- testCompile 'junit:junit:4.12'
-
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.github.bumptech.glide:glide:4.12.0'
+ implementation 'com.jakewharton:butterknife:10.2.3'
+ implementation 'androidx.appcompat:appcompat:1.3.1'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+ implementation 'com.google.android.material:material:1.4.0'
+ implementation 'androidx.cardview:cardview:1.0.0'
+ implementation 'androidx.recyclerview:recyclerview:1.2.1'
+ implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+ implementation 'androidx.fragment:fragment:1.0.0'
+ implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
+ implementation 'androidx.exifinterface:exifinterface:1.2.0'
+ implementation 'androidx.annotation:annotation:1.0.0'
+ implementation 'androidx.core:core:1.0.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.recyclerview:recyclerview:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d345d3f..f4336b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/About/About.java b/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/About/About.java
index c31fecf..dcb6407 100644
--- a/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/About/About.java
+++ b/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/About/About.java
@@ -5,35 +5,25 @@
*/
-import android.content.Context;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.content.res.Configuration;
-import android.icu.util.Calendar;
import android.net.Uri;
import android.os.Bundle;
-import android.support.design.widget.NavigationView;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.view.Gravity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.RecyclerView;
import com.example.maxmoons.usarmy_fatcalculator.R;
+import com.google.android.material.navigation.NavigationView;
import butterknife.ButterKnife;
@@ -44,8 +34,6 @@
public class About extends AppCompatActivity {
-
-
private RecyclerView recyclerView;
private ActionBarDrawerToggle mDrawerToggle;
@@ -84,7 +72,7 @@ public void onClick(View v) {
termsofUse.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- gotoURl("https://www.microhealthllc.com/about/terms-of-use/");
+ gotoURl("https://www.microhealthllc.com/home/terms-of-service/");
}
});
@@ -92,19 +80,11 @@ public void onClick(View v) {
@Override
public void onClick(View v) {
- gotoURl("https://www.microhealthllc.com/about/privacy-policy/");
+ gotoURl("https://www.microhealthllc.com/home/privacy-policy/");
}
});
-
- // twitterview.setClickable(true);
- // websitetxt =(TextView) findViewById(R.id.websiteurl);
- // websitetxt.setClickable(true);
- // websitetxt.setText(Html.fromHtml(website));
-
- // twitterview.setText(Html.fromHtml(twiteracc));
- // Linkify.addLinks(twitterview,Linkify.ALL);
ButterKnife.bind(this);
if(getSupportActionBar()!=null){
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -113,10 +93,6 @@ public void onClick(View v) {
}
-
-
-
-
}
private void gotoURl(String url){
@@ -137,22 +113,9 @@ private void setupToolbar() {
@Override
public void onBackPressed() {
-
-
-
super.onBackPressed();
-
}
-
-
-
-
-
-
-
-
-
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
@@ -177,8 +140,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}
-
-
-
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/MainActivity.java b/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/MainActivity.java
index b4c8382..96862dd 100644
--- a/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/MainActivity.java
+++ b/app/src/main/java/com/example/maxmoons/usarmy_fatcalculator/MainActivity.java
@@ -3,26 +3,17 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
-import android.widget.ImageView;
-import android.widget.Switch;
-import android.widget.TextView;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.example.maxmoons.usarmy_fatcalculator.About.About;
import java.text.DecimalFormat;
@@ -48,7 +39,6 @@ protected void onCreate(Bundle savedInstanceState) {
final TextView HipNumber = (TextView) findViewById(R.id.HipNumber);
final TextView NeckNumber = (TextView) findViewById(R.id.NeckNumber);
final TextView HeightNumber = (TextView) findViewById(R.id.HeightNumber);
- final TextView BodyFatPercent = (TextView) findViewById(R.id.BodyFatPercent);
final CheckBox Female = (CheckBox) findViewById(R.id.Female);
@@ -149,7 +139,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
startActivity(new Intent(MainActivity.this, About.class));
break;
case R.id.terms:
- Uri uri = Uri.parse("https://microhealthllc.com/about/terms-of-use/");
+ Uri uri = Uri.parse("https://www.microhealthllc.com/home/terms-of-service/");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
break;
@@ -172,13 +162,6 @@ private void CalculateFat() {
BodyFatPercent.setText("0%");
}
- /*public void Terms(View v)
- {
- Uri uri = Uri.parse("https://microhealthllc.com/about/terms-of-use/");
- Intent intent = new Intent(Intent.ACTION_VIEW, uri);
- startActivity(intent);
- }*/
-
public void Infotab(View v)
{
infotab=!infotab;
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 3e3dd32..2488cd3 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -38,7 +38,7 @@
-
@@ -292,7 +292,7 @@
-
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9b56b9f..3dcf1ea 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,6 @@
-
-
-
+
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6514a0b..ec6fd5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,12 @@
buildscript {
repositories {
- jcenter()
+ //jcenter()
+ google()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:8.1.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -14,7 +16,9 @@ buildscript {
allprojects {
repositories {
- jcenter()
+ google()
+ mavenCentral()
+ //jcenter()
}
}
diff --git a/gradle.properties b/gradle.properties
index 3530b01..b315af3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,12 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index af68396..da1db5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Jun 27 12:02:13 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/local.properties b/local.properties
index 122fb97..6b105d1 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Wed May 29 19:08:32 EDT 2019
-sdk.dir=C\:\\Users\\AnuUprety\\AppData\\Local\\Android\\Sdk
+#Tue Aug 29 10:16:07 EDT 2023
+sdk.dir=C\:\\Users\\ZachEgner\\AppData\\Local\\Android\\Sdk