Fixed leaderboard and new icons

ms01640 · ms01640 · commit a27de0bf95b5 · 2019-05-11T22:02:06.000+01:00
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/java/com/example/offlinemaps/FriendAdapterClass.java b/app/src/main/java/com/example/offlinemaps/FriendAdapterClass.java
@@ -38,15 +38,16 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
 
         if (currentUser != null) {
             if (currentUser.getmVIP()) {
-                Log.d("IMAGE", "MADE it");
                 ImageView vip = (ImageView) listItem.findViewById(R.id.iv_vip);
-                vip.setImageResource(R.drawable.ic_portrait_black_24dp);
+                vip.setImageResource(R.drawable.vip_ticket);
             }
 
             ImageView image = (ImageView) listItem.findViewById(R.id.iv_profile_pic);
-            //image.setImageResource((int) currentUser.getmProfilePicture());
             if (!currentUser.getmProfilePicture().isEmpty()) {
+                Log.d("FriendAdapter", currentUser.getmProfilePicture());
                 Picasso.get().load(currentUser.getmProfilePicture()).placeholder(R.drawable.ic_person_blue).into(image);
+            } else {
+                Picasso.get().load(R.drawable.ic_menu_black_24dp).into(image);
             }
 
             TextView name = (TextView) listItem.findViewById(R.id.tv_username);
diff --git a/app/src/main/java/com/example/offlinemaps/FriendsUI.java b/app/src/main/java/com/example/offlinemaps/FriendsUI.java
@@ -155,11 +155,13 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_profile:
                 Intent profile = new Intent(FriendsUI.this, ProfileUI.class);
                 startActivity(profile);
                 finish();
+                break;
         }
         menuItem.setChecked(true);
         mDrawer.closeDrawers();
diff --git a/app/src/main/java/com/example/offlinemaps/GoalsActivity.java b/app/src/main/java/com/example/offlinemaps/GoalsActivity.java
@@ -131,11 +131,13 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 FirebaseAuth firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_profile:
                 Intent profile = new Intent(GoalsActivity.this, ProfileUI.class);
                 startActivity(profile);
                 finish();
+                break;
         }
         menuItem.setChecked(true);
         mDrawer.closeDrawers();
diff --git a/app/src/main/java/com/example/offlinemaps/Leaderboard.java b/app/src/main/java/com/example/offlinemaps/Leaderboard.java
@@ -55,7 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
         actionbar.setHomeAsUpIndicator(R.drawable.ic_menu_black_24dp);
 
         //Initialise fields.
-        mDatabase = FirebaseDatabase.getInstance().getReference();
+        mDatabase = FirebaseDatabase.getInstance().getReference().child("users");
         currentUser = FirebaseAuth.getInstance().getUid();
 
         final ListView leaderboard = findViewById(R.id.lv_leaderboard_list);
@@ -74,13 +74,10 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                 leaderboardAdapter.clear();
-                for (DataSnapshot postSnapshot : dataSnapshot.getChildren()) {
-                    for (DataSnapshot userSnapshot : postSnapshot.getChildren()) {
-                        User user = userSnapshot.getValue(User.class);
-                        //Don't include users with no username.
-                        if (!userSnapshot.child("mUsername").getValue().toString().isEmpty() && !userList.contains(user)) {
-                            leaderboardAdapter.add(user);
-                        }
+                for (DataSnapshot userSnapshot : dataSnapshot.getChildren()) {
+                    User user = userSnapshot.getValue(User.class);
+                    if (!user.getmUsername().isEmpty() && !userList.contains(user)) {
+                        leaderboardAdapter.add(user);
                     }
                 }
 
@@ -92,8 +89,6 @@ public int compare(User o1, User o2) {
                         return o2.getmPoints() - comparePoints;
                     }
                 });
-
-                //leaderboardAdapter.addAll(userList);
                 leaderboardAdapter.notifyDataSetChanged();
             }
 
@@ -103,6 +98,39 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
             }
         });
 
+//        mDatabase.addValueEventListener(new ValueEventListener() {
+//            @Override
+//            public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+//                leaderboardAdapter.clear();
+//                for (DataSnapshot postSnapshot : dataSnapshot.getChildren()) {
+//                    for (DataSnapshot userSnapshot : postSnapshot.getChildren()) {
+//                        User user = userSnapshot.getValue(User.class);
+//                        //Don't include users with no username.
+//                        if (!userSnapshot.child("mUsername").getValue().toString().isEmpty() && !userList.contains(user)) {
+//                            leaderboardAdapter.add(user);
+//                        }
+//                    }
+//                }
+//
+//                //Sort by most points.
+//                Collections.sort(userList, new Comparator<User>() {
+//                    @Override
+//                    public int compare(User o1, User o2) {
+//                        int comparePoints = o1.getmPoints();
+//                        return o2.getmPoints() - comparePoints;
+//                    }
+//                });
+//
+//                //leaderboardAdapter.addAll(userList);
+//                leaderboardAdapter.notifyDataSetChanged();
+//            }
+//
+//            @Override
+//            public void onCancelled(@NonNull DatabaseError databaseError) {
+//
+//            }
+//        });
+
         leaderboard.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -147,11 +175,13 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_profile:
                 Intent profile = new Intent(Leaderboard.this, ProfileUI.class);
                 startActivity(profile);
                 finish();
