diff --git a/README.md b/README.md index 3f87836..212121e 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Calorie Tracker is an app that calculates a user's BMR and determines a user's d ## Author #### :bust_in_silhouette: Richard Lara -* :octocat: [@richardlara67](https://github.com/richardlara67) -* :e-mail: [richardlara67@gmail.com](mailto:richardlara67@gmail.com) +* :octocat: [@RichardLara67](https://github.com/RichardLara67) +* :e-mail: [RichardLara67@gmail.com](mailto:RichardLara67@gmail.com) ## :pencil: To-do - [x] Calculate BRM @@ -15,4 +15,4 @@ Calorie Tracker is an app that calculates a user's BMR and determines a user's d ## :raised_hands: Contributing Contributions, issues, and feature requests are welcome! -Feel free to check the [issues page](https://github.com/richardlara67/Calorie-Tracker/issues) if you want to contribute. +Feel free to check the [issues page](https://github.com/RichardLara67/Calorie-Tracker/issues) if you want to contribute. diff --git a/app/build.gradle b/app/build.gradle index e7c0e8f..c8174c8 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.2" defaultConfig { - applicationId "com.example.caloriecounter" + applicationId "com.RichardLara.caloriecounter" minSdkVersion 15 targetSdkVersion 29 versionCode 1 diff --git a/app/src/androidTest/java/com/example/caloriecounter/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/caloriecounter/ExampleInstrumentedTest.java index b8f2c03..9a4def1 100755 --- a/app/src/androidTest/java/com/example/caloriecounter/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/caloriecounter/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Context; @@ -16,12 +16,12 @@ * @see Testing documentation */ @RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { +public class RichardLaraInstrumentedTest { @Test public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.example.caloriecounter", appContext.getPackageName()); + assertEquals("com.RichardLara.caloriecounter", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f42f7a9..4ef0f33 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,10 +1,10 @@ + package="com.RichardLara.caloriecounter"> + android:theme="@style/AppTheme.NoActionBar" /> diff --git a/app/src/main/java/com/example/caloriecounter/ExerciseLevelActivity.java b/app/src/main/java/com/richardlara/caloriecounter/ExerciseLevelActivity.java similarity index 88% rename from app/src/main/java/com/example/caloriecounter/ExerciseLevelActivity.java rename to app/src/main/java/com/richardlara/caloriecounter/ExerciseLevelActivity.java index 96ee394..c399ad0 100644 --- a/app/src/main/java/com/example/caloriecounter/ExerciseLevelActivity.java +++ b/app/src/main/java/com/richardlara/caloriecounter/ExerciseLevelActivity.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Intent; import android.os.Bundle; @@ -46,14 +46,6 @@ protected void onCreate(Bundle savedInstanceState) { Button btnSubmit = (Button) findViewById(R.id.submitBtn); btnSubmit.setOnClickListener(this); - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); } @Override diff --git a/app/src/main/java/com/example/caloriecounter/First2Fragment.java b/app/src/main/java/com/richardlara/caloriecounter/First2Fragment.java similarity index 96% rename from app/src/main/java/com/example/caloriecounter/First2Fragment.java rename to app/src/main/java/com/richardlara/caloriecounter/First2Fragment.java index 63eb4ec..4a664b0 100644 --- a/app/src/main/java/com/example/caloriecounter/First2Fragment.java +++ b/app/src/main/java/com/richardlara/caloriecounter/First2Fragment.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/example/caloriecounter/FirstFragment.java b/app/src/main/java/com/richardlara/caloriecounter/FirstFragment.java similarity index 96% rename from app/src/main/java/com/example/caloriecounter/FirstFragment.java rename to app/src/main/java/com/richardlara/caloriecounter/FirstFragment.java index 8a89b37..772bb94 100644 --- a/app/src/main/java/com/example/caloriecounter/FirstFragment.java +++ b/app/src/main/java/com/richardlara/caloriecounter/FirstFragment.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/example/caloriecounter/HomeActivity.java b/app/src/main/java/com/richardlara/caloriecounter/HomeActivity.java similarity index 98% rename from app/src/main/java/com/example/caloriecounter/HomeActivity.java rename to app/src/main/java/com/richardlara/caloriecounter/HomeActivity.java index 2ba4ae5..520432f 100755 --- a/app/src/main/java/com/example/caloriecounter/HomeActivity.java +++ b/app/src/main/java/com/richardlara/caloriecounter/HomeActivity.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/com/example/caloriecounter/Profile.java b/app/src/main/java/com/richardlara/caloriecounter/Profile.java similarity index 98% rename from app/src/main/java/com/example/caloriecounter/Profile.java rename to app/src/main/java/com/richardlara/caloriecounter/Profile.java index dbdd234..12e126a 100755 --- a/app/src/main/java/com/example/caloriecounter/Profile.java +++ b/app/src/main/java/com/richardlara/caloriecounter/Profile.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/com/example/caloriecounter/ProfileResultsActivity.java b/app/src/main/java/com/richardlara/caloriecounter/ProfileResultsActivity.java similarity index 94% rename from app/src/main/java/com/example/caloriecounter/ProfileResultsActivity.java rename to app/src/main/java/com/richardlara/caloriecounter/ProfileResultsActivity.java index 5745705..524feb1 100755 --- a/app/src/main/java/com/example/caloriecounter/ProfileResultsActivity.java +++ b/app/src/main/java/com/richardlara/caloriecounter/ProfileResultsActivity.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Intent; import android.os.Bundle; @@ -74,15 +74,6 @@ else if(gender.equals("Female")) { calories.setText(strCalories + " calories"); } - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); - Button btnConfirm = (Button) findViewById(R.id.btnStartOver); btnConfirm.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/example/caloriecounter/Second2Fragment.java b/app/src/main/java/com/richardlara/caloriecounter/Second2Fragment.java similarity index 96% rename from app/src/main/java/com/example/caloriecounter/Second2Fragment.java rename to app/src/main/java/com/richardlara/caloriecounter/Second2Fragment.java index 571dead..3f72554 100644 --- a/app/src/main/java/com/example/caloriecounter/Second2Fragment.java +++ b/app/src/main/java/com/richardlara/caloriecounter/Second2Fragment.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/example/caloriecounter/SecondFragment.java b/app/src/main/java/com/richardlara/caloriecounter/SecondFragment.java similarity index 96% rename from app/src/main/java/com/example/caloriecounter/SecondFragment.java rename to app/src/main/java/com/richardlara/caloriecounter/SecondFragment.java index 30367dc..aca3203 100644 --- a/app/src/main/java/com/example/caloriecounter/SecondFragment.java +++ b/app/src/main/java/com/richardlara/caloriecounter/SecondFragment.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/example/caloriecounter/Track.java b/app/src/main/java/com/richardlara/caloriecounter/Track.java similarity index 97% rename from app/src/main/java/com/example/caloriecounter/Track.java rename to app/src/main/java/com/richardlara/caloriecounter/Track.java index 12b88b8..25bb9fc 100755 --- a/app/src/main/java/com/example/caloriecounter/Track.java +++ b/app/src/main/java/com/richardlara/caloriecounter/Track.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/com/example/caloriecounter/WeightGoalActivity.java b/app/src/main/java/com/richardlara/caloriecounter/WeightGoalActivity.java similarity index 89% rename from app/src/main/java/com/example/caloriecounter/WeightGoalActivity.java rename to app/src/main/java/com/richardlara/caloriecounter/WeightGoalActivity.java index 6c20a09..118c4ac 100644 --- a/app/src/main/java/com/example/caloriecounter/WeightGoalActivity.java +++ b/app/src/main/java/com/richardlara/caloriecounter/WeightGoalActivity.java @@ -1,4 +1,4 @@ -package com.example.caloriecounter; +package com.RichardLara.caloriecounter; import android.content.Intent; import android.os.Bundle; @@ -43,14 +43,6 @@ protected void onCreate(Bundle savedInstanceState) { Button btnSubmit = (Button) findViewById(R.id.submitBtn); btnSubmit.setOnClickListener(this); - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); } @Override diff --git a/app/src/main/res/drawable-v24/calorie_counter_icon.png b/app/src/main/res/drawable-v24/calorie_counter_icon.png new file mode 100644 index 0000000..5b2f8d8 Binary files /dev/null and b/app/src/main/res/drawable-v24/calorie_counter_icon.png differ diff --git a/app/src/main/res/layout/activity_exercise_level.xml b/app/src/main/res/layout/activity_exercise_level.xml index 476a237..e4d280e 100644 --- a/app/src/main/res/layout/activity_exercise_level.xml +++ b/app/src/main/res/layout/activity_exercise_level.xml @@ -22,12 +22,4 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_profile_results.xml b/app/src/main/res/layout/activity_profile_results.xml index 4b64518..bfb56c2 100755 --- a/app/src/main/res/layout/activity_profile_results.xml +++ b/app/src/main/res/layout/activity_profile_results.xml @@ -22,12 +22,4 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_weight_goal.xml b/app/src/main/res/layout/activity_weight_goal.xml index de84828..ae8c00b 100644 --- a/app/src/main/res/layout/activity_weight_goal.xml +++ b/app/src/main/res/layout/activity_weight_goal.xml @@ -22,12 +22,4 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/content_profile_results.xml b/app/src/main/res/layout/content_profile_results.xml index 02caa39..2832316 100755 --- a/app/src/main/res/layout/content_profile_results.xml +++ b/app/src/main/res/layout/content_profile_results.xml @@ -8,108 +8,111 @@ tools:context=".ProfileResultsActivity" tools:showIn="@layout/activity_profile_results"> - - - - - - - - - - - - - - - - - - - - - - - - - -