Merge branch 'develop' into imperial-system
This commit is contained in:
@@ -3,17 +3,16 @@ package com.a1.nextlocation.fragments;
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.a1.nextlocation.R;
|
||||
import com.a1.nextlocation.data.Coupon;
|
||||
import com.a1.nextlocation.data.Data;
|
||||
@@ -37,14 +36,17 @@ public class StatisticFragment extends Fragment {
|
||||
initializeDistanceTextView(view);
|
||||
TextView locs = view.findViewById(R.id.statistics_locations_visited);
|
||||
TextView timeText = view.findViewById(R.id.statistics_time_value);
|
||||
|
||||
double dist = Data.INSTANCE.getDistanceTraveled() / 1000;
|
||||
distance.setText("" + String.format("%.1f", dist) + " km");
|
||||
locs.setText("" + Data.INSTANCE.getLocationsVisited());
|
||||
|
||||
|
||||
long seconds = Data.INSTANCE.getTotalTime() / 1000;
|
||||
long p1 = seconds % 60;
|
||||
long p2 = seconds / 60;
|
||||
long p3 = p2 % 60;
|
||||
p2 = p2 / 60;
|
||||
timeText.setText(p2 + ":" + p3 + ":" + p1);
|
||||
timeText.setText(p2 + "u, " + p3 + "m, " + p1 + "s");
|
||||
|
||||
|
||||
//loads the couponList
|
||||
|
||||
Reference in New Issue
Block a user