Modified coding style, started using lambda and followed android stud…

…io's recommendations on coding style
jorge-cab · Jul 31, 2021 · bbf22d9 · bbf22d9
1 parent c7b68e7
commit bbf22d9
Show file tree

Hide file tree

Showing 12 changed files with 196 additions and 259 deletions.
diff --git a/app/src/main/java/com/fbu/icebreaker/MainActivity.java b/app/src/main/java/com/fbu/icebreaker/MainActivity.java
@@ -5,6 +5,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.MenuItem;
 
@@ -15,6 +16,7 @@
 
 public class MainActivity extends AppCompatActivity {
 
+    @SuppressLint("NonConstantResourceId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,26 +28,24 @@ protected void onCreate(Bundle savedInstanceState) {
 
         bottomNavigationView = findViewById(R.id.bottomNavigation);
 
-        bottomNavigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
-            @Override
-            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                Fragment fragment = null;
-                switch (item.getItemId()) {
-                    case R.id.action_hobbies:
-                        fragment = new HobbiesFragment();
-                        break;
-                    case R.id.action_icebreak:
-                        fragment = new IcebreakFragment();
-                        break;
-                    case R.id.action_profile:
-                        fragment = new ProfileFragment();
-                        break;
-                    default:
-                        break;
-                }
-                fragmentManager.beginTransaction().replace(R.id.flContainer, fragment).commit();
-                return true;
+        bottomNavigationView.setOnNavigationItemSelectedListener(item -> {
+            Fragment fragment = null;
+            switch (item.getItemId()) {
+                case R.id.action_hobbies:
+                    fragment = new HobbiesFragment();
+                    break;
+                case R.id.action_icebreak:
+                    fragment = new IcebreakFragment();
+                    break;
+                case R.id.action_profile:
+                    fragment = new ProfileFragment();
+                    break;
+                default:
+                    break;
             }
+            assert fragment != null;
+            fragmentManager.beginTransaction().replace(R.id.flContainer, fragment).commit();
+            return true;
         });
 
         // Default selection

diff --git a/app/src/main/java/com/fbu/icebreaker/MultiSelectionAdapter.java b/app/src/main/java/com/fbu/icebreaker/MultiSelectionAdapter.java
@@ -47,12 +47,10 @@ public void onBindViewHolder(@NonNull MultiViewHolder holder, int position) {
 
     class MultiViewHolder extends RecyclerView.ViewHolder {
 
-        private final RelativeLayout rlHobbySelection;
-        private TextView tvHobbyName;
+        private final TextView tvHobbyName;
 
         public MultiViewHolder(@NonNull View itemView) {
             super(itemView);
-            rlHobbySelection = itemView.findViewById(R.id.rlHobbySelection);
             tvHobbyName = itemView.findViewById(R.id.tvHobbyName);
         }
 

diff --git a/app/src/main/java/com/fbu/icebreaker/QRScanActivity.java b/app/src/main/java/com/fbu/icebreaker/QRScanActivity.java
@@ -63,24 +63,16 @@ private void scanner() {
         mCodeScanner.setDecodeCallback(new DecodeCallback() {
             @Override
             public void onDecoded(@NonNull final Result result) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        String scannedUserId = result.getText();
-                        Intent i = new Intent(QRScanActivity.this, UserPairingActivity.class);
-                        i.putExtra(SCANNED_USER_ID_ID, scannedUserId);
-                        startActivity(i);
-                        finish();
-                    }
+                runOnUiThread(() -> {
+                    String scannedUserId = result.getText();
+                    Intent i = new Intent(QRScanActivity.this, UserPairingActivity.class);
+                    i.putExtra(SCANNED_USER_ID_ID, scannedUserId);
+                    startActivity(i);
+                    finish();
                 });
             }
         });
-        scannerView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mCodeScanner.startPreview();
-            }
-        });
+        scannerView.setOnClickListener(view -> mCodeScanner.startPreview());
     }
 
     @Override

diff --git a/app/src/main/java/com/fbu/icebreaker/SignUpActivity.java b/app/src/main/java/com/fbu/icebreaker/SignUpActivity.java
@@ -27,34 +27,28 @@ protected void onCreate(Bundle savedInstanceState) {
         final EditText etPassword = findViewById(R.id.etPassword);
         final Button btnSignUp = findViewById(R.id.btnSignUp);
 
-        btnSignUp.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // Create Parse user
-                ParseUser user = new ParseUser();
-
-                // Get strings from edit text
-                String username = etUsername.getText().toString();
-                String password = etPassword.getText().toString();
-                String email = etEmail.getText().toString();
-                // Set core properties
-                user.setUsername(username);
-                user.setPassword(password);
-                user.setEmail(email);
-                // invoke signup
-                user.signUpInBackground(new SignUpCallback() {
-                    @Override
-                    public void done(ParseException e) {
-                        if (e != null) {
-                            Log.e(TAG, "Issue with SignUp", e);
-                            Toast.makeText(SignUpActivity.this, R.string.sign_up_issue, Toast.LENGTH_SHORT).show();
-                            return;
-                        }
-                        Toast.makeText(SignUpActivity.this, R.string.successful_sign_up, Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                });
-            }
+        btnSignUp.setOnClickListener(v -> {
+            // Create Parse user
+            ParseUser user = new ParseUser();
+
+            // Get strings from edit text
+            String username = etUsername.getText().toString();
+            String password = etPassword.getText().toString();
+            String email = etEmail.getText().toString();
+            // Set core properties
+            user.setUsername(username);
+            user.setPassword(password);
+            user.setEmail(email);
+            // invoke signup
+            user.signUpInBackground(e -> {
+                if (e != null) {
+                    Log.e(TAG, "Issue with SignUp", e);
+                    Toast.makeText(SignUpActivity.this, R.string.sign_up_issue, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                Toast.makeText(SignUpActivity.this, R.string.successful_sign_up, Toast.LENGTH_SHORT).show();
+                finish();
+            });
         });
     }
 }
diff --git a/app/src/main/java/com/fbu/icebreaker/fragments/AddHobbyFragment.java b/app/src/main/java/com/fbu/icebreaker/fragments/AddHobbyFragment.java
@@ -30,6 +30,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -59,7 +60,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        getDialog().getWindow().setLayout(getResources().getDisplayMetrics().widthPixels - 30, getResources().getDisplayMetrics().heightPixels - 30);
+        Objects.requireNonNull(getDialog()).getWindow().setLayout(getResources().getDisplayMetrics().widthPixels - 30, getResources().getDisplayMetrics().heightPixels - 30);
 
         // Get field from view
         rvHobbySelector = view.findViewById(R.id.rvHobbySelector);
@@ -96,7 +97,7 @@ public void done(ParseException e) {
                         });
                     }
                 }
-                getDialog().dismiss();
+                Objects.requireNonNull(getDialog()).dismiss();
             }
         });
 
@@ -158,14 +159,10 @@ public void done(List<Hobby> hobbies, ParseException e) {
     private void createHobbyFragment() {
         FragmentManager fragmentManager = getFragmentManager();
         CreateNewHobby createNewHobby = new CreateNewHobby();
+        assert fragmentManager != null;
         createNewHobby.show(fragmentManager, "createNewHobby");
 
         fragmentManager.executePendingTransactions();
-        createNewHobby.getDialog().setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                queryHobbiesUpdate();
-            }
-        });
+        Objects.requireNonNull(createNewHobby.getDialog()).setOnDismissListener(dialog -> queryHobbiesUpdate());
     }
 }