Skip to content

Commit f95f9a7

Browse files
kekayankekayan
authored
Merge pull request #6 from kekayan/support_design_new
Support design new
2 parents a5da447 + 669c87a commit f95f9a7

6 files changed

Lines changed: 34 additions & 41 deletions

File tree

‎app/src/main/java/lk/paradox/kekayan/fabfit/EditprofileActivity.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void onClick(View v) {
9797
}
9898
});
9999
}
100+
100101
/**
101102
* Call this method to update the each textfields
102103
* and image to display first
@@ -134,9 +135,10 @@ public void onCancelled(DatabaseError databaseError) {
134135
};
135136
mDatabase.addValueEventListener(listener);
136137
}
138+
137139
/**
138140
* Call this method to update in firebase
139-
*if user didnt change profile it will update only others
141+
* if user didnt change profile it will update only others
140142
*/
141143
private void saveUserInformation() {
142144
mName = mNameField.getText().toString();

‎app/src/main/java/lk/paradox/kekayan/fabfit/HistoryFragment.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package lk.paradox.kekayan.fabfit;
22

3-
import android.content.Context;
43
import android.content.SharedPreferences;
54
import android.graphics.Color;
65
import android.os.Bundle;
@@ -19,10 +18,14 @@
1918
import java.util.Date;
2019
import java.util.List;
2120
import java.util.Locale;
21+
import java.util.Objects;
2222

2323
import lk.paradox.kekayan.fabfit.db.Database;
2424
import lk.paradox.kekayan.fabfit.fragments.SettingsFragment;
2525

26+
import static android.content.Context.MODE_PRIVATE;
27+
import static lk.paradox.kekayan.fabfit.fragments.SettingsFragment.DEFAULT_HEIGHT;
28+
2629

2730
public class HistoryFragment extends Fragment {
2831
private boolean showSteps = true;
@@ -37,13 +40,11 @@ private void updateBars() {
3740
BarChart barChart = getView().findViewById(R.id.bargraph);
3841
if (barChart.getData().size() > 0) barChart.clearChart();
3942
int steps;
40-
double distance, stepsize = SettingsFragment.DEFAULT_STEP_SIZE;
43+
SharedPreferences prefs = Objects.requireNonNull(getActivity()).getSharedPreferences("FabFit", MODE_PRIVATE);
44+
double distance, stepsize = prefs.getInt("height", DEFAULT_HEIGHT) * 0.415;
4145
boolean stepsize_cm = true;
4246
if (!showSteps) {
4347
// load some more settings if distance is needed
44-
SharedPreferences prefs =
45-
getActivity().getSharedPreferences("FabFit", Context.MODE_PRIVATE);
46-
stepsize = Double.valueOf(prefs.getString("stepsize_value", String.valueOf(SettingsFragment.DEFAULT_STEP_SIZE)));
4748
stepsize_cm = prefs.getString("stepsize_unit", SettingsFragment.DEFAULT_STEP_UNIT)
4849
.equals("cm");
4950
}
@@ -68,7 +69,7 @@ private void updateBars() {
6869
distance /= 5280;
6970
}
7071
distance = Math.round(distance * 1000) / 1000f; // 3 decimals
71-
bm.setValue((float)distance);
72+
bm.setValue((float) distance);
7273
}
7374
barChart.addBar(bm);
7475
}

‎app/src/main/java/lk/paradox/kekayan/fabfit/MainActivity.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package lk.paradox.kekayan.fabfit;
22

33

4-
import android.content.Context;
54
import android.content.Intent;
65
import android.content.SharedPreferences;
76
import android.content.pm.PackageManager;
@@ -19,8 +18,6 @@
1918
import android.widget.TextView;
2019
import android.widget.Toast;
2120

22-
import java.util.Objects;
23-
2421
import lk.paradox.kekayan.fabfit.fragments.ProfileFragment;
2522
import lk.paradox.kekayan.fabfit.fragments.SettingsFragment;
2623
import lk.paradox.kekayan.fabfit.fragments.StepsFragment;
@@ -32,8 +29,8 @@
3229

3330
public class MainActivity extends AppCompatActivity {
3431

35-
private TweetsFragment tweetsFragment;
3632
private static final int TIME_INTERVAL = 2000;
33+
private TweetsFragment tweetsFragment;
3734
private TextView mTextMessage;
3835
private long mBackPressed;
3936
private FragmentManager fm;
@@ -120,8 +117,8 @@ protected void onCreate(Bundle savedInstanceState) {
120117

121118
//check and put values to height and weight if not in shared prefrends
122119
SharedPreferences prefs = getSharedPreferences("FabFit", MODE_PRIVATE);
123-
int check=prefs.getInt("height",0);
124-
if(check<0) {
120+
int check = prefs.getInt("height", 0);
121+
if (check < 0) {
125122
SharedPreferences.Editor editor = getSharedPreferences("FabFit", MODE_PRIVATE).edit();
126123
editor.putInt("height", DEFAULT_HEIGHT);
127124
editor.putInt("weight", DEFAULT_WEIGHT);
@@ -140,6 +137,7 @@ protected void onCreate(Bundle savedInstanceState) {
140137

141138
bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
142139
}
140+
143141
/**
144142
* Call this method to check
145143
* read stroage permission
@@ -161,6 +159,7 @@ public boolean isReadStoragePermissionGranted() {
161159
return true;
162160
}
163161
}
162+
164163
/**
165164
* Call this method to check
166165
* wrie stroage permission
@@ -185,5 +184,4 @@ public boolean isWriteStoragePermissionGranted() {
185184
}
186185

187186

188-
189187
}

‎app/src/main/java/lk/paradox/kekayan/fabfit/fragments/ProfileFragment.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.content.Intent;
6-
import android.net.Uri;
76
import android.os.Bundle;
87
import android.support.annotation.NonNull;
98
import android.support.annotation.Nullable;
@@ -39,11 +38,9 @@ public class ProfileFragment extends Fragment {
3938
private Button mBack, mConfirm;
4039
private String mName;
4140
private String mProfileImageUrl;
42-
private boolean imageloaded=false;
41+
private boolean imageloaded = false;
4342
//Url of the Resuts
4443
private com.mikhaellopez.circularimageview.CircularImageView mProfileImage;
45-
46-
private DatabaseReference mCustomerDatabase;
4744
private TextView mEmailField;
4845
private DatabaseReference mdatabase;
4946
private ValueEventListener listener;
@@ -69,7 +66,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
6966
editinfo.setOnClickListener(new View.OnClickListener() {
7067
@Override
7168
public void onClick(View v) {
72-
if(imageloaded){
69+
if (imageloaded) {
7370
intent = new Intent(getActivity(), EditprofileActivity.class);
7471
Objects.requireNonNull(getActivity()).startActivity(intent);
7572
getActivity().finish();
@@ -95,11 +92,12 @@ public void onClick(View v) {
9592
mEmailField.setText(FirebaseAuth.getInstance().getCurrentUser().getEmail());
9693
getUserInfo();
9794
}
95+
9896
private void getUserInfo() {
9997
if (getActivity() == null) {
10098
return;
10199
}
102-
listener = new ValueEventListener() {
100+
listener = new ValueEventListener() {
103101
@Override
104102
public void onDataChange(DataSnapshot dataSnapshot) {
105103
if (dataSnapshot.exists() && dataSnapshot.getChildrenCount() > 0) {

‎app/src/main/java/lk/paradox/kekayan/fabfit/fragments/SettingsFragment.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.widget.Button;
1212
import android.widget.EditText;
1313

14-
import java.util.Locale;
1514
import java.util.Objects;
1615

1716
import lk.paradox.kekayan.fabfit.R;
@@ -22,10 +21,8 @@
2221
public class SettingsFragment extends Fragment {
2322
public final static int DEFAULT_WEIGHT = 52;
2423
public final static int DEFAULT_HEIGHT = 173;
25-
private static double METRIC_AVG_FACTOR = 1.167185415740329;
26-
public static int DEFAULT_GOAL = 10000;
27-
public final static double DEFAULT_STEP_SIZE =METRIC_AVG_FACTOR*DEFAULT_HEIGHT;
2824
public final static String DEFAULT_STEP_UNIT = "cm";
25+
public static int DEFAULT_GOAL = 10000;
2926

3027
//
3128
private Button save;
@@ -35,14 +32,14 @@ public class SettingsFragment extends Fragment {
3532
public View onCreateView(LayoutInflater inflater, ViewGroup container,
3633
Bundle savedInstanceState) {
3734
// Inflate the layout for this fragment
38-
View v=inflater.inflate(R.layout.fragment_settings, container, false);
39-
save=(Button)v.findViewById(R.id.savegoalbtn);
40-
dgoal=(EditText)v.findViewById(R.id.goaltxt);
35+
View v = inflater.inflate(R.layout.fragment_settings, container, false);
36+
save = v.findViewById(R.id.savegoalbtn);
37+
dgoal = v.findViewById(R.id.goaltxt);
4138
save.setOnClickListener(new View.OnClickListener() {
4239
@Override
4340
public void onClick(View view) {
44-
int goals =Integer.valueOf(String.valueOf(dgoal.getText()));
45-
SharedPreferences.Editor editor = Objects.requireNonNull(getActivity()).
41+
int goals = Integer.valueOf(String.valueOf(dgoal.getText()));
42+
SharedPreferences.Editor editor = Objects.requireNonNull(getActivity()).
4643
getSharedPreferences("FabFit", MODE_PRIVATE).edit();
4744
editor.putInt("dailygoal", goals);
4845
editor.apply();
@@ -52,14 +49,13 @@ public void onClick(View view) {
5249

5350
}
5451

55-
5652

5753
@Override
5854
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
5955
super.onViewCreated(view, savedInstanceState);
6056
SharedPreferences prefs = Objects.requireNonNull(getActivity()).getSharedPreferences
6157
("FabFit", MODE_PRIVATE);
62-
int goals= prefs.getInt("dailygoal",DEFAULT_GOAL);
58+
int goals = prefs.getInt("dailygoal", DEFAULT_GOAL);
6359
dgoal.setText(String.valueOf(goals));
6460
}
6561
}

‎app/src/main/java/lk/paradox/kekayan/fabfit/fragments/StepsFragment.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public class StepsFragment extends Fragment implements SensorEventListener {
4141
public final static NumberFormat formatter = NumberFormat.getInstance(Locale.getDefault());
4242
private static double WALKING_FACTOR = 0.57;
4343
ImageView footImage;
44+
SharedPreferences prefs;
4445
private TextView stepsView, totalView, averageView, caloriesView;
4546
private PieModel sliceGoal, sliceCurrent;
4647
private PieChart pg;
4748
private int todayOffset, total_start, goal, since_boot, total_days;
4849
private boolean showSteps = true;
49-
SharedPreferences prefs;
5050

5151
@Override
5252
public void onCreate(final Bundle savedInstanceState) {
@@ -75,7 +75,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
7575
// slice for the "missing" steps until reaching the goal
7676
SharedPreferences prefs = Objects.requireNonNull(getActivity()).getSharedPreferences
7777
("FabFit", MODE_PRIVATE);
78-
int goals= prefs.getInt("dailygoal",SettingsFragment.DEFAULT_GOAL);
78+
int goals = prefs.getInt("dailygoal", SettingsFragment.DEFAULT_GOAL);
7979
sliceGoal = new PieModel("", goals, Color.parseColor("#CC0000"));
8080
pg.addPieSlice(sliceGoal);
8181

@@ -244,7 +244,7 @@ private void updatePie() {
244244
// update only every 10 steps when displaying distance
245245
SharedPreferences prefs =
246246
Objects.requireNonNull(getActivity()).getSharedPreferences("FabFit", MODE_PRIVATE);
247-
double stepsize = prefs.getInt("height",DEFAULT_HEIGHT) * 0.415;
247+
double stepsize = prefs.getInt("height", DEFAULT_HEIGHT) * 0.415;
248248
double distance_today = steps_today * stepsize;
249249
double distance_total = (total_start + steps_today) * stepsize;
250250
if (prefs.getString("stepsize_unit", SettingsFragment.DEFAULT_STEP_UNIT)
@@ -263,17 +263,16 @@ private void updatePie() {
263263
}
264264
SharedPreferences prefs =
265265
Objects.requireNonNull(getActivity()).getSharedPreferences("FabFit", MODE_PRIVATE);
266-
double stepsize = Double.valueOf(prefs.getString("stepsize_value", String.valueOf(SettingsFragment.DEFAULT_STEP_SIZE)));
267-
double distance_today = steps_today * stepsize;
268-
caloriesView.setText(formatter.format(calculateCalories( (steps_today))));
266+
267+
caloriesView.setText(formatter.format(calculateCalories((steps_today))));
269268
}
270269

271270
public double calculateCalories(int stepsCount) {
272-
SharedPreferences prefs = Objects.requireNonNull(getActivity()).getSharedPreferences("FabFit", MODE_PRIVATE);
271+
SharedPreferences prefs = Objects.requireNonNull(getActivity()).getSharedPreferences("FabFit", MODE_PRIVATE);
273272

274-
double CaloriesBurnedPerMile = WALKING_FACTOR * (prefs.getInt("weight",DEFAULT_WEIGHT) * 2.2);
273+
double CaloriesBurnedPerMile = WALKING_FACTOR * (prefs.getInt("weight", DEFAULT_WEIGHT) * 2.2);
275274
//https://fitness.stackexchange.com/a/25500
276-
double strip = prefs.getInt("height",DEFAULT_HEIGHT) * 0.415;
275+
double strip = prefs.getInt("height", DEFAULT_HEIGHT) * 0.415;
277276

278277
double stepCountMile = 160934.4 / strip;
279278

@@ -285,5 +284,4 @@ public double calculateCalories(int stepsCount) {
285284
}
286285

287286

288-
289287
}

0 commit comments

Comments
 (0)