mirror of
https://github.com/russok/FitoTrack.git
synced 2025-10-29 00:32:11 -07:00
Merge fixes
This commit is contained in:
parent
1a074b33f8
commit
311067136b
@ -17,7 +17,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.tadris.fitness;
|
package de.tadris.fitness.view;
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@ -30,6 +30,7 @@ import androidx.recyclerview.widget.RecyclerView;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
|
import de.tadris.fitness.R;
|
||||||
import de.tadris.fitness.data.Workout;
|
import de.tadris.fitness.data.Workout;
|
||||||
import de.tadris.fitness.util.UnitUtils;
|
import de.tadris.fitness.util.UnitUtils;
|
||||||
import de.tadris.fitness.util.WorkoutTypeCalculator;
|
import de.tadris.fitness.util.WorkoutTypeCalculator;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user