Code Refactored

HaiderQadir · Jul 11, 2023 · 14fe855 · 14fe855
1 parent 77f12e3
commit 14fe855
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 29 deletions.
diff --git a/AndroidViewPagerLib/build.gradle b/AndroidViewPagerLib/build.gradle
@@ -35,7 +35,6 @@ android {
 }
 
 dependencies {
-
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.5.0'

diff --git a/AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/adapters/ViewPagerAdapter.java b/AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/adapters/ViewPagerAdapter.java
@@ -7,7 +7,9 @@
 
 import java.util.ArrayList;
 
-/** @author HaiderQadir **/
+/**
+ * @author HaiderQadir
+ **/
 public class ViewPagerAdapter extends FragmentPagerAdapter {
     ArrayList<Fragment> fragment = new ArrayList<Fragment>();
 

diff --git a/AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/fragments/VPItemFragment.kt b/AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/fragments/VPItemFragment.kt
@@ -10,9 +10,10 @@ import com.hq.androidviewpagerlib.R
 
 /** @author HaiderQadir **/
 
-class VPItemFragment(var mText: String) : Fragment() {
+class VPItemFragment(var mTitle: String,var mDetail:String) : Fragment() {
     private var mView: View? = null
-    private var vp_item_textview: TextView? = null
+    private var mTitleText: TextView? = null
+    private var mDetailText: TextView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -25,9 +26,13 @@ class VPItemFragment(var mText: String) : Fragment() {
     ): View? {
         mView = inflater.inflate(R.layout.fragment_vp_item, container, false)
 
+        mTitleText = mView!!.findViewById<TextView>(R.id.vp_item_textview)
+        mTitleText!!.text = mTitle
+
+        mDetailText = mView!!.findViewById<TextView>(R.id.vp_item_textview)
+        mDetailText!!.text = mDetail
+
 
-        vp_item_textview=mView!!.findViewById<TextView>(R.id.vp_item_textview)
-        vp_item_textview!!.text = mText
 
         return mView;
 

diff --git a/AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/fragments/ViewPagerFragment.kt b/AndroidViewPagerLib/src/main/java/com/hq/androidviewpagerlib/fragments/ViewPagerFragment.kt
@@ -15,17 +15,17 @@ import com.hq.androidviewpagerlib.adapters.ViewPagerAdapter
 /** @author HaiderQadir **/
 
 class ViewPagerFragment(
-    var footerCardVisibility: Boolean,
-    var settingsIconVisibility: Boolean,
-    var infoIconVisibility: Boolean
+    private var footerCardVisibility: Boolean,
+    private var settingsIconVisibility: Boolean,
+    private var infoIconVisibility: Boolean
 ) : Fragment() {
 
     private var mView: View? = null
-    private var mFooterCard: ConstraintLayout? = null
-    private var mSettingsIcon: ImageView? = null
+    private var viewPager: ViewPager? = null
+    private var tabLayout: TabLayout? = null
     private var mInfoIcon: ImageView? = null
-
-
+    private var mSettingsIcon: ImageView? = null
+    private var mFooterCard: ConstraintLayout? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
     }
@@ -35,36 +35,38 @@ class ViewPagerFragment(
         savedInstanceState: Bundle?
     ): View? {
         mView = inflater.inflate(R.layout.fragment_view_pager, container, false)
-        val adapter = fragmentManager?.let { ViewPagerAdapter(it) }
 
-        mFooterCard = mView!!.findViewById(R.id.footer_card_CL)
-        mSettingsIcon = mView!!.findViewById(R.id.iv_settings_card)
-        mInfoIcon = mView!!.findViewById(R.id.iv_i_card)
+        mInit()
 
+        val adapter = fragmentManager?.let { ViewPagerAdapter(it) }
         if (!footerCardVisibility) mFooterCard!!.visibility = View.GONE
         if (!settingsIconVisibility) mSettingsIcon!!.visibility = View.GONE
         if (!infoIconVisibility) mInfoIcon!!.visibility = View.GONE
 
         adapter!!.addFragment(
-            VPItemFragment("Fragment_1")
+            VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
         )
         adapter!!.addFragment(
-            VPItemFragment("Fragment_2")
+            VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
         )
         adapter!!.addFragment(
-            VPItemFragment("Fragment_3")
+            VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
         )
         adapter!!.addFragment(
-            VPItemFragment("Fragment_4")
+            VPItemFragment("Fragment_1_Title", "Fragment_1_Detail")
         )
-        var viewPager: ViewPager? = null
-        var tabLayout: TabLayout? = null
-        viewPager = mView!!.findViewById(R.id.view_pager)
-        tabLayout = mView!!.findViewById(R.id.tab_layout)
 
-        viewPager.adapter = adapter
-        tabLayout.setupWithViewPager(viewPager, true)
+        viewPager!!.adapter = adapter
+        tabLayout!!.setupWithViewPager(viewPager, true)
         return mView;
     }
 
+    private fun mInit() {
+        mFooterCard = mView!!.findViewById(R.id.footer_card_CL)
+        mSettingsIcon = mView!!.findViewById(R.id.iv_settings_card)
+        mInfoIcon = mView!!.findViewById(R.id.iv_i_card)
+        viewPager = mView!!.findViewById(R.id.view_pager)
+        tabLayout = mView!!.findViewById(R.id.tab_layout)
+    }
+
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 24
         targetSdk 33
         versionCode 1
-        versionName "1.0"
+        versionName "v1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -45,5 +45,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
 }