From 4ef09ab959d1816eb7e27414714e3d8c5d26b894 Mon Sep 17 00:00:00 2001
From: Mohit Gupta <guptamm.22@gmail.com>
Date: Thu, 21 Jul 2022 16:45:23 +0530
Subject: [PATCH] fix fragments

---
 app/src/main/AndroidManifest.xml              |  4 ++--
 .../activities/{HOD => hod}/HodActivity.kt    |  2 +-
 .../FragmentPrinciple.kt                      |  2 +-
 .../ClassAttendanceFragment.kt                |  0
 .../{Student => student}/Student.kt           |  0
 .../StudentResultFragment.kt                  |  0
 .../FacultyAssignedSubjectsFragment.kt}       | 10 +++++-----
 .../attendence}/TeacherFragment.kt            |  2 +-
 .../adapters/AttendancePanelViewAdapter.kt    | 19 +++++++++++++++++++
 app/src/main/res/layout/activity_hod.xml      |  2 +-
 .../layout/attendance_panel_table_list.xml    | 10 +---------
 ...=> fragment_faculty_assigned_subjects.xml} |  2 +-
 .../layout/fragment_fargment_principal_ui.xml |  2 +-
 app/src/main/res/navigation/nav_graph.xml     |  4 ++--
 build.gradle                                  |  2 +-
 15 files changed, 36 insertions(+), 25 deletions(-)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{HOD => hod}/HodActivity.kt (87%)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{Principal => principal}/FragmentPrinciple.kt (96%)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{Student => student}/ClassAttendanceFragment.kt (100%)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{Student => student}/Student.kt (100%)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{Student => student}/StudentResultFragment.kt (100%)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{Teacher/AttendancePanelFragment.kt => teacher/attendence/FacultyAssignedSubjectsFragment.kt} (86%)
 rename app/src/main/java/cmsr/ipsacademy/net/activities/{Teacher => teacher/attendence}/TeacherFragment.kt (84%)
 rename app/src/main/res/layout/{fragment_attendance_panel.xml => fragment_faculty_assigned_subjects.xml} (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2bf4f1..3ae9473 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,10 +16,10 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
         <activity
-            android:name=".activities.Teacher.TeacherFragment"
+            android:name=".activities.teacher.attendence.TeacherFragment"
             android:exported="true"/>
         <activity
-            android:name=".activities.HOD.HodActivity"
+            android:name=".activities.hod.HodActivity"
             android:exported="false" />
         <activity
             android:name=".activities.LoginActivity"
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/HOD/HodActivity.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/hod/HodActivity.kt
similarity index 87%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/HOD/HodActivity.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/hod/HodActivity.kt
index ffd23b3..7d46b6a 100644
--- a/app/src/main/java/cmsr/ipsacademy/net/activities/HOD/HodActivity.kt
+++ b/app/src/main/java/cmsr/ipsacademy/net/activities/hod/HodActivity.kt
@@ -1,4 +1,4 @@
-package cmsr.ipsacademy.net.activities.HOD
+package cmsr.ipsacademy.net.activities.hod
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/Principal/FragmentPrinciple.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/principal/FragmentPrinciple.kt
similarity index 96%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/Principal/FragmentPrinciple.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/principal/FragmentPrinciple.kt
index 6785b64..41d2c17 100644
--- a/app/src/main/java/cmsr/ipsacademy/net/activities/Principal/FragmentPrinciple.kt
+++ b/app/src/main/java/cmsr/ipsacademy/net/activities/principal/FragmentPrinciple.kt
@@ -1,4 +1,4 @@
-package cmsr.ipsacademy.net.activities.Principal
+package cmsr.ipsacademy.net.activities.principal
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/Student/ClassAttendanceFragment.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/student/ClassAttendanceFragment.kt
similarity index 100%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/Student/ClassAttendanceFragment.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/student/ClassAttendanceFragment.kt
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/Student/Student.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/student/Student.kt
similarity index 100%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/Student/Student.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/student/Student.kt
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/Student/StudentResultFragment.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/student/StudentResultFragment.kt
similarity index 100%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/Student/StudentResultFragment.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/student/StudentResultFragment.kt
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/Teacher/AttendancePanelFragment.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/teacher/attendence/FacultyAssignedSubjectsFragment.kt
similarity index 86%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/Teacher/AttendancePanelFragment.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/teacher/attendence/FacultyAssignedSubjectsFragment.kt
index a507f73..b3f0a8a 100644
--- a/app/src/main/java/cmsr/ipsacademy/net/activities/Teacher/AttendancePanelFragment.kt
+++ b/app/src/main/java/cmsr/ipsacademy/net/activities/teacher/attendence/FacultyAssignedSubjectsFragment.kt
@@ -1,4 +1,4 @@
-package cmsr.ipsacademy.net.activities.Teacher
+package cmsr.ipsacademy.net.activities.teacher.attendence
 
 import android.os.Bundle
 import android.util.Log
@@ -11,16 +11,16 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import cmsr.ipsacademy.net.adapters.AttendancePanelViewAdapter
 import cmsr.ipsacademy.net.api.apiset
 import cmsr.ipsacademy.net.api.controller
-import cmsr.ipsacademy.net.databinding.FragmentAttendancePanelBinding
+import cmsr.ipsacademy.net.databinding.FragmentFacultyAssignedSubjectsBinding
 import cmsr.ipsacademy.net.helpers.AppConstants
 import cmsr.ipsacademy.net.helpers.SharedPreferencesHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class AttendancePanelFragment : Fragment() {
+class FacultyAssignedSubjectsFragment : Fragment() {
 
-    private var binding: FragmentAttendancePanelBinding? = null
+    private var binding: FragmentFacultyAssignedSubjectsBinding? = null
     private var sharedPreferencesHelper: SharedPreferencesHelper? = null
     private lateinit var myAdapter: AttendancePanelViewAdapter
 
@@ -68,7 +68,7 @@ class AttendancePanelFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
-        val fragmentBinding = FragmentAttendancePanelBinding.inflate(inflater, container, false)
+        val fragmentBinding = FragmentFacultyAssignedSubjectsBinding.inflate(inflater, container, false)
         binding = fragmentBinding
         return fragmentBinding.root
     }
diff --git a/app/src/main/java/cmsr/ipsacademy/net/activities/Teacher/TeacherFragment.kt b/app/src/main/java/cmsr/ipsacademy/net/activities/teacher/attendence/TeacherFragment.kt
similarity index 84%
rename from app/src/main/java/cmsr/ipsacademy/net/activities/Teacher/TeacherFragment.kt
rename to app/src/main/java/cmsr/ipsacademy/net/activities/teacher/attendence/TeacherFragment.kt
index d2e5e18..d0251c1 100644
--- a/app/src/main/java/cmsr/ipsacademy/net/activities/Teacher/TeacherFragment.kt
+++ b/app/src/main/java/cmsr/ipsacademy/net/activities/teacher/attendence/TeacherFragment.kt
@@ -1,4 +1,4 @@
-package cmsr.ipsacademy.net.activities.Teacher
+package cmsr.ipsacademy.net.activities.teacher.attendence
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
diff --git a/app/src/main/java/cmsr/ipsacademy/net/adapters/AttendancePanelViewAdapter.kt b/app/src/main/java/cmsr/ipsacademy/net/adapters/AttendancePanelViewAdapter.kt
index b3cbf30..8c9bb28 100644
--- a/app/src/main/java/cmsr/ipsacademy/net/adapters/AttendancePanelViewAdapter.kt
+++ b/app/src/main/java/cmsr/ipsacademy/net/adapters/AttendancePanelViewAdapter.kt
@@ -6,9 +6,17 @@ import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
+import androidx.fragment.app.findFragment
 import cmsr.ipsacademy.net.R
+import cmsr.ipsacademy.net.activities.MainActivity
 import cmsr.ipsacademy.net.activities.models.faculty.subjects.FacultySubjectDetailsModel
 import cmsr.ipsacademy.net.activities.models.faculty.subjects.FacultySubjectDetailsModelItem
+import cmsr.ipsacademy.net.activities.teacher.attendence.TakeAttendanceFragment
+import cmsr.ipsacademy.net.databinding.FragmentTakeAttendanceBinding
 import kotlinx.android.synthetic.main.attendance_panel_table_list.view.*
 
 class AttendancePanelViewAdapter(val context: Context): RecyclerView.Adapter<AttendancePanelViewAdapter.RowViewHolder>() {
@@ -48,6 +56,17 @@ class AttendancePanelViewAdapter(val context: Context): RecyclerView.Adapter<Att
                 txtDepartment.text = modal.department
                 txtSubject.text = modal.subject_name
                 txtSubjectCode.text = modal.university_sub_code
+
+                take_attendance_particular_subject_button.setOnClickListener {
+                    val fragment: TakeAttendanceFragment = TakeAttendanceFragment.newInstance()
+                    val activity = it.context as AppCompatActivity
+                    activity.supportFragmentManager.beginTransaction().replace(R.id.frame_layout_container, fragment).addToBackStack(null).commit()
+
+
+                }
+
+
+
             }
     }
 
diff --git a/app/src/main/res/layout/activity_hod.xml b/app/src/main/res/layout/activity_hod.xml
index 917e1a1..38a3ce2 100644
--- a/app/src/main/res/layout/activity_hod.xml
+++ b/app/src/main/res/layout/activity_hod.xml
@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.HOD.HodActivity">
+    tools:context=".activities.hod.HodActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/attendance_panel_table_list.xml b/app/src/main/res/layout/attendance_panel_table_list.xml
index fe8dcfd..a992fe6 100644
--- a/app/src/main/res/layout/attendance_panel_table_list.xml
+++ b/app/src/main/res/layout/attendance_panel_table_list.xml
@@ -65,6 +65,7 @@
         tools:ignore="RtlCompat">
 
         <TextView
+            android:id="@+id/take_attendance_particular_subject_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=" Take Attendance "
@@ -88,15 +89,6 @@
             android:text=" Modify "
             android:background="#E61010"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:text=" Lecture Plan "
-            android:background="#46b8da"/>
-
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_attendance_panel.xml b/app/src/main/res/layout/fragment_faculty_assigned_subjects.xml
similarity index 98%
rename from app/src/main/res/layout/fragment_attendance_panel.xml
rename to app/src/main/res/layout/fragment_faculty_assigned_subjects.xml
index 336e82c..da3f0ec 100644
--- a/app/src/main/res/layout/fragment_attendance_panel.xml
+++ b/app/src/main/res/layout/fragment_faculty_assigned_subjects.xml
@@ -11,7 +11,7 @@
         android:id="@+id/faculty_attendance_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".activities.Teacher.AttendancePanelFragment">
+        tools:context=".activities.teacher.attendence.FacultyAssignedSubjectsFragment">
 
         <!-- Table View-->
         <HorizontalScrollView
diff --git a/app/src/main/res/layout/fragment_fargment_principal_ui.xml b/app/src/main/res/layout/fragment_fargment_principal_ui.xml
index 0966950..d95cb11 100644
--- a/app/src/main/res/layout/fragment_fargment_principal_ui.xml
+++ b/app/src/main/res/layout/fragment_fargment_principal_ui.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".activities.Principal.FragmentPrinciple">
+    tools:context=".activities.principal.FragmentPrinciple">
 
     <TextView
         android:id="@+id/tv"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 6fad689..8330ee8 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -22,8 +22,8 @@
         tools:layout="@layout/fragment_class_attendance" />
     <fragment
         android:id="@+id/faculty_attendance_panel"
-        android:name="cmsr.ipsacademy.net.activities.Teacher.AttendancePanelFragment"
+        android:name="cmsr.ipsacademy.net.activities.teacher.attendence.FacultyAssignedSubjectsFragment"
         android:label="Attendance Panel"
-        tools:layout="@layout/fragment_attendance_panel" />
+        tools:layout="@layout/fragment_faculty_assigned_subjects" />
 
 </navigation>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 69e227c..4ef02c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:7.0.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
         classpath 'com.google.gms:google-services:4.3.10'
 
         // NOTE: Do not place your application dependencies here; they belong