Merge branch 'develop' into imgbot

takasurazeem · Sep 23, 2023 · d61a1f8 · d61a1f8
2 parents ff40ede + ac6ba9f
commit d61a1f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/QuranMajeed/Quiz/Main/View/SuraListView.swift b/QuranMajeed/Quiz/Main/View/SuraListView.swift
@@ -31,6 +31,7 @@ struct SuraListView: View {
                 presentationMode.wrappedValue.dismiss()
             }
         }
+        .navigationTitle("Select Sura")
         .searchable(text: $searchText)
     }
 }

diff --git a/QuranMajeed/Quiz/Main/View/VerseListView.swift b/QuranMajeed/Quiz/Main/View/VerseListView.swift
@@ -34,29 +34,20 @@ struct VerseListView: View {
             }
         }
         .environment(\.editMode, $defaultEditMode)
-        .onDisappear {
-            defaultEditMode = .inactive
-        }
         .onChange(of: selection) { newValue in
             if newValue.count > 0 {
                 selectedVerses = Array(selection).sorted()
             }
         }
-        .onChange(of: editMode?.wrappedValue) { newValue in
-            if newValue == EditMode.inactive {
-                dismiss()
-            } else {
-                // Leaving edit mode (e.g. 'Done' tapped)
-            }
-        }
         .searchable(text: $searchText)
         .navigationTitle("Ayah Selection")
-        .toolbar { EditButton() }
     }
 }
 
-#Preview {
-    ContentPreview()
+struct VerseListView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentPreview()
+    }
 }
 
 fileprivate struct ContentPreview: View {

diff --git a/QuranMajeed/Quiz/Main/ViewModel/QuizViewModel.swift b/QuranMajeed/Quiz/Main/ViewModel/QuizViewModel.swift
@@ -70,20 +70,6 @@ extension QuizView {
                 suras = reading.quran.suras
             }
         }
-
-        func addSelectedVerseToQuiz() {
-//            if selectedVerses.contains(where: { verse in
-//                (verse.surahId == selectedSurah.id && verse.ayahId == selectedVerse.id) || verse.text == selectedVerse.text
-//            }) == false {
-//                let verse = QuizVerse(
-//                    surahId: selectedSurah.id,
-//                    ayahId: selectedVerse.id,
-//                    text: selectedVerse.text
-//                )
-//                print(verse)
-//                selectedVerses.append(verse)
-//            }
-        }
 
         func delete(at offsets: IndexSet) {
             selectedVerses.remove(atOffsets: offsets)