Skip to content

Commit 14fe855

Browse files
committed
Code Refactored
1 parent 77f12e3 commit 14fe855

File tree

5 files changed

+36
-29
lines changed

5 files changed

+36
-29
lines changed

AndroidViewPagerLib/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ android {
3535
}
3636

3737
dependencies {
38-
3938
implementation 'androidx.core:core-ktx:1.8.0'
4039
implementation 'androidx.appcompat:appcompat:1.6.1'
4140
implementation 'com.google.android.material:material:1.5.0'

AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/adapters/ViewPagerAdapter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
import java.util.ArrayList;
99

10-
/** @author HaiderQadir **/
10+
/**
11+
* @author HaiderQadir
12+
**/
1113
public class ViewPagerAdapter extends FragmentPagerAdapter {
1214
ArrayList<Fragment> fragment = new ArrayList<Fragment>();
1315

AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/fragments/VPItemFragment.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import com.hq.androidviewpagerlib.R
1010

1111
/** @author HaiderQadir **/
1212

13-
class VPItemFragment(var mText: String) : Fragment() {
13+
class VPItemFragment(var mTitle: String,var mDetail:String) : Fragment() {
1414
private var mView: View? = null
15-
private var vp_item_textview: TextView? = null
15+
private var mTitleText: TextView? = null
16+
private var mDetailText: TextView? = null
1617

1718
override fun onCreate(savedInstanceState: Bundle?) {
1819
super.onCreate(savedInstanceState)
@@ -25,9 +26,13 @@ class VPItemFragment(var mText: String) : Fragment() {
2526
): View? {
2627
mView = inflater.inflate(R.layout.fragment_vp_item, container, false)
2728

29+
mTitleText = mView!!.findViewById<TextView>(R.id.vp_item_textview)
30+
mTitleText!!.text = mTitle
31+
32+
mDetailText = mView!!.findViewById<TextView>(R.id.vp_item_textview)
33+
mDetailText!!.text = mDetail
34+
2835

29-
vp_item_textview=mView!!.findViewById<TextView>(R.id.vp_item_textview)
30-
vp_item_textview!!.text = mText
3136

3237
return mView;
3338

AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/fragments/ViewPagerFragment.kt

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ import com.hq.androidviewpagerlib.adapters.ViewPagerAdapter
1515
/** @author HaiderQadir **/
1616

1717
class ViewPagerFragment(
18-
var footerCardVisibility: Boolean,
19-
var settingsIconVisibility: Boolean,
20-
var infoIconVisibility: Boolean
18+
private var footerCardVisibility: Boolean,
19+
private var settingsIconVisibility: Boolean,
20+
private var infoIconVisibility: Boolean
2121
) : Fragment() {
2222

2323
private var mView: View? = null
24-
private var mFooterCard: ConstraintLayout? = null
25-
private var mSettingsIcon: ImageView? = null
24+
private var viewPager: ViewPager? = null
25+
private var tabLayout: TabLayout? = null
2626
private var mInfoIcon: ImageView? = null
27-
28-
27+
private var mSettingsIcon: ImageView? = null
28+
private var mFooterCard: ConstraintLayout? = null
2929
override fun onCreate(savedInstanceState: Bundle?) {
3030
super.onCreate(savedInstanceState)
3131
}
@@ -35,36 +35,38 @@ class ViewPagerFragment(
3535
savedInstanceState: Bundle?
3636
): View? {
3737
mView = inflater.inflate(R.layout.fragment_view_pager, container, false)
38-
val adapter = fragmentManager?.let { ViewPagerAdapter(it) }
3938

40-
mFooterCard = mView!!.findViewById(R.id.footer_card_CL)
41-
mSettingsIcon = mView!!.findViewById(R.id.iv_settings_card)
42-
mInfoIcon = mView!!.findViewById(R.id.iv_i_card)
39+
mInit()
4340

41+
val adapter = fragmentManager?.let { ViewPagerAdapter(it) }
4442
if (!footerCardVisibility) mFooterCard!!.visibility = View.GONE
4543
if (!settingsIconVisibility) mSettingsIcon!!.visibility = View.GONE
4644
if (!infoIconVisibility) mInfoIcon!!.visibility = View.GONE
4745

4846
adapter!!.addFragment(
49-
VPItemFragment("Fragment_1")
47+
VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
5048
)
5149
adapter!!.addFragment(
52-
VPItemFragment("Fragment_2")
50+
VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
5351
)
5452
adapter!!.addFragment(
55-
VPItemFragment("Fragment_3")
53+
VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
5654
)
5755
adapter!!.addFragment(
58-
VPItemFragment("Fragment_4")
56+
VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
5957
)
60-
var viewPager: ViewPager? = null
61-
var tabLayout: TabLayout? = null
62-
viewPager = mView!!.findViewById(R.id.view_pager)
63-
tabLayout = mView!!.findViewById(R.id.tab_layout)
6458

65-
viewPager.adapter = adapter
66-
tabLayout.setupWithViewPager(viewPager, true)
59+
viewPager!!.adapter = adapter
60+
tabLayout!!.setupWithViewPager(viewPager, true)
6761
return mView;
6862
}
6963

64+
private fun mInit() {
65+
mFooterCard = mView!!.findViewById(R.id.footer_card_CL)
66+
mSettingsIcon = mView!!.findViewById(R.id.iv_settings_card)
67+
mInfoIcon = mView!!.findViewById(R.id.iv_i_card)
68+
viewPager = mView!!.findViewById(R.id.view_pager)
69+
tabLayout = mView!!.findViewById(R.id.tab_layout)
70+
}
71+
7072
}

app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
minSdk 24
1313
targetSdk 33
1414
versionCode 1
15-
versionName "1.0"
15+
versionName "v1.0"
1616

1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
}
@@ -45,5 +45,4 @@ dependencies {
4545
testImplementation 'junit:junit:4.13.2'
4646
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
4747
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
48-
4948
}

0 commit comments

Comments
 (0)