Skip to content

Commit cdaa084

Browse files
certified84certified84
committed
Changed the design of all the the search views
1 parent 6f96bb7 commit cdaa084

16 files changed

Lines changed: 414 additions & 286 deletions

‎app/src/main/java/com/certified/notes/adapters/ViewPagerAdapter.java‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎app/src/main/java/com/certified/notes/adapters/ViewPagerAdapter.kt‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.certified.notes.adapters
2+
3+
import android.view.LayoutInflater
4+
import android.view.View
5+
import android.view.ViewGroup
6+
import android.widget.TextView
7+
import androidx.recyclerview.widget.RecyclerView
8+
import com.airbnb.lottie.LottieAnimationView
9+
import com.airbnb.lottie.RenderMode
10+
import com.certified.notes.R
11+
import com.certified.notes.model.SliderItem
12+
13+
class ViewPagerAdapter(private val sliderItem: List<SliderItem>) :
14+
RecyclerView.Adapter<ViewPagerAdapter.ViewPagerViewHolder>() {
15+
16+
inner class ViewPagerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
17+
18+
private val animationView: LottieAnimationView = itemView.findViewById(R.id.animation_view)
19+
private val tvTitle: TextView = itemView.findViewById(R.id.tv_title)
20+
private val tvDescription: TextView = itemView.findViewById(R.id.tv_description)
21+
22+
fun setItems(sliderItem: SliderItem) {
23+
animationView.setRenderMode(RenderMode.SOFTWARE)
24+
animationView.setAnimation(sliderItem.animation)
25+
tvTitle.text = sliderItem.title
26+
tvDescription.text = sliderItem.description
27+
}
28+
}
29+
30+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewPagerViewHolder {
31+
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_view_pager, parent, false)
32+
return ViewPagerViewHolder(view)
33+
}
34+
35+
override fun onBindViewHolder(holder: ViewPagerViewHolder, position: Int) {
36+
holder.setItems(sliderItem[position])
37+
}
38+
39+
override fun getItemCount(): Int {
40+
return sliderItem.size
41+
}
42+
}

‎app/src/main/java/com/certified/notes/ui/OnboardingFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class OnboardingFragment : Fragment() {
8989
}
9090

