diff --git a/app/build.gradle b/app/build.gradle index 6462cd6..6e594a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,10 +21,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation "androidx.room:room-runtime:2.2.0-alpha02" + implementation 'androidx.recyclerview:recyclerview:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/app/src/main/java/de/tadris/fitness/Instance.java b/app/src/main/java/de/tadris/fitness/Instance.java index 14ccff2..abf260c 100644 --- a/app/src/main/java/de/tadris/fitness/Instance.java +++ b/app/src/main/java/de/tadris/fitness/Instance.java @@ -31,7 +31,7 @@ public class Instance { private static Instance instance; - public Instance getInstance(Context context){ + public static Instance getInstance(Context context){ if(instance == null){ instance= new Instance(context); } diff --git a/app/src/main/java/de/tadris/fitness/ListWorkoutsActivity.java b/app/src/main/java/de/tadris/fitness/ListWorkoutsActivity.java index ee76fc8..3e8d071 100644 --- a/app/src/main/java/de/tadris/fitness/ListWorkoutsActivity.java +++ b/app/src/main/java/de/tadris/fitness/ListWorkoutsActivity.java @@ -21,14 +21,37 @@ package de.tadris.fitness; import android.app.Activity; import android.os.Bundle; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import java.util.List; + +import de.tadris.fitness.data.Workout; public class ListWorkoutsActivity extends Activity { + private RecyclerView listView; + private RecyclerView.Adapter mAdapter; + private RecyclerView.LayoutManager layoutManager; + Workout[] workouts; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_list_workouts); + listView= findViewById(R.id.workoutList); + listView.setHasFixedSize(true); + layoutManager= new LinearLayoutManager(this); + listView.setLayoutManager(layoutManager); + + Instance.getInstance(this).db.workoutDao().getWorkouts(); + listView.setAdapter(new WorkoutAdapter()); } + } diff --git a/app/src/main/java/de/tadris/fitness/WorkoutAdapter.java b/app/src/main/java/de/tadris/fitness/WorkoutAdapter.java new file mode 100644 index 0000000..b916290 --- /dev/null +++ b/app/src/main/java/de/tadris/fitness/WorkoutAdapter.java @@ -0,0 +1,17 @@ +package de.tadris.fitness; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +public class WorkoutAdapter { + + + public static class WorkoutViewHolder extends RecyclerView.ViewHolder{ + public WorkoutViewHolder(@NonNull View itemView) { + super(itemView); + } + } + +} diff --git a/app/src/main/java/de/tadris/fitness/data/WorkoutDao.java b/app/src/main/java/de/tadris/fitness/data/WorkoutDao.java index e7deef8..913dc83 100644 --- a/app/src/main/java/de/tadris/fitness/data/WorkoutDao.java +++ b/app/src/main/java/de/tadris/fitness/data/WorkoutDao.java @@ -28,4 +28,7 @@ public interface WorkoutDao { @Query("SELECT * FROM workout_sample WHERE workout_id = :workout_id") WorkoutSample[] getAllSamplesOfWorkout(long workout_id); + @Query("SELECT * FROM workout") + Workout[] getWorkouts(); + } diff --git a/app/src/main/res/layout/activity_list_workouts.xml b/app/src/main/res/layout/activity_list_workouts.xml index eab5473..c43a178 100644 --- a/app/src/main/res/layout/activity_list_workouts.xml +++ b/app/src/main/res/layout/activity_list_workouts.xml @@ -1,9 +1,14 @@ - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_workout.xml b/app/src/main/res/layout/view_workout.xml new file mode 100644 index 0000000..dc6ed08 --- /dev/null +++ b/app/src/main/res/layout/view_workout.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file