diff --git a/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java b/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java index d331807..ee54979 100644 --- a/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java @@ -22,6 +22,7 @@ package de.tadris.fitness.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; +import android.os.Handler; import de.tadris.fitness.Instance; import de.tadris.fitness.R; @@ -31,13 +32,14 @@ public class LauncherActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTheme(R.style.AppThemeNoActionbar); setContentView(R.layout.activity_main); } @Override public void onResume(){ super.onResume(); - init(); + new Handler().postDelayed(this::init, 100); } void init(){ @@ -48,5 +50,6 @@ public class LauncherActivity extends Activity { void start(){ startActivity(new Intent(this, ListWorkoutsActivity.class)); finish(); + overridePendingTransition(R.anim.fade_in, R.anim.stay); } } diff --git a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java index a84e0c3..30f6c87 100644 --- a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java @@ -57,6 +57,14 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor listView.setLayoutManager(layoutManager); menu= findViewById(R.id.workoutListMenu); + menu.setOnMenuButtonLongClickListener(v -> { + if(workouts.length > 0){ + startRecording(workouts[0].workoutType); + return true; + }else{ + return false; + } + }); findViewById(R.id.workoutListRecordRunning).setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_RUNNING)); findViewById(R.id.workoutListRecordHiking) .setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_HIKING)); diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml new file mode 100644 index 0000000..1719ca3 --- /dev/null +++ b/app/src/main/res/anim/fade_in.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/stay.xml b/app/src/main/res/anim/stay.xml new file mode 100644 index 0000000..2ae7269 --- /dev/null +++ b/app/src/main/res/anim/stay.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list_workouts.xml b/app/src/main/res/layout/activity_list_workouts.xml index 40bed42..f63f894 100644 --- a/app/src/main/res/layout/activity_list_workouts.xml +++ b/app/src/main/res/layout/activity_list_workouts.xml @@ -25,15 +25,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".activity.ListWorkoutsActivity"> - - - - + android:layout_height="wrap_content" /> + app:fab_size="normal"/> + app:fab_size="normal" /> + app:fab_size="normal"/> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4b9fda9..3d17361 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -27,8 +27,9 @@ + android:background="@drawable/logo_background" + android:src="@drawable/logo_foreground" /> \ No newline at end of file