Skip to content

Commit

Permalink
Modication, Alteration, Bug Fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnislam01
mnislam01 committed Jan 11, 2019
1 parent 7c5d2e8 commit 776a850
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 199 deletions.
94 changes: 0 additions & 94 deletions .idea/assetWizardSettings.xml
View file

This file was deleted.

Binary file modified .idea/caches/build_file_checksums.ser
View file
Binary file not shown.
27 changes: 1 addition & 26 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions app/src/main/java/com/nazrul/fitpro/BMRFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
ButtonBMRCalc = MainView.findViewById(R.id.buttonBMRcalc);


if(CheckBoxMale.isChecked()){
CheckBoxFemale.setActivated(false);
}
else if(CheckBoxFemale.isChecked()){
CheckBoxMale.setActivated(false);
}

ButtonBMRCalc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand All @@ -77,7 +70,7 @@ public void onClick(View v) {

if(CheckBoxMale.isChecked()){
double calculate = 655 + (9.6 * weight) + (1.8 * height) - (4.7 * age);
String result= df.format(calculate);
String result = df.format(calculate);

TextViewResult.setText("BMR = "+result);

Expand Down
60 changes: 22 additions & 38 deletions app/src/main/java/com/nazrul/fitpro/MBIFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import android.widget.TextView;
import android.widget.Toast;

import org.w3c.dom.Text;

import java.text.DecimalFormat;

Expand All @@ -35,11 +34,11 @@ public MBIFragment() {


@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment

View MainView = inflater.inflate(R.layout.fragment_mbi, container, false);
final View MainView = inflater.inflate(R.layout.fragment_mbi, container, false);


ViewResult = MainView.findViewById(R.id.textViewResult);
Expand All @@ -59,53 +58,38 @@ public void onClick(View v) {
Weight = EditTextWeight.getText().toString();
double calculation = 0;

if(!Height.isEmpty() && !Weight.isEmpty()){
if (!Height.isEmpty() && !Weight.isEmpty()) {

DecimalFormat df = new DecimalFormat("##.#");
double height = Double.parseDouble(Height);
double weight = Double.parseDouble(Weight);
calculation = weight/Math.pow(height/100,2);
calculation = weight / Math.pow(height / 100, 2);
double temp = calculation;
String result = df.format(temp);
ViewResult.setText("BMI = "+result);

} else{
ViewResult.setText("BMI = " + result);

if ((int)calculation < 18.5) {
ViewDescription.setText(R.string.textViewDesCase1);
} else if ((int)calculation >= 18.5 && calculation <= 25) {
ViewDescription.setText(R.string.textViewDesCase2);
} else if ((int)calculation >= 25 && calculation <= 30) {
ViewDescription.setText(R.string.textViewDesCase3);
} else if ((int)calculation >= 30 && calculation <= 35) {
ViewDescription.setText(R.string.textViewDesCase4);
} else if ((int)calculation >= 35 && calculation <= 40) {
ViewDescription.setText(R.string.textViewDesCase5);
} else {
ViewDescription.setText("" + R.string.textViewDesCase6);
}

} else {
Toast.makeText(getActivity(), "বয়স আর উচ্চতা লিখুন", Toast.LENGTH_SHORT).show();
}


//I don't know why the fuck these code not working.
if(calculation < 18.5) {
ViewDescription.setText("আপনার BMI Case 1");
//ViewDescription.setText(R.string.textViewDesCase1);
} else if( calculation >= 18.5 && calculation <= 24.9) {
ViewDescription.setText("আপনার BMI Case 2");
//ViewDescription.setText(R.string.textViewDesCase2);
} else if( calculation >= 25 && calculation <= 29.9){
ViewDescription.setText("আপনার BMI Case 3");
//ViewDescription.setText(R.string.textViewDesCase3);
}
else if( calculation >= 30 && calculation <= 34.9){
ViewDescription.setText("আপনার BMI Case 4");
//ViewDescription.setText(R.string.textViewDesCase4);
}
else if( calculation >= 35 && calculation <= 39.9){
ViewDescription.setText("আপনার BMI Case 5");
//ViewDescription.setText(R.string.textViewDesCase5);
}
else if( calculation >= 40){
ViewDescription.setText("আপনার BMI case 6");
//ViewDescription.setText(R.string.textViewDesCase6);
}
else{
ViewDescription.setText("No Case");
}
}
});

return MainView; //inflater.inflate(R.layout.fragment_mbi, container, false);
}

}


}
1 change: 1 addition & 0 deletions app/src/main/java/com/nazrul/fitpro/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public void onBackPressed() {



@SuppressLint("RestrictedApi")
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
Expand Down
28 changes: 17 additions & 11 deletions app/src/main/java/com/nazrul/fitpro/TotalCalAllDayFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
public void onClick(View v) {
Double calculate;
DecimalFormat df = new DecimalFormat("####.#");
String BMR = EditTextGiveBMR.getText().toString();


if(WorkType1.isChecked()){
if(WorkType1.isChecked() && !BMR.isEmpty()){

String BMR = EditTextGiveBMR.getText().toString();
//String BMR = EditTextGiveBMR.getText().toString();
Double bmr = Double.parseDouble(BMR);
String result;
calculate = bmr * 1.2;
Expand All @@ -71,8 +72,8 @@ public void onClick(View v) {

DailyTotalCalNeed.setText("আপনার প্রতিদিন " + result + " ক্যালরি শক্তি দরকার");
}
else if(WorkType2.isChecked()){
String BMR = EditTextGiveBMR.getText().toString();
else if(WorkType2.isChecked() && !BMR.isEmpty()){
//String BMR = EditTextGiveBMR.getText().toString();
Double bmr = Double.parseDouble(BMR);
String result;
calculate = bmr * 1.375;
Expand All @@ -82,8 +83,8 @@ else if(WorkType2.isChecked()){
DailyTotalCalNeed.setText("আপনার প্রতিদিন " + result + " ক্যালরি শক্তি দরকার");

}
else if(WorkType3.isChecked()){
String BMR = EditTextGiveBMR.getText().toString();
else if(WorkType3.isChecked() && !BMR.isEmpty()){
//String BMR = EditTextGiveBMR.getText().toString();
Double bmr = Double.parseDouble(BMR);
String result;
calculate = bmr * 1.55;
Expand All @@ -92,8 +93,8 @@ else if(WorkType3.isChecked()){

DailyTotalCalNeed.setText("আপনার প্রতিদিন " + result + " ক্যালরি শক্তি দরকার");
}
else if(WorkType4.isChecked()){
String BMR = EditTextGiveBMR.getText().toString();
else if(WorkType4.isChecked() && !BMR.isEmpty()){
//String BMR = EditTextGiveBMR.getText().toString();
Double bmr = Double.parseDouble(BMR);
String result;
calculate = bmr * 1.725;
Expand All @@ -102,8 +103,8 @@ else if(WorkType4.isChecked()){

DailyTotalCalNeed.setText("আপনার প্রতিদিন " + result + " ক্যালরি শক্তি দরকার");
}
else if(WorkType5.isChecked()){
String BMR = EditTextGiveBMR.getText().toString();
else if(WorkType5.isChecked() && !BMR.isEmpty()){
//String BMR = EditTextGiveBMR.getText().toString();
Double bmr = Double.parseDouble(BMR);
String result;
calculate = bmr * 1.9;
Expand All @@ -113,7 +114,12 @@ else if(WorkType5.isChecked()){
DailyTotalCalNeed.setText("আপনার প্রতিদিন " + result + " ক্যালরি শক্তি দরকার");
}
else{
Toast.makeText(getActivity(), "আগে কাজের ধরণ বাছাই করুন", Toast.LENGTH_SHORT).show();
if(BMR.isEmpty()){
Toast.makeText(getActivity(), "কাজের ধরণ বাছাই করুন এবং BMR লিখুন", Toast.LENGTH_SHORT).show();
}
else{
Toast.makeText(getActivity(), "আগে কাজের ধরণ বাছাই করুন", Toast.LENGTH_SHORT).show();
}
}
}
});
Expand Down
15 changes: 9 additions & 6 deletions app/src/main/res/layout/fragment_get_suggestion.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,25 @@
android:id="@+id/textViewHead"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="casual"
android:lineSpacingExtra="8sp"
android:text="@string/textViewHead"
android:textAlignment="center"
android:textSize="24sp"
android:textStyle="bold" />
android:textSize="28sp"
android:textStyle="bold"
android:typeface="monospace" />

<TextView
android:id="@+id/textViewDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:fontFamily="casual"
android:paddingLeft="10dp"
android:paddingRight="5dp"
android:paddingTop="10dp"
android:text="@string/textViewDescription"
android:textAlignment="textStart"
android:textSize="18sp" />
android:textSize="20sp"
android:typeface="monospace" />

</LinearLayout>
</ScrollView>
Expand Down
11 changes: 2 additions & 9 deletions app/src/main/res/layout/nav_header_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,9 @@
android:theme="@style/ThemeOverlay.AppCompat.Dark">

<ImageView
android:layout_width="200dp"
android:layout_height="150dp"
android:layout_width="250dp"
android:layout_height="200dp"
app:srcCompat="@drawable/manwomenlogo" />

<TextView
android:layout_width="match_parent"
android:layout_height="60dp"
android:text="@string/nav_head_main_title"
android:textSize="18sp" />



</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/menu/activity_main_drawer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<item
android:id="@+id/nav_alldayCalorie"
android:icon="@drawable/alldaycal"
android:title="সারাদিনের ক্যালরি হিসাব" />
android:title="ক্যালরি হিসাব" />
<item
android:id="@+id/nav_suggestion"
android:icon="@drawable/tips"
Expand Down
Loading

0 comments on commit 776a850

Please sign in to comment.