Skip to content

Commit b636935

Browse files
Merge pull request #38 from D4rK7355608/codex/check-if-codeviewutils-and-codehighlighter-can-be-merged
Ensure consistent CodeView setup
2 parents ec607d0 + 08ea2e3 commit b636935

File tree

10 files changed

+58
-79
lines changed

10 files changed

+58
-79
lines changed

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/viewbinding/ViewBindingTutorialActivity.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ protected void onCreate(Bundle savedInstanceState) {
4444
binding.moreAboutViewBindingButton.setOnClickListener(v ->
4545
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://developer.android.com/topic/libraries/view-binding#java"))));
4646

47+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
48+
Typeface monospaceFont = FontManager.getMonospaceFont(this, prefs);
49+
CodeViewUtils.applyDefaults(monospaceFont,
50+
binding.codeViewBindingGradle,
51+
binding.codeViewBindingActivities,
52+
binding.codeViewBindingFragments);
53+
4754
InputStream bindingGradle = getResources().openRawResource(R.raw.text_binding_gradle);
4855
binding.codeViewBindingGradle.setText(readTextFromInputStream(bindingGradle));
4956
CodeHighlighter.applyJavaTheme(binding.codeViewBindingGradle);
@@ -55,13 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
5562
InputStream bindingFragment = getResources().openRawResource(R.raw.text_binding_fragment);
5663
binding.codeViewBindingFragments.setText(readTextFromInputStream(bindingFragment));
5764
CodeHighlighter.applyJavaTheme(binding.codeViewBindingFragments);
58-
59-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
60-
Typeface monospaceFont = FontManager.getMonospaceFont(this, prefs);
61-
CodeViewUtils.applyDefaults(monospaceFont,
62-
binding.codeViewBindingGradle,
63-
binding.codeViewBindingActivities,
64-
binding.codeViewBindingFragments);
6565
}
6666

6767
private String readTextFromInputStream(InputStream inputStream) {

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/tabs/ButtonsTabCodeFragment.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3535
binding = FragmentSameCodeBinding.inflate(inflater, container, false);
3636
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3737
binding.adView.loadAd(new AdRequest.Builder().build());
38+
39+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
40+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
41+
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
42+
3843
StringBuilder builder = new StringBuilder();
3944
InputStream inputStream = getResources().openRawResource(R.raw.text_buttons_java);
4045
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
@@ -51,11 +56,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5156
return binding.getRoot();
5257
}
5358

54-
@Override
55-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
56-
super.onViewCreated(view, savedInstanceState);
57-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
58-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
59-
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
60-
}
6159
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/tabs/ButtonsTabLayoutFragment.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3838
binding = FragmentButtonsLayoutBinding.inflate(inflater, container, false);
3939
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
4040
binding.adView.loadAd(new AdRequest.Builder().build());
41+
42+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
43+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
44+
CodeViewUtils.applyDefaults(monospaceFont, buttonXMLResources.values().toArray(new CodeView[0]));
4145
buttonXMLResources.put(R.raw.text_button_normal_xml, binding.codeViewButtonNormalXml);
4246
buttonXMLResources.put(R.raw.text_button_outlined_xml, binding.codeViewButtonOutlinedXml);
4347
buttonXMLResources.put(R.raw.text_button_elevated_xml, binding.codeViewButtonElevatedXml);
@@ -74,11 +78,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
7478
return binding.getRoot();
7579
}
7680