9191
private fun setUpViewPager() {
92-
viewPagerAdapter = ViewPagerAdapter(sliderItem, viewPager2)
92+
viewPagerAdapter = ViewPagerAdapter(sliderItem)
9393
viewPager2.adapter = viewPagerAdapter
9494
viewPager2.registerOnPageChangeCallback(object : OnPageChangeCallback() {
9595
override fun onPageSelected(position: Int) {

‎app/src/main/res/drawable/search_view_bg.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape>
5-
<stroke android:color="?attr/colorPrimary"
6-
android:width="2dp"/>
5+
<!-- <stroke android:color="?attr/colorPrimary"-->
6+
<!-- android:width="2dp"/>-->
77
<solid android:color="?attr/tabIconTint"/>
88
<corners android:radius="8dp"/>
99
</shape>

‎app/src/main/res/layout-sw600dp/fragment_book_marks.xml‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,26 @@
77
android:background="?attr/backgroundColor"
88
tools:context=".ui.NotesFragment">
99

10-
<androidx.appcompat.widget.SearchView
11-
android:id="@+id/sv_search_database"
12-
android:layout_width="0dp"
13-
android:layout_height="wrap_content"
14-
android:layout_marginTop="16dp"
15-
android:background="@drawable/search_view_bg"
16-
android:paddingStart="8dp"
17-
android:paddingEnd="8dp"
18-
app:layout_constraintEnd_toEndOf="@+id/iv_bookmark_popup_menu"
19-
app:layout_constraintStart_toStartOf="@+id/textView"
20-
app:layout_constraintTop_toBottomOf="@+id/textView" />
10+
<com.google.android.material.card.MaterialCardView
11+
android:id="@+id/card_view"
12+
android:layout_width="0dp"
13+
android:layout_height="wrap_content"
14+
app:cardCornerRadius="8dp"
15+
app:cardElevation="8dp"
16+
app:layout_constraintEnd_toEndOf="@+id/iv_bookmark_popup_menu"
17+
app:layout_constraintStart_toStartOf="@+id/textView"
18+
app:layout_constraintTop_toBottomOf="@+id/textView"
19+
android:layout_marginTop="16dp"
20+
app:cardPreventCornerOverlap="false">
21+
22+
<androidx.appcompat.widget.SearchView
23+
android:id="@+id/sv_search_database"
24+
android:layout_width="match_parent"
25+
android:layout_height="wrap_content"
26+
android:background="?attr/cardBackgroundColor"
27+
android:paddingStart="8dp"
28+
android:paddingEnd="8dp" />
29+
</com.google.android.material.card.MaterialCardView>
2130

2231
<TextView
2332
android:id="@+id/textView"
@@ -38,18 +47,18 @@
3847
app:layout_constraintBottom_toBottomOf="parent"
3948
app:layout_constraintEnd_toEndOf="@+id/iv_bookmark_popup_menu"
4049
app:layout_constraintStart_toStartOf="@+id/textView"
41-
app:layout_constraintTop_toBottomOf="@+id/sv_search_database"
50+
app:layout_constraintTop_toBottomOf="@+id/card_view"
4251
tools:listitem="@layout/list_item_notes" />
4352

4453
<androidx.appcompat.widget.AppCompatImageView
45-
android:id="@+id/iv_bookmark_popup_menu"
46-
style="@style/Widget.Note.ImageView"
47-
android:layout_width="wrap_content"
48-
android:layout_height="wrap_content"
49-
android:layout_marginEnd="16dp"
50-
android:contentDescription="@string/options"
51-
app:layout_constraintBottom_toBottomOf="@+id/textView"
52-
app:layout_constraintEnd_toEndOf="parent"
53-
app:layout_constraintTop_toTopOf="@+id/textView"
54-
app:srcCompat="@drawable/ic_baseline_more_vert_50" />
54+
android:id="@+id/iv_bookmark_popup_menu"
55+
style="@style/Widget.Note.ImageView"
56+
android:layout_width="wrap_content"
57+
android:layout_height="wrap_content"
58+
android:layout_marginEnd="16dp"
59+
android:contentDescription="@string/options"
60+
app:layout_constraintBottom_toBottomOf="@+id/textView"
61+
app:layout_constraintEnd_toEndOf="parent"
62+
app:layout_constraintTop_toTopOf="@+id/textView"
63+
app:srcCompat="@drawable/ic_baseline_more_vert_50" />
5564
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout-sw600dp/fragment_courses.xml‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,26 @@
77
android:background="?attr/backgroundColor"
88
tools:context=".ui.CoursesFragment">
99

10-
<androidx.appcompat.widget.SearchView
11-
android:id="@+id/sv_search_database"
12-
android:layout_width="0dp"
13-
android:layout_height="wrap_content"
14-
android:layout_marginTop="16dp"
15-
android:background="@drawable/search_view_bg"
16-
android:paddingStart="8dp"
17-
android:paddingEnd="8dp"
18-
app:layout_constraintEnd_toEndOf="@+id/iv_course_popup_menu"
19-
app:layout_constraintStart_toStartOf="@+id/textView"
20-
app:layout_constraintTop_toBottomOf="@+id/textView" />
10+
<com.google.android.material.card.MaterialCardView
11+
android:id="@+id/card_view"
12+
android:layout_width="0dp"
13+
android:layout_height="wrap_content"
14+
app:cardCornerRadius="8dp"
15+
app:cardElevation="8dp"
16+
app:layout_constraintEnd_toEndOf="@+id/iv_course_popup_menu"
17+
app:layout_constraintStart_toStartOf="@+id/textView"
18+
app:layout_constraintTop_toBottomOf="@+id/textView"
19+
android:layout_marginTop="16dp"
20+
app:cardPreventCornerOverlap="false">
21+
22+
<androidx.appcompat.widget.SearchView
23+
android:id="@+id/sv_search_database"
24+
android:layout_width="match_parent"
25+
android:layout_height="wrap_content"
26+
android:background="?attr/cardBackgroundColor"
27+
android:paddingStart="8dp"
28+
android:paddingEnd="8dp" />
29+
</com.google.android.material.card.MaterialCardView>
2130

2231
<TextView
2332
android:id="@+id/textView"
@@ -38,18 +47,18 @@
3847
app:layout_constraintBottom_toBottomOf="parent"
3948
app:layout_constraintEnd_toEndOf="@+id/iv_course_popup_menu"
4049
app:layout_constraintStart_toStartOf="@+id/textView"
41-
app:layout_constraintTop_toBottomOf="@+id/sv_search_database"
50+
app:layout_constraintTop_toBottomOf="@+id/card_view"
4251
tools:listitem="@layout/list_item_notes" />
4352

4453
<androidx.appcompat.widget.AppCompatImageView
45-
android:id="@+id/iv_course_popup_menu"
46-
style="@style/Widget.Note.ImageView"
47-
android:layout_width="wrap_content"
48-
android:layout_height="wrap_content"
49-
android:layout_marginEnd="16dp"
50-
android:contentDescription="@string/options"
51-
app:layout_constraintBottom_toBottomOf="@+id/textView"
52-
app:layout_constraintEnd_toEndOf="parent"
53-
app:layout_constraintTop_toTopOf="@+id/textView"
54-
app:srcCompat="@drawable/ic_baseline_more_vert_50" />
54+
android:id="@+id/iv_course_popup_menu"
55+
style="@style/Widget.Note.ImageView"
56+
android:layout_width="wrap_content"
57+
android:layout_height="wrap_content"
58+
android:layout_marginEnd="16dp"
59+
android:contentDescription="@string/options"
60+
app:layout_constraintBottom_toBottomOf="@+id/textView"
61+
app:layout_constraintEnd_toEndOf="parent"
62+
app:layout_constraintTop_toTopOf="@+id/textView"
63+
app:srcCompat="@drawable/ic_baseline_more_vert_50" />
5564
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout-sw600dp/fragment_notes.xml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,26 @@
66
android:layout_height="match_parent"
77
tools:context=".ui.NotesFragment">
88

9-
<androidx.appcompat.widget.SearchView
10-
android:id="@+id/sv_search_database"
11-
android:layout_width="0dp"
12-
android:layout_height="wrap_content"
13-
android:layout_marginTop="16dp"
14-
android:background="@drawable/search_view_bg"
15-
android:paddingStart="8dp"
16-
android:paddingEnd="8dp"
17-
app:layout_constraintEnd_toEndOf="@+id/iv_note_popup_menu"
18-
app:layout_constraintStart_toStartOf="@+id/textView"
19-
app:layout_constraintTop_toBottomOf="@+id/textView" />
9+
<com.google.android.material.card.MaterialCardView
10+
android:id="@+id/card_view"
11+
android:layout_width="0dp"
12+
android:layout_height="wrap_content"
13+
app:cardCornerRadius="8dp"
14+
app:cardElevation="8dp"
15+
app:layout_constraintEnd_toEndOf="@+id/iv_note_popup_menu"
16+
app:layout_constraintStart_toStartOf="@+id/textView"
17+
app:layout_constraintTop_toBottomOf="@+id/textView"
18+
android:layout_marginTop="16dp"
19+
app:cardPreventCornerOverlap="false">
20+
21+
<androidx.appcompat.widget.SearchView
22+
android:id="@+id/sv_search_database"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:background="?attr/cardBackgroundColor"
26+
android:paddingStart="8dp"
27+
android:paddingEnd="8dp" />
28+
</com.google.android.material.card.MaterialCardView>
2029

2130
<TextView
2231
android:id="@+id/textView"
@@ -38,7 +47,7 @@
3847
app:layout_constraintEnd_toEndOf="@+id/iv_note_popup_menu"
3948
app:layout_constraintHorizontal_bias="1.0"
4049
app:layout_constraintStart_toStartOf="@+id/textView"
41-
app:layout_constraintTop_toBottomOf="@+id/sv_search_database"
50+
app:layout_constraintTop_toBottomOf="@+id/card_view"
4251
app:layout_constraintVertical_bias="1.0"
4352
tools:listitem="@layout/list_item_notes" />
4453

‎app/src/main/res/layout-v21/dialog_new_todo.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="wrap_content"
7+
android:background="@drawable/bottom_sheet_bg"
8+
android:elevation="0dp">
9+
10+
<TextView
11+
android:id="@+id/tv_todo_dialog_title"
12+
style="@style/TextAppearance.Notes.TitleText2"
13+
android:layout_width="wrap_content"
14+
android:layout_height="wrap_content"
15+
android:layout_marginStart="16dp"
16+
android:layout_marginTop="16dp"
17+
app:layout_constraintStart_toStartOf="parent"
18+
app:layout_constraintTop_toTopOf="parent"
19+
tools:text="Add Todo" />
20+
21+
<com.google.android.material.textfield.TextInputLayout
22+
android:id="@+id/et_todo_layout"
23+
style="@style/Widgets.Notes.TextInputLayout"
24+
android:layout_width="0dp"
25+
android:layout_height="wrap_content"
26+
android:layout_marginStart="16dp"
27+
android:layout_marginEnd="16dp"
28+
android:layout_marginBottom="8dp"
29+
android:hint="@string/todo"
30+
app:boxCollapsedPaddingTop="4dp"
31+
app:boxCornerRadiusBottomEnd="5dp"
32+
app:boxCornerRadiusBottomStart="5dp"
33+
app:boxCornerRadiusTopEnd="5dp"
34+
app:boxCornerRadiusTopStart="5dp"
35+
app:layout_constraintBottom_toTopOf="@+id/btn_save"
36+
app:layout_constraintEnd_toEndOf="parent"
37+
app:layout_constraintStart_toStartOf="parent"
38+
app:layout_constraintTop_toBottomOf="@+id/tv_todo_dialog_title"
39+
android:layout_marginTop="8dp">
40+
41+
<com.google.android.material.textfield.TextInputEditText
42+
android:id="@+id/et_todo"
43+
style="@style/Widget.Notes.TextInputEditText"
44+
android:layout_width="match_parent"
45+
android:layout_height="wrap_content"
46+
android:layout_marginTop="8dp"
47+
android:ems="10"
48+
android:inputType="textMultiLine"
49+
android:paddingStart="16dp"
50+
android:paddingEnd="16dp"
51+
app:textInputLayoutFocusedRectEnabled="false" />
52+
</com.google.android.material.textfield.TextInputLayout>
53+
54+
<Button
55+
android:id="@+id/btn_save"
56+
style="@style/Widget.Notes.Button"
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:layout_marginBottom="16dp"
60+
android:text="@string/save"
61+
app:layout_constraintBottom_toBottomOf="parent"
62+
app:layout_constraintEnd_toEndOf="@+id/et_todo_layout" />
63+
64+
<com.google.android.material.button.MaterialButton
65+
android:id="@+id/btn_cancel"
66+
style="@style/Widget.Notes.TextButton"
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:layout_marginEnd="32dp"
70+
android:text="@string/cancel"
71+
app:layout_constraintBottom_toBottomOf="@+id/btn_save"
72+
app:layout_constraintEnd_toStartOf="@+id/btn_save"
73+
app:layout_constraintTop_toTopOf="@+id/btn_save" />
74+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)