het sloopte wel :(((
This commit is contained in:
@@ -30,7 +30,6 @@ android {
|
||||
|
||||
dependencies {
|
||||
|
||||
implementation 'com.facebook.shimmer:shimmer:0.5.0'
|
||||
implementation 'com.android.support:appcompat-v7:28.0.0'
|
||||
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
|
||||
implementation 'com.android.support:cardview-v7:28.0.0'
|
||||
|
@@ -34,7 +34,6 @@ import com.example.fitbot.exercise.ExerciseManager;
|
||||
import com.example.fitbot.pepper.Pepper;
|
||||
import com.example.fitbot.util.NavigationManager;
|
||||
import com.example.fitbot.util.processing.InputProcessor;
|
||||
import com.facebook.shimmer.ShimmerFrameLayout;
|
||||
|
||||
public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks {
|
||||
|
||||
@@ -94,10 +93,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
progressText = findViewById(R.id.progressText);
|
||||
progressCircle.setMax(maxProgress);
|
||||
|
||||
ShimmerFrameLayout shimmerLayout = findViewById(R.id.shimmerFrameLayout);
|
||||
shimmerLayout.startShimmer(); // Start shimmer animation
|
||||
|
||||
|
||||
// Set color of loading circle
|
||||
ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
|
||||
loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED));
|
||||
@@ -166,9 +161,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
// exerciseDescriptionTextView.setText(exercise.description);
|
||||
exerciseVideoUrl = exercise.videoUrl;
|
||||
|
||||
ShimmerFrameLayout shimmerLayout = findViewById(R.id.shimmerFrameLayout);
|
||||
shimmerLayout.stopShimmer(); // Start shimmer animation
|
||||
|
||||
// Play the video
|
||||
playVideo(videoView, this);
|
||||
|
||||
|
@@ -60,22 +60,17 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<com.facebook.shimmer.ShimmerFrameLayout
|
||||
android:id="@+id/shimmerFrameLayout"
|
||||
<LinearLayout
|
||||
android:layout_width="450dp"
|
||||
android:layout_height="450dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:background="@drawable/border_background"
|
||||
android:orientation="vertical"
|
||||
android:padding="20dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textViewFitnessTitle"
|
||||
style="@style/TextStyleTitle"
|
||||
@@ -133,9 +128,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.facebook.shimmer.ShimmerFrameLayout>
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/homeButtonFitness"
|
||||
android:layout_width="150dp"
|
||||
|
@@ -15,5 +15,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
android.nonTransitiveRClass=true
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
|
Reference in New Issue
Block a user