77-
@Override
78-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
79-
super.onViewCreated(view, savedInstanceState);
80-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
81-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
82-
CodeViewUtils.applyDefaults(monospaceFont, buttonXMLResources.values().toArray(new CodeView[0]));
83-
}
8481
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/tabs/ClockTabLayoutFragment.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3535
binding = FragmentClockLayoutBinding.inflate(inflater, container, false);
3636
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3737
binding.adView.loadAd(new AdRequest.Builder().build());
38+
39+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
40+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
41+
CodeViewUtils.applyDefaults(monospaceFont,
42+
binding.codeViewDigitalClockXml,
43+
binding.codeViewTextClockXml,
44+
binding.codeViewAnalogClockXml);
3845
setCodeView(binding.codeViewDigitalClockXml, R.raw.text_clock_digital_xml);
3946
setCodeView(binding.codeViewTextClockXml, R.raw.text_clock_xml);
4047
setCodeView(binding.codeViewAnalogClockXml, R.raw.text_clock_analog_xml);
@@ -56,15 +63,4 @@ private void setCodeView(CodeView codeView, int rawResource) {
5663
Log.e("ClockTab", "Error reading clock layout", e);
5764
}
5865
}
59-
60-
@Override
61-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
62-
super.onViewCreated(view, savedInstanceState);
63-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
64-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
65-
CodeViewUtils.applyDefaults(monospaceFont,
66-
binding.codeViewDigitalClockXml,
67-
binding.codeViewTextClockXml,
68-
binding.codeViewAnalogClockXml);
69-
}
7066
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/tabs/LinearLayoutTabLayoutFragment.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3434
binding = FragmentLinearLayoutLayoutBinding.inflate(inflater, container, false);
3535
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3636
binding.adView.loadAd(new AdRequest.Builder().build());
37+
38+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
39+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
40+
CodeViewUtils.applyDefaults(monospaceFont,
41+
binding.codeViewVerticalXml,
42+
binding.codeViewHorizontalXml);
43+
3744
StringBuilder verticalBuilder = new StringBuilder();
3845
try (BufferedReader readerVertical = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.text_linear_layout_vertical_xml)))) {
3946
String line;
@@ -58,14 +65,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5865
}
5966
return binding.getRoot();
6067
}
61-
62-
@Override
63-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
64-
super.onViewCreated(view, savedInstanceState);
65-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
66-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
67-
CodeViewUtils.applyDefaults(monospaceFont,
68-
binding.codeViewVerticalXml,
69-
binding.codeViewHorizontalXml);
70-
}
7168
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/tabs/RelativeLayoutTabLayoutFragment.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3535
binding = FragmentLayoutBinding.inflate(inflater, container, false);
3636
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3737
binding.adView.loadAd(new AdRequest.Builder().build());
38+
39+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
40+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
41+
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
42+
3843
StringBuilder builder = new StringBuilder();
3944
InputStream inputStream = getResources().openRawResource(R.raw.text_relative_layout_xml);
4045
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
@@ -50,11 +55,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5055
return binding.getRoot();
5156
}
5257

53-
@Override
54-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
55-
super.onViewCreated(view, savedInstanceState);
56-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
57-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
58-
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
59-
}
6058
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/tabs/TableLayoutTabLayoutFragment.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3535
binding = FragmentLayoutBinding.inflate(inflater, container, false);
3636
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3737
binding.adView.loadAd(new AdRequest.Builder().build());
38+
39+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
40+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
41+
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
42+
3843
StringBuilder builder = new StringBuilder();
3944
InputStream inputStream = getResources().openRawResource(R.raw.text_table_layout_xml);
4045
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
@@ -50,11 +55,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5055
return binding.getRoot();
5156
}
5257

53-
@Override
54-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
55-
super.onViewCreated(view, savedInstanceState);
56-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
57-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
58-
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
59-
}
6058
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/tabs/ProgressBarTabCodeFragment.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3535
binding = FragmentCodeBinding.inflate(inflater, container, false);
3636
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3737
binding.adView.loadAd(new AdRequest.Builder().build());
38+
39+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
40+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
41+
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
42+
3843
StringBuilder builder = new StringBuilder();
3944
InputStream inputStream = getResources().openRawResource(R.raw.text_progress_bar_java);
4045
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
@@ -50,11 +55,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5055
return binding.getRoot();
5156
}
5257

53-
@Override
54-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
55-
super.onViewCreated(view, savedInstanceState);
56-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
57-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
58-
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
59-
}
6058
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/tabs/ProgressBarTabLayoutFragment.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3434
binding = FragmentLinearLayoutLayoutBinding.inflate(inflater, container, false);
3535
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3636
binding.adView.loadAd(new AdRequest.Builder().build());
37+
38+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
39+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
40+
CodeViewUtils.applyDefaults(monospaceFont,
41+
binding.codeViewVerticalXml,
42+
binding.codeViewHorizontalXml);
43+
3744
StringBuilder verticalBuilder = new StringBuilder();
3845
try (BufferedReader readerVertical = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.text_progress_bar_xml)))) {
3946
String line;
@@ -59,13 +66,4 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5966
return binding.getRoot();
6067
}
6168

62-
@Override
63-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
64-
super.onViewCreated(view, savedInstanceState);
65-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
66-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
67-
CodeViewUtils.applyDefaults(monospaceFont,
68-
binding.codeViewVerticalXml,
69-
binding.codeViewHorizontalXml);
70-
}
7169
}

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/tabs/ImagesTabLayoutFragment.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3535
binding = FragmentLayoutBinding.inflate(inflater, container, false);
3636
new FastScrollerBuilder(binding.scrollView).useMd2Style().build();
3737
binding.adView.loadAd(new AdRequest.Builder().build());
38+
39+
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
40+
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
41+
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
42+
3843
StringBuilder builder = new StringBuilder();
3944
InputStream inputStream = getResources().openRawResource(R.raw.text_image_view_xml);
4045
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
@@ -50,11 +55,5 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
5055
return binding.getRoot();
5156
}
5257

53-
@Override
54-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
55-
super.onViewCreated(view, savedInstanceState);
56-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
57-
Typeface monospaceFont = FontManager.getMonospaceFont(requireContext(), prefs);
58-
CodeViewUtils.applyDefaults(monospaceFont, binding.codeView);
59-
}
58+
6059
}

0 commit comments

Comments
 (0)