Skip to content

Commit 8f791f4

Browse files
yschimkeyschimke
committed
ViewBinding fixes
1 parent 1d8062a commit 8f791f4

File tree

10 files changed

+167
-149
lines changed

10 files changed

+167
-149
lines changed

‎mediacontroller/src/main/java/com/example/android/mediacontroller/Action.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class Action {
3939

4040
private static final String TAG = Action.class.getSimpleName();
4141

42-
private int mId;
43-
private String mName;
42+
private final int mId;
43+
private final String mName;
4444
private MediaControllerAction mControllerAction;
4545

4646
public Action(String name) {

‎mediacontroller/src/main/java/com/example/android/mediacontroller/LaunchActivity.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
import android.os.Build;
2828
import android.os.Build.VERSION_CODES;
2929
import android.os.Bundle;
30+
import android.view.LayoutInflater;
3031
import android.widget.Toast;
3132

33+
import com.example.android.mediacontroller.databinding.ActivityLaunchBinding;
3234
import com.example.android.mediacontroller.tasks.FindMediaAppsTask;
3335
import com.example.android.mediacontroller.tasks.FindMediaBrowserAppsTask;
3436
import com.example.android.mediacontroller.tasks.FindMediaSessionAppsTask;
@@ -120,13 +122,15 @@ public void onAppListUpdated(
120122
? new MediaSessionListener()
121123
: null;
122124

125+
private ActivityLaunchBinding binding;
126+
123127
@Override
124128
protected void onCreate(Bundle savedInstanceState) {
125129
super.onCreate(savedInstanceState);
126130

127-
setContentView(R.layout.activity_launch);
128-
Toolbar toolbar = findViewById(R.id.toolbar);
129-
setSupportActionBar(toolbar);
131+
binding = ActivityLaunchBinding.inflate(LayoutInflater.from(this));
132+
setContentView(binding.getRoot());
133+
setSupportActionBar(binding.toolbar);
130134

131135
mediaAppsAdapter = new MediaAppListAdapter((app, isTest) -> {
132136
if (mSnackbar != null) {
@@ -144,7 +148,7 @@ protected void onCreate(Bundle savedInstanceState) {
144148
mMediaSessionListener.onCreate(mediaAppsAdapter);
145149
}
146150

147-
RecyclerView mediaAppsList = findViewById(R.id.app_list);
151+
RecyclerView mediaAppsList = binding.appList;
148152
mediaAppsList.setLayoutManager(new LinearLayoutManager(this));
149153
mediaAppsList.setHasFixedSize(true);
150154
mediaAppsList.setAdapter(mediaAppsAdapter);

‎mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppControllerActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ public class MediaAppControllerActivity extends AppCompatActivity {
132132
private MediaBrowserCompat mBrowserExtraSuggested;
133133
private AudioFocusHelper mAudioFocusHelper;
134134
private RatingUiHelper mRatingUiHelper;
135-
private CustomControlsAdapter mCustomControlsAdapter = new CustomControlsAdapter();
136-
private BrowseMediaItemsAdapter mBrowseMediaItemsAdapter = new BrowseMediaItemsAdapter();
137-
private BrowseMediaItemsAdapter mBrowseMediaItemsExtraSuggestedAdapter = new BrowseMediaItemsAdapter();
138-
private SearchMediaItemsAdapter mSearchMediaItemsAdapter = new SearchMediaItemsAdapter();
135+
private final CustomControlsAdapter mCustomControlsAdapter = new CustomControlsAdapter();
136+
private final BrowseMediaItemsAdapter mBrowseMediaItemsAdapter = new BrowseMediaItemsAdapter();
137+
private final BrowseMediaItemsAdapter mBrowseMediaItemsExtraSuggestedAdapter = new BrowseMediaItemsAdapter();
138+
private final SearchMediaItemsAdapter mSearchMediaItemsAdapter = new SearchMediaItemsAdapter();
139139

140140
private ModeHelper mShuffleToggle;
141141
private ModeHelper mRepeatToggle;

‎mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ import android.widget.Button
3535
import android.widget.ScrollView
3636
import androidx.annotation.NonNull
3737
import androidx.core.content.ContextCompat
38+
import androidx.core.widget.TextViewCompat
3839
import androidx.recyclerview.widget.LinearLayoutManager
3940
import androidx.recyclerview.widget.RecyclerView
41+
import com.example.android.mediacontroller.databinding.ActivityMediaAppTestingBinding
4042
import com.example.android.mediacontroller.databinding.MediaTestSuiteResultBinding
43+
import com.example.android.mediacontroller.databinding.RunSuiteIterDialogBinding
44+
import com.example.android.mediacontroller.databinding.TestSuiteResultsDialogBinding
4145

4246
import java.util.concurrent.Semaphore
4347
import kotlin.concurrent.thread
@@ -149,7 +153,8 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
149153
dialog.apply {
150154
setCancelable(false)
151155
requestWindowFeature(Window.FEATURE_NO_TITLE)
152-
setContentView(R.layout.run_suite_iter_dialog)
156+
var binding = RunSuiteIterDialogBinding.inflate(layoutInflater)
157+
setContentView(binding.root)
153158
progressBar = findViewById<ProgressBar>(R.id.suite_iter_progress_bar).apply {
154159
max = numIter * testList.size
155160
progress = -1
@@ -275,7 +280,7 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
275280
for (test in testList) {
276281
iDToResultsMap[test.id] = TestCaseResults()
277282
}
278-
resultsAdapter = ResultsAdapter(arrayOf<TestOptionDetails>())
283+
resultsAdapter = ResultsAdapter(arrayOf())
279284
testSuiteResultsLayout.removeAllViews()
280285
displayResults()
281286
}
@@ -293,7 +298,7 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
293298
/**
294299
* Class to store all of a tests resulting info.
295300
*/
296-
inner class TestCaseResults() {
301+
inner class TestCaseResults {
297302
var totalRuns = 0
298303
var numPassing = 0
299304
var passingLogs = arrayListOf<ArrayList<String>>()
@@ -347,7 +352,9 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
347352
override fun onClick(p0: View?) {
348353
var dialog = Dialog(context).apply {
349354
requestWindowFeature(Window.FEATURE_NO_TITLE)
350-
setContentView(R.layout.test_suite_results_dialog)
355+
356+
val binding = TestSuiteResultsDialogBinding.inflate(layoutInflater)
357+
setContentView(binding.root)
351358
findViewById<TextView>(R.id.results_title).text = name
352359
findViewById<TextView>(R.id.results_subtitle).text = description
353360

@@ -358,15 +365,15 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
358365
for (logsList in iDToResultsMap[testId]!!.passingLogs) {
359366
passing_results_log.addView(TextView(context).apply {
360367
text = resources.getString(R.string.test_iter_divider)
361-
setTextAppearance(context, R.style.SubHeader)
368+
TextViewCompat.setTextAppearance(this, R.style.SubHeader)
362369
gravity = Gravity.CENTER
363370
setTextColor(PASSING_COLOR)
364371
})
365372
for (line in logsList) {
366-
var logLine = TextView(context).apply {
373+
val logLine = TextView(context).apply {
367374
text = line
368375

369-
setTextAppearance(context, R.style.SubText)
376+
TextViewCompat.setTextAppearance(this, R.style.SubText)
370377
}
371378
passing_results_log.addView(logLine)
372379
}
@@ -382,14 +389,14 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
382389
for (logsList in iDToResultsMap[testId]!!.failingLogs) {
383390
failing_results_log.addView(TextView(context).apply {
384391
text = resources.getString(R.string.test_iter_divider)
385-
setTextAppearance(context, R.style.SubHeader)
392+
TextViewCompat.setTextAppearance(this, R.style.SubHeader)
386393
gravity = Gravity.CENTER
387394
setTextColor(FAILING_COLOR)
388395
})
389396
for (line in logsList) {
390-
var logLine = TextView(context).apply {
397+
val logLine = TextView(context).apply {
391398
text = line
392-
setTextAppearance(context, R.style.SubText)
399+
TextViewCompat.setTextAppearance(this, R.style.SubText)
393400
}
394401
failing_results_log.addView(logLine)
395402
}
@@ -399,7 +406,7 @@ class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: Str
399406
findViewById<TextView>(R.id.failing_logs_header).visibility = View.GONE
400407
}
401408
findViewById<ScrollView>(R.id.results_scroll_view).layoutParams.height = (MediaAppTestingActivity.getScreenHeightPx(context) / 2).toInt()
402-
findViewById<Button>(R.id.close_results_button).setOnClickListener(View.OnClickListener { dismiss() })
409+
findViewById<Button>(R.id.close_results_button).setOnClickListener { dismiss() }
403410
}.show()
404411
}
405412
}

0 commit comments

Comments
 (0)