Crush backlog for release (#96)

* Replace TODOs with tickets in backlog

* Add adapter for FitnessDetailsFragment playlist

* Add scroll view to settings fragment

* Remove skip button in Onboarding permissions

* Fix soft lock on selecting fallback playlist

* Fix typo

app/src/main/java/com/bruno/android/ui/fitnessdetails/FitnessDetailsFragment.java

@@ -1,18 +1,22 @@
 package com.bruno.android.ui.fitnessdetails;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.bruno.android.R;
 import com.bruno.android.models.FitnessModel;
@@ -45,11 +49,12 @@ public class FitnessDetailsFragment extends Fragment implements FitnessDetailsVi
     private TextView txtStatsDistance;
     private TextView txtStatsSteps;
     private TextView txtStatsClock;
-    private LinearLayout runTracklist;
+    private RecyclerView playlistRecyclerView;
 
     // MARK: - Private members
 
     private FitnessDetailsViewModel viewModel;
+    private FitnessDetailsPlaylistAdapter playlistAdapter;
 
     // MARK: - Lifecycle methods
 
@@ -63,7 +68,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         txtStatsDistance = view.findViewById(R.id.text_view_stats_distance);
         txtStatsSteps = view.findViewById(R.id.text_view_stats_steps);
         txtStatsClock = view.findViewById(R.id.text_view_stats_clock);
-        runTracklist = view.findViewById(R.id.linear_layout_fitness_detail_tracklist);
+        playlistRecyclerView = view.findViewById(R.id.playlist_recycler_view);
+
+        int[] trackColours = getResources().getIntArray(R.array.colorRouteList);
+        playlistAdapter = new FitnessDetailsPlaylistAdapter(trackColours);
+        playlistRecyclerView.setAdapter(playlistAdapter);
+
         return view;
     }
 
@@ -91,29 +101,22 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     // MARK: - Private methods
 
-    // TODO: Use an adapter instead of manually adding view holders.
-    private void setupTracklist(final List<BrunoTrack> tracks) {
-        int[] routeColours = getResources().getIntArray(R.array.colorRouteList);
-        int colourIndex = 0;
-
-        for (BrunoTrack track : tracks) {
-            View viewHolderItemView = getLayoutInflater()
-                    .inflate(R.layout.view_holder_fitness_details, null);
-            ImageView musicNote = viewHolderItemView
-                    .findViewById(R.id.image_view_fitness_details_holder_music);
+    private void setupPlaylist(final List<BrunoTrack> tracks) {
+        playlistRecyclerView.setHasFixedSize(true);
+        playlistRecyclerView.setLayoutManager(
+                new LinearLayoutManager(requireActivity().getApplicationContext())
+        );
 
-            musicNote.setColorFilter(routeColours[colourIndex]);
-            colourIndex = (colourIndex + 1) % routeColours.length;
+        DividerItemDecoration itemDecoration = new DividerItemDecoration(
+                playlistRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL
+        );
 
-            TextView songName = viewHolderItemView
-                    .findViewById(R.id.text_view_fitness_details_holder_song);
-            songName.setText(track.getName());
+        Drawable dividerDrawable = ContextCompat.getDrawable(requireActivity(), R.drawable.list_divider);
+        itemDecoration.setDrawable(dividerDrawable);
+        playlistRecyclerView.addItemDecoration(itemDecoration);
 
-            TextView artist = viewHolderItemView
-                    .findViewById(R.id.text_view_fitness_details_holder_artist);
-            artist.setText(track.getArtists());
-            runTracklist.addView(viewHolderItemView);
-        }
+        playlistAdapter.setData(tracks);
     }
 
     // MARK: - FitnessDetailsViewModelDelegate methods
@@ -156,7 +159,7 @@ public void setupUI(final String leaderboardUserTimeText,
                 break;
         }
 
-        setupTracklist(tracks);
+        setupPlaylist(tracks);
     }
 
     @Override

app/src/main/java/com/bruno/android/ui/fitnessdetails/FitnessDetailsPlaylistAdapter.java

