Skip to content

Commit d2ef14a

Browse files
committed
Improve sample
Kotlin 1.8.0.
1 parent 1471c16 commit d2ef14a

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildscript {
2424
'dynamic' : '4.4.7',
2525
'fragment' : '1.5.5',
2626
'flexbox' : '3.0.0',
27-
'kotlin' : '1.7.10',
27+
'kotlin' : '1.8.0',
2828
'locale' : '2.3.0',
2929
'material' : '1.9.0-alpha01',
3030
'preferences' : '2.2.2',

sample/src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/AboutFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class AboutFragment : DynamicViewPager2Fragment() {
7878
return super.onMenuItemSelected(item)
7979
}
8080

81-
override fun getSubtitle(): CharSequence? {
81+
override fun getSubtitle(): CharSequence {
8282
// Set subtitle for the app compat activity.
8383
return getString(R.string.ads_about);
8484
}
@@ -93,7 +93,7 @@ class AboutFragment : DynamicViewPager2Fragment() {
9393
return R.id.nav_about
9494
}
9595

96-
override fun getTitle(position: Int): String? {
96+
override fun getTitle(position: Int): String {
9797
// TODO: Return tab titles.
9898
return when (position) {
9999
1 -> getString(R.string.ads_notices)

sample/src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/HomeFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class HomeFragment : DynamicFragment() {
5252
}
5353
}
5454

55-
override fun getSubtitle(): CharSequence? {
55+
override fun getSubtitle(): CharSequence {
5656
// Set subtitle for the app compat activity.
5757
return getString(R.string.ads_nav_home)
5858
}

sample/src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/SettingsFragment.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.pranavpandey.android.dynamic.support.sample.fragment
1818

1919
import android.os.Bundle
20+
import android.view.View
2021
import androidx.fragment.app.Fragment
2122
import com.google.android.material.appbar.AppBarLayout
2223
import com.pranavpandey.android.dynamic.support.fragment.DynamicViewPager2Fragment
@@ -38,7 +39,7 @@ class SettingsFragment : DynamicViewPager2Fragment() {
3839
*
3940
* @return The new instance of [SettingsFragment].
4041
*/
41-
fun newInstance(page: Int): androidx.fragment.app.Fragment {
42+
fun newInstance(page: Int): Fragment {
4243
val fragment = SettingsFragment()
4344
val args = Bundle()
4445
args.putInt(DynamicViewPagerFragment.ADS_ARGS_VIEW_PAGER_PAGE, page)
@@ -48,7 +49,7 @@ class SettingsFragment : DynamicViewPager2Fragment() {
4849
}
4950
}
5051

51-
override fun getSubtitle(): CharSequence? {
52+
override fun getSubtitle(): CharSequence {
5253
// Set subtitle for the app compat activity.
5354
return getString(R.string.ads_nav_settings)
5455
}
@@ -63,7 +64,7 @@ class SettingsFragment : DynamicViewPager2Fragment() {
6364
return R.id.nav_settings
6465
}
6566

66-
override fun getTitle(position: Int): String? {
67+
override fun getTitle(position: Int): String {
6768
// TODO: Return tab titles.
6869
return when (position) {
6970
1 -> getString(R.string.ads_widgets)
@@ -84,12 +85,12 @@ class SettingsFragment : DynamicViewPager2Fragment() {
8485
return 2
8586
}
8687

87-
override fun onActivityCreated(savedInstanceState: Bundle?) {
88-
super.onActivityCreated(savedInstanceState)
88+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
89+
super.onViewCreated(view, savedInstanceState)
8990

9091
// Scroll toolbar for this fragment.
9192
dynamicActivity.setToolbarLayoutFlags(
92-
AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
93-
or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS)
93+
AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
94+
or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS)
9495
}
9596
}

0 commit comments

Comments
 (0)