Skip to content

Commit

Permalink
Package name refactor
Browse files Browse the repository at this point in the history
* Changed name of package
* Removed unnecessary email icon found on most activities
  • Loading branch information
richardlara67 committed Apr 29, 2020
1 parent 47f8589 commit 3ac843f
Show file tree
Hide file tree
Showing 24 changed files with 133 additions and 179 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Context;

Expand All @@ -16,12 +16,12 @@
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@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());
}
}
8 changes: 4 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.caloriecounter">
package="com.RichardLara.caloriecounter">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@drawable/calorie_counter_icon"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".WeightGoalActivity"
android:label="@string/title_activity_weight_goal"
android:theme="@style/AppTheme.NoActionBar"></activity>
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".ExerciseLevelActivity"
android:label="@string/title_activity_exercise_level"
Expand All @@ -31,7 +31,7 @@
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".Profile"
android:label="@string/title_activity_profile"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Intent;
import android.os.Bundle;
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.os.Bundle;
import android.view.LayoutInflater;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.os.Bundle;
import android.view.LayoutInflater;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Intent;
import android.os.Bundle;
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.os.Bundle;
import android.view.LayoutInflater;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.os.Bundle;
import android.view.LayoutInflater;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.caloriecounter;
package com.RichardLara.caloriecounter;

import android.content.Intent;
import android.os.Bundle;
Expand Down Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions app/src/main/res/layout/activity_exercise_level.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,4 @@

<include layout="@layout/content_exercise_level" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
8 changes: 0 additions & 8 deletions app/src/main/res/layout/activity_profile_results.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,4 @@

<include layout="@layout/content_profile_results" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
8 changes: 0 additions & 8 deletions app/src/main/res/layout/activity_weight_goal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,4 @@

<include layout="@layout/content_weight_goal" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading

0 comments on commit 3ac843f

Please sign in to comment.