+                break;
         }
         menuItem.setChecked(true);
         mDrawer.closeDrawers();
diff --git a/app/src/main/java/com/example/offlinemaps/LeaderboardAdapterClass.java b/app/src/main/java/com/example/offlinemaps/LeaderboardAdapterClass.java
@@ -41,6 +41,11 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
             Picasso.get().load(currentUser.getmProfilePicture()).placeholder(R.drawable.ic_person_blue).into(image);
         }
 
+        if (currentUser.getmVIP()) {
+            ImageView vip = (ImageView) listItem.findViewById(R.id.iv_vip);
+            vip.setImageResource(R.drawable.vip_ticket);
+        }
+
         TextView name = (TextView) listItem.findViewById(R.id.tv_username);
         name.setText(currentUser.getmUsername());
 
diff --git a/app/src/main/java/com/example/offlinemaps/ProfileUI.java b/app/src/main/java/com/example/offlinemaps/ProfileUI.java
@@ -154,11 +154,13 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_friends:
                 Intent friends = new Intent(ProfileUI.this, FriendsUI.class);
                 startActivity(friends);
                 finish();
+                break;
         }
         menuItem.setChecked(true);
         mDrawer.closeDrawers();
diff --git a/app/src/main/java/com/example/offlinemaps/StepCounterActivity.java b/app/src/main/java/com/example/offlinemaps/StepCounterActivity.java
@@ -288,6 +288,7 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_friends:
                 Intent friends = new Intent(StepCounterActivity.this, FriendsUI.class);
diff --git a/app/src/main/java/com/example/offlinemaps/UpdateUsername.java b/app/src/main/java/com/example/offlinemaps/UpdateUsername.java
@@ -90,11 +90,13 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 FirebaseAuth firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_profile:
                 Intent profile = new Intent(UpdateUsername.this, ProfileUI.class);
                 startActivity(profile);
                 finish();
+                break;
         }
         menuItem.setChecked(true);
         mDrawer.closeDrawers();
diff --git a/app/src/main/java/com/example/offlinemaps/User.java b/app/src/main/java/com/example/offlinemaps/User.java
@@ -83,7 +83,7 @@ public double getmCaloriesBurned() {
     //Get the users points.
     public int getmPoints() { return mPoints; }
 
-    //Get the users VIP Status.
+    //Get the users vip_ticket Status.
     public boolean getmVIP() { return mVIP; }
 
     //Get the users UID.
@@ -140,7 +140,7 @@ public void setmPoints(int points) {
         this.mPoints = points;
     }
 
-    //Set the VIP status of the user.
+    //Set the vip_ticket status of the user.
     public void setmVIP(boolean vip) {
         this.mVIP = vip;
     }
diff --git a/app/src/main/java/com/example/offlinemaps/ViewFriend.java b/app/src/main/java/com/example/offlinemaps/ViewFriend.java
@@ -142,15 +142,18 @@ public void selectDrawerItem(MenuItem menuItem) {
                 //Go to main activity.
                 FirebaseAuth firebaseAuth = FirebaseAuth.getInstance();
                 firebaseAuth.signOut();
+                finish();
                 break;
             case R.id.nav_friends:
                 Intent friends = new Intent(ViewFriend.this, FriendsUI.class);
                 startActivity(friends);
                 finish();
+                break;
             case R.id.nav_profile:
                 Intent profile = new Intent(ViewFriend.this, ProfileUI.class);
                 startActivity(profile);
                 finish();
+                break;
         }
         menuItem.setChecked(true);
         mDrawer.closeDrawers();
diff --git a/app/src/main/res/drawable/vip_ticket.png b/app/src/main/res/drawable/vip_ticket.png
diff --git a/app/src/main/res/layout/friends_listview.xml b/app/src/main/res/layout/friends_listview.xml
@@ -23,8 +23,8 @@
         android:id="@+id/iv_vip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="22dp"
+        android:layout_marginStart="4sp"
+        android:layout_marginTop="26sp"
         android:layout_toEndOf="@id/tv_username"
         android:textSize="20sp"
         android:textStyle="bold" />
diff --git a/app/src/main/res/layout/leaderboard_listview.xml b/app/src/main/res/layout/leaderboard_listview.xml
@@ -19,6 +19,17 @@
         android:textSize="20sp"
         android:textStyle="bold" />
 
+    <ImageView
+        android:id="@+id/iv_vip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4sp"
+        android:layout_marginTop="26sp"
+        android:layout_toEndOf="@id/tv_username"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+
     <ImageView
         android:id="@+id/iv_location_pin"
         android:layout_width="wrap_content"
