From 9c76470fa0e8499899d59d736ae182b03260a525 Mon Sep 17 00:00:00 2001 From: anfaas1618 Date: Tue, 6 Sep 2022 14:09:12 +0530 Subject: [PATCH] LeaderBoardActivity Search Green by UID Resolved --- .idea/gradle.xml | 1 - .../java/com/anfaas/bigeater20/Helper.java | 5 +++ .../bigeater20/LeaderBoardActivity.java | 43 +++++++++---------- .../com/anfaas/bigeater20/ScoreAdapter.java | 2 +- 4 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 app/src/main/java/com/anfaas/bigeater20/Helper.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 526b4c2..a2d7c21 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,7 +13,6 @@ - diff --git a/app/src/main/java/com/anfaas/bigeater20/Helper.java b/app/src/main/java/com/anfaas/bigeater20/Helper.java new file mode 100644 index 0000000..2d26321 --- /dev/null +++ b/app/src/main/java/com/anfaas/bigeater20/Helper.java @@ -0,0 +1,5 @@ +package com.anfaas.bigeater20; + +public class Helper { + public static String UID; +} diff --git a/app/src/main/java/com/anfaas/bigeater20/LeaderBoardActivity.java b/app/src/main/java/com/anfaas/bigeater20/LeaderBoardActivity.java index 1ff1b3d..4e2657c 100644 --- a/app/src/main/java/com/anfaas/bigeater20/LeaderBoardActivity.java +++ b/app/src/main/java/com/anfaas/bigeater20/LeaderBoardActivity.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; public class LeaderBoardActivity extends AppCompatActivity { private static final String TAG = "LeaderBoardActivity"; @@ -54,6 +55,7 @@ public class LeaderBoardActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { SharedPreferences UID= getSharedPreferences("UID", Context.MODE_PRIVATE); uid_saved = UID.getString("UID", "0"); + Helper.UID = uid_saved; SharedPreferences namePref=getSharedPreferences("NAME",Context.MODE_PRIVATE); name_Saved=namePref.getString("NAME","user"); @@ -102,23 +104,22 @@ public void onCancelled(@NonNull DatabaseError databaseError) { editor.putInt("HIGH_SCORE", scoree); editor.commit(); - } else { - // MenuGameOver gameOver= new MenuGameOver(LeaderBoardActivity.this, scoree,highScore,LeaderBoardActivity.this); - // gameOver.show(); - } - FirebaseAuth auth= LoginActivity.myAuth; + } // MenuGameOver gameOver= new MenuGameOver(LeaderBoardActivity.this, scoree,highScore,LeaderBoardActivity.this); + // gameOver.show(); + + FirebaseAuth auth= LoginActivity.myAuth; if (uid_saved=="0") { -try { - userAuth = auth.getCurrentUser(); - FirebaseDatabase userDatabase = FirebaseDatabase.getInstance(); - DatabaseReference userRef = userDatabase.getReference(userAuth.getUid()); - userRef.child("score").setValue(highScore); + try { + userAuth = auth.getCurrentUser(); + FirebaseDatabase userDatabase = FirebaseDatabase.getInstance(); + DatabaseReference userRef = userDatabase.getReference(userAuth.getUid()); + userRef.child("score").setValue(highScore); -} -catch (Exception e) -{ - Log.i("error",e.toString()); -} + } + catch (Exception e) + { + Log.i("error",e.toString()); + } } else { @@ -131,7 +132,7 @@ public void onCancelled(@NonNull DatabaseError databaseError) { listView=findViewById(R.id.list); playerScoreList=new ArrayList(); userImageslist =new ArrayList<>(); - // String Uid= activity.user.Uid; + // String Uid= activity.user.Uid; FirebaseDatabase firebaseDatabase=FirebaseDatabase.getInstance(); @@ -141,7 +142,8 @@ public void onCancelled(@NonNull DatabaseError databaseError) { @Override public void onDataChange(@NonNull DataSnapshot dataSnapshot) { PlayerScore playerScore; - user1=dataSnapshot.getValue(User.class); + user1= Objects.requireNonNull(dataSnapshot.getValue(User.class)); + user1.Uid = Helper.UID; SharedPreferences settings = getSharedPreferences("HIGH_SCORE", Context.MODE_PRIVATE); int highScore = settings.getInt("HIGH_SCORE", 0); if (uid_saved=="0") { @@ -192,7 +194,7 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) { Collections.sort(playerScoreList); Collections.reverse(playerScoreList); - ScoreAdapter fruitsAdapter=new ScoreAdapter(LeaderBoardActivity.this,playerScoreList,name_Saved); + ScoreAdapter fruitsAdapter=new ScoreAdapter(LeaderBoardActivity.this,playerScoreList,Helper.UID); listView.setAdapter(fruitsAdapter); @@ -217,12 +219,7 @@ public void gohome(View view) } public void name(View view) { - - } - - - public boolean dispatchKeyEvent(KeyEvent event) { if (event.getAction() == KeyEvent.ACTION_DOWN) { diff --git a/app/src/main/java/com/anfaas/bigeater20/ScoreAdapter.java b/app/src/main/java/com/anfaas/bigeater20/ScoreAdapter.java index 1f7b1da..0afb55e 100644 --- a/app/src/main/java/com/anfaas/bigeater20/ScoreAdapter.java +++ b/app/src/main/java/com/anfaas/bigeater20/ScoreAdapter.java @@ -51,7 +51,7 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup //Uri imageUri=Uri.parse(score1.getImageurl()); Picasso.get().load(score1.getImageurl()).placeholder(R.drawable.ic_baseline_perm_contact_calendar_24).into(circleImageView); score.setText(String.valueOf(score1.getScore())); - if (current_player_name.equals(score1.getName())){ + if (current_player_name.equals(score1.getUid())){ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { ColorStateList csl = new ColorStateList(new int[][]{{}}, new int[]{Color.GREEN});