@@ -0,0 +1,56 @@
+package com.bruno.android.ui.fitnessdetails;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bruno.android.R;
+import com.bruno.android.music.BrunoTrack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FitnessDetailsPlaylistAdapter extends RecyclerView.Adapter<FitnessDetailsPlaylistViewHolder> {
+
+    // MARK: - Private members
+
+    private int[] trackColours;
+    private List<BrunoTrack> data;
+
+    // MARK: - Lifecycle methods
+
+    public FitnessDetailsPlaylistAdapter(final int[] trackColours) {
+        this.trackColours = trackColours;
+        this.data = new ArrayList<>();
+    }
+
+    // MARK: - Public methods
+
+    public void setData(final List<BrunoTrack> data) {
+        this.data = data;
+        notifyDataSetChanged();
+    }
+
+    // MARK: - RecyclerView.ViewHolder methods
+
+    @NonNull
+    @Override
+    public FitnessDetailsPlaylistViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View viewHolderItemView = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.view_holder_fitness_details_playlist, parent, false);
+        return new FitnessDetailsPlaylistViewHolder(viewHolderItemView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FitnessDetailsPlaylistViewHolder holder, int position) {
+        holder.populate(trackColours[position % trackColours.length], data.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return data.size();
+    }
+}

app/src/main/java/com/bruno/android/ui/fitnessdetails/FitnessDetailsPlaylistViewHolder.java

@@ -0,0 +1,37 @@
+package com.bruno.android.ui.fitnessdetails;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bruno.android.R;
+import com.bruno.android.music.BrunoTrack;
+
+public class FitnessDetailsPlaylistViewHolder extends RecyclerView.ViewHolder {
+
+    // MARK: - Private members
+
+    private ImageView trackIcon;
+    private TextView trackName;
+    private TextView trackArtists;
+
+    // MARK: - Lifecycle methods
+
+    public FitnessDetailsPlaylistViewHolder(@NonNull View itemView) {
+        super(itemView);
+        trackIcon = itemView.findViewById(R.id.fitness_details_playlist_track_icon);
+        trackName = itemView.findViewById(R.id.fitness_details_playlist_track_name);
+        trackArtists = itemView.findViewById(R.id.fitness_details_playlist_track_artists);
+    }
+
+    // MARK: - Public methods
+
+    public void populate(int musicNoteColour, final BrunoTrack track) {
+        trackIcon.setColorFilter(musicNoteColour);
+        trackName.setText(track.getName());
+        trackArtists.setText(track.getArtists());
+    }
+}

app/src/main/java/com/bruno/android/ui/fitnessrecords/FitnessRecordsFragment.java

@@ -47,8 +47,9 @@ public class FitnessRecordsFragment extends Fragment
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_fitness_records, container, false);
-        adapter = new FitnessRecordsAdapter(this);
         fitnessRecordsRecyclerView = view.findViewById(R.id.recycler_view_fitness_record);
+
+        adapter = new FitnessRecordsAdapter(this);
         fitnessRecordsRecyclerView.setAdapter(adapter);
         return view;
     }
@@ -79,7 +80,6 @@ public void setupUI() {
         fitnessRecordsRecyclerView.setLayoutManager(
                 new LinearLayoutManager(requireActivity().getApplicationContext())
         );
-        fitnessRecordsRecyclerView.setAdapter(adapter);
 
         DividerItemDecoration itemDecoration = new DividerItemDecoration(
                 fitnessRecordsRecyclerView.getContext(),

app/src/main/java/com/bruno/android/ui/onboarding/OnboardingPermissionFragment.java

@@ -50,9 +50,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         active_internet_status = view.findViewById(R.id.active_internet_status);
         spotify_status = view.findViewById(R.id.spotify_status);
         btnAllowAccess = view.findViewById(R.id.btn_allow_access);
-
-        Button btnSkip = view.findViewById(R.id.btn_skip);
-        btnSkip.setOnClickListener(this::handleSkip);
         btnAllowAccess.setOnClickListener(this::handleAllowAccess);
         return view;
     }
@@ -69,10 +66,6 @@ public void onResume() {
         viewModel.updateUserAccess();
     }
 
-    private void handleSkip(final View view) {
-        viewModel.handleSkip();
-    }
-
     private void handleAllowAccess(final View view) {
         viewModel.handleAllowAccess();
     }

app/src/main/java/com/bruno/android/ui/onboarding/OnboardingPermissionViewModel.java

@@ -25,22 +25,6 @@ public OnboardingPermissionViewModel(final Context context, final OnboardingPerm
         this.delegate = delegate;
     }
 
-    public void handleSkip() {
-        if (isAllAccessAllowed()) {
-            delegate.moveToNextTab();
-        } else if (!accessToSpotify) {
-            showSpotifyNotInstallPopUp();
-        } else {
-            delegate.showPopUp(
-                    context.getResources().getString(R.string.onboarding_missing_access_title),
-                    context.getResources().getString(R.string.onboarding_missing_access_text),
-                    context.getResources().getString(R.string.ok_button),
-                    (dialogInterface, i) -> delegate.moveToNextTab(),
-                    true
-            );
-        }
-    }
-
     public void handleAllowAccess() {
         // All access are granted by the user, automatically move to next tab
         if (isAllAccessAllowed()) {

app/src/main/java/com/bruno/android/ui/shared/FallbackPlaylistFragment.java

@@ -59,9 +59,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     @Override
     public void onResume() {
         super.onResume();
-        // This call is needed to be in onResume because ViewPager used for onBoarding have a tendency to
-        // create view in previous tab to enhance performance.
-        // This also allows us to re-sync user playlist when they added a new on after seeing they have none.
         viewModel.getUserPlaylistLibrary();
     }
 

app/src/main/java/com/bruno/android/viewmodels/FallbackPlaylistViewModel.java

@@ -31,6 +31,7 @@ public class FallbackPlaylistViewModel {
     private boolean ongoingRequest;
     private PlaylistMetadata fallbackPlaylist;
     public final String TAG = this.getClass().getSimpleName();
+    private boolean hasShownSpotifyError;
 
     public FallbackPlaylistViewModel(final Context context,
                                      final FallbackPlaylistAction wrapperDelegate,
@@ -45,6 +46,10 @@ public void setCurrentPlaylistAsFallBack(PlaylistMetadata playlist) {
     }
 
     public void getUserPlaylistLibrary() {
+        if (hasShownSpotifyError) {
+            return;
+        }
+
         // Check if there is an ongoing process
         // Since this is call by onResume, when auth view return, we don't want duplicate request.
         if (ongoingRequest) {
@@ -191,6 +196,7 @@ private void showNotPremiumUser() {
     }
 
     private void showSpotifyError(final String errorText) {
+        hasShownSpotifyError = true;
         wrapperDelegate.updatePrimaryAction(
                 FallbackPlaylistAction.ActionType.QUIT,
                 view -> delegate.quitApp());

app/src/main/java/com/bruno/android/viewmodels/RouteNavigationViewModel.java

@@ -279,7 +279,6 @@ private void onRouteCompleted() {
         hasCompletedRoute = true;
         model.completeRouteNavigation();
 
-        // TODO: Implement a route completion screen.
         delegate.showAlertDialog(
                 resources.getString(R.string.run_completion_title),
                 resources.getString(R.string.run_completion_message),

app/src/main/res/layout/fragment_fitness_details.xml

@@ -224,12 +224,11 @@
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
-            <LinearLayout
-                android:id="@+id/linear_layout_fitness_detail_tracklist"
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/playlist_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical" />
-
+                android:scrollbars="vertical" />
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_onboarding_permission.xml

@@ -41,18 +41,6 @@
             layout="@layout/permission_status" />
     </LinearLayout>
 
-    <Button
-        android:id="@+id/btn_skip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:text="@string/onboarding_permission_skip"
-        android:textColor="@color/colorDisable"
-        app:layout_constraintBottom_toTopOf="@id/btn_allow_access"
-        android:layout_marginBottom="15dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
-
     <Button
         android:id="@+id/btn_allow_access"
         style="@style/OnboardingPrimaryActionButton"

app/src/main/res/layout/fragment_settings.xml

@@ -12,18 +12,23 @@
         layout="@layout/toolbar_layout"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appbar_settings">
 
-        <include layout="@layout/settings_user_preferences" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <include layout="@layout/settings_debug_preferences" />
+            <include layout="@layout/settings_user_preferences" />
 
-        <include layout="@layout/settings_about_bruno" />
+            <include layout="@layout/settings_debug_preferences" />
 
-    </LinearLayout>
+            <include layout="@layout/settings_about_bruno" />
+
+        </LinearLayout>
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>