From 1fac19facc74f307edf32d277d2c6a77253027f5 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Tue, 20 Sep 2022 05:15:50 -0700 Subject: [PATCH] Address a few warnings and suggestions for Android sample app Summary: ^ Reviewed By: LukeDefeo Differential Revision: D39575170 fbshipit-source-id: 8be293fe31521531e634132e4ca454da32aad73f --- .../flipper/sample/AnimationsActivity.java | 70 ++++++------------- .../flipper/sample/ButtonsActivity.java | 8 +-- .../sample/FlipperSampleApplication.java | 2 + .../flipper/sample/FragmentTestFragment.java | 20 +++--- .../facebook/flipper/sample/ListActivity.java | 4 +- .../facebook/flipper/sample/MainActivity.java | 4 +- .../flipper/sample/TestDialogFragment.java | 2 + 7 files changed, 43 insertions(+), 67 deletions(-) diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/AnimationsActivity.java b/android/sample/src/main/java/com/facebook/flipper/sample/AnimationsActivity.java index 6aa7ab13e..a5d5a4928 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/AnimationsActivity.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/AnimationsActivity.java @@ -26,66 +26,36 @@ public class AnimationsActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_animations); - btnBlink = (Button) findViewById(R.id.btnBlink); - btnRotate = (Button) findViewById(R.id.btnRotate); - btnMove = (Button) findViewById(R.id.btnMove); - btnBounce = (Button) findViewById(R.id.btnBounce); - btnSequential = (Button) findViewById(R.id.btnSequential); - txtBlink = (TextView) findViewById(R.id.txt_blink); - txtRotate = (TextView) findViewById(R.id.txt_rotate); - txtMove = (TextView) findViewById(R.id.txt_move); - txtBounce = (TextView) findViewById(R.id.txt_bounce); - txtSeq = (TextView) findViewById(R.id.txt_seq); + btnBlink = findViewById(R.id.btnBlink); + btnRotate = findViewById(R.id.btnRotate); + btnMove = findViewById(R.id.btnMove); + btnBounce = findViewById(R.id.btnBounce); + btnSequential = findViewById(R.id.btnSequential); + txtBlink = findViewById(R.id.txt_blink); + txtRotate = findViewById(R.id.txt_rotate); + txtMove = findViewById(R.id.txt_move); + txtBounce = findViewById(R.id.txt_bounce); + txtSeq = findViewById(R.id.txt_seq); animBlink = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.blink); - // blink btnBlink.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - txtBlink.setVisibility(View.VISIBLE); - txtBlink.startAnimation(animBlink); - } + v -> { + txtBlink.setVisibility(View.VISIBLE); + txtBlink.startAnimation(animBlink); }); animRotate = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.rotate); - // Rotate - btnRotate.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - txtRotate.startAnimation(animRotate); - } - }); + btnRotate.setOnClickListener(v -> txtRotate.startAnimation(animRotate)); animMove = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.move); - // Move - btnMove.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - txtMove.startAnimation(animMove); - } - }); + + btnMove.setOnClickListener(v -> txtMove.startAnimation(animMove)); animBounce = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.bounce); - // Slide Down - btnBounce.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - txtBounce.startAnimation(animBounce); - } - }); - animSequential = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.sequential); - // Sequential - btnSequential.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - txtSeq.startAnimation(animSequential); - } - }); + btnBounce.setOnClickListener(v -> txtBounce.startAnimation(animBounce)); + animSequential = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.sequential); + + btnSequential.setOnClickListener(v -> txtSeq.startAnimation(animSequential)); } } diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/ButtonsActivity.java b/android/sample/src/main/java/com/facebook/flipper/sample/ButtonsActivity.java index ed54674ff..74a6fcb27 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/ButtonsActivity.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/ButtonsActivity.java @@ -26,11 +26,11 @@ public class ButtonsActivity extends FragmentActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_buttons); - text = (TextView) findViewById(R.id.count); + text = findViewById(R.id.count); - button = (Button) findViewById(com.facebook.flipper.sample.R.id.btn_inc); - dialogOld = (Button) findViewById(R.id.dialog_old_api); - dialogFragment = (Button) findViewById(R.id.dialog_fragment); + button = findViewById(com.facebook.flipper.sample.R.id.btn_inc); + dialogOld = findViewById(R.id.dialog_old_api); + dialogFragment = findViewById(R.id.dialog_fragment); button.setOnClickListener(view -> ButtonsActivity.this.text.setText(String.valueOf(++count))); dialogFragment.setOnClickListener( diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java index 63ded5e97..12942817d 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java @@ -24,6 +24,8 @@ public class FlipperSampleApplication extends Application { Fresco.initialize(this); final FlipperClient client = AndroidFlipperClient.getInstance(this); + assert client != null; + final FlipperInitializer.IntializationResult initializationResult = FlipperInitializer.initFlipperPlugins(this, client); diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/FragmentTestFragment.java b/android/sample/src/main/java/com/facebook/flipper/sample/FragmentTestFragment.java index 4bd31be23..cfccc9d52 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/FragmentTestFragment.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/FragmentTestFragment.java @@ -15,39 +15,39 @@ import android.widget.TextView; import androidx.fragment.app.Fragment; public class FragmentTestFragment extends Fragment { - View mView; - int mTicker; + View view; + int ticker; public FragmentTestFragment() { - mTicker = 0; + ticker = 0; } private void updateTicker() { try { - ViewGroup viewGroup = (ViewGroup) mView; + ViewGroup viewGroup = (ViewGroup) view; TextView textView = (TextView) viewGroup.getChildAt(1); - String text = String.valueOf(mTicker++); + String text = String.valueOf(ticker++); textView.setText(text); } finally { // 100% guarantee that this always happens, even if // your update method throws an exception - mView.postDelayed( + view.postDelayed( new Runnable() { @Override public void run() { updateTicker(); } }, - 10000); + 1000); } } @Override public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mView = inflater.inflate(R.layout.fragment_test, container, false); - mView.postDelayed( + view = inflater.inflate(R.layout.fragment_test, container, false); + view.postDelayed( new Runnable() { @Override public void run() { @@ -56,6 +56,6 @@ public class FragmentTestFragment extends Fragment { }, 1000); - return mView; + return view; } } diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/ListActivity.java b/android/sample/src/main/java/com/facebook/flipper/sample/ListActivity.java index 0f65041c3..35bd952c6 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/ListActivity.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/ListActivity.java @@ -24,7 +24,7 @@ public class ListActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_list); - listView = (ListView) findViewById(R.id.list); + listView = findViewById(R.id.list); list = new ArrayList<>(); list.add("Apple"); @@ -33,7 +33,7 @@ public class ListActivity extends Activity { list.add("Orange"); list.add("Lychee"); list.add("Guava"); - list.add("Peech"); + list.add("Peach"); list.add("Melon"); list.add("Watermelon"); list.add("Papaya"); diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java b/android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java index bf558c524..c5c4c17f1 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java @@ -29,7 +29,9 @@ public class MainActivity extends AppCompatActivity { final FlipperClient client = AndroidFlipperClient.getInstanceIfInitialized(); if (client != null) { final ExampleFlipperPlugin samplePlugin = client.getPluginByClass(ExampleFlipperPlugin.class); - samplePlugin.setActivity(this); + if (samplePlugin != null) { + samplePlugin.setActivity(this); + } } } } diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/TestDialogFragment.java b/android/sample/src/main/java/com/facebook/flipper/sample/TestDialogFragment.java index d47a3a442..cf39d498b 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/TestDialogFragment.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/TestDialogFragment.java @@ -9,10 +9,12 @@ package com.facebook.flipper.sample; import android.app.Dialog; import android.os.Bundle; +import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; public class TestDialogFragment extends DialogFragment { + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { // Use the Builder class for convenient dialog construction