From d466b7e56230abc021568146eb7c86a39f2d26bc Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Tue, 15 Feb 2022 15:29:55 +0530 Subject: [PATCH 01/50] first commit --- .idea/.name | 1 + 1 file changed, 1 insertion(+) create mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0f638d1 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Hillfair2k22 \ No newline at end of file From d4395c6ce916dfce0b59727d95c1f925bc58278a Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Tue, 15 Feb 2022 22:45:52 +0530 Subject: [PATCH 02/50] userfeed-home page in xml --- .idea/.name | 1 - .idea/misc.xml | 8 + app/src/main/res/drawable/ic_add.xml | 10 ++ .../res/drawable/ic_baseline_message_24.xml | 10 ++ .../drawable/ic_baseline_more_horiz_24.xml | 10 ++ app/src/main/res/drawable/line_3.xml | 11 ++ app/src/main/res/drawable/user_icon_view.xml | 12 ++ app/src/main/res/drawable/vector.xml | 9 ++ .../main/res/layout/fragment_user_feed.xml | 32 +++- app/src/main/res/layout/item_user_feed.xml | 146 ++++++++++++++++++ app/src/main/res/values/strings.xml | 6 + app/src/main/res/values/themes.xml | 12 ++ 12 files changed, 260 insertions(+), 7 deletions(-) delete mode 100644 .idea/.name create mode 100644 app/src/main/res/drawable/ic_add.xml create mode 100644 app/src/main/res/drawable/ic_baseline_message_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_more_horiz_24.xml create mode 100644 app/src/main/res/drawable/line_3.xml create mode 100644 app/src/main/res/drawable/user_icon_view.xml create mode 100644 app/src/main/res/drawable/vector.xml create mode 100644 app/src/main/res/layout/item_user_feed.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 0f638d1..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Hillfair2k22 \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2132a63..59df0f4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,10 +3,13 @@ diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 0000000..bbc546c --- /dev/null +++ b/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_message_24.xml b/app/src/main/res/drawable/ic_baseline_message_24.xml new file mode 100644 index 0000000..694aa01 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_message_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml b/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml new file mode 100644 index 0000000..6439bcc --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/line_3.xml b/app/src/main/res/drawable/line_3.xml new file mode 100644 index 0000000..6b19b08 --- /dev/null +++ b/app/src/main/res/drawable/line_3.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/user_icon_view.xml b/app/src/main/res/drawable/user_icon_view.xml new file mode 100644 index 0000000..09dcda0 --- /dev/null +++ b/app/src/main/res/drawable/user_icon_view.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/vector.xml b/app/src/main/res/drawable/vector.xml new file mode 100644 index 0000000..90ed81a --- /dev/null +++ b/app/src/main/res/drawable/vector.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_user_feed.xml b/app/src/main/res/layout/fragment_user_feed.xml index efd8a85..762f0a7 100644 --- a/app/src/main/res/layout/fragment_user_feed.xml +++ b/app/src/main/res/layout/fragment_user_feed.xml @@ -1,14 +1,34 @@ - - - + android:layout_height="wrap_content" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:layout_marginTop="120dp" + android:background="#E7CC9D" + tools:listitem="@layout/item_user_feed" /> - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_feed.xml b/app/src/main/res/layout/item_user_feed.xml new file mode 100644 index 0000000..7f79cee --- /dev/null +++ b/app/src/main/res/layout/item_user_feed.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c9cb875..c729c7f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,4 +3,10 @@ Hello blank fragment Button + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 048418b..83e61f6 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -12,5 +12,17 @@ ?attr/colorPrimaryVariant + + + @style/FloatingActionButtonStyle + + + + + + \ No newline at end of file From 3559c542dae99e2c969a5ac9a21b0a527d2e44cf Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Tue, 15 Feb 2022 22:48:26 +0530 Subject: [PATCH 03/50] userfeed-home page in xml --- app/src/main/res/layout/fragment_user_feed.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_user_feed.xml b/app/src/main/res/layout/fragment_user_feed.xml index 762f0a7..4d6558c 100644 --- a/app/src/main/res/layout/fragment_user_feed.xml +++ b/app/src/main/res/layout/fragment_user_feed.xml @@ -14,7 +14,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:layout_marginTop="120dp" android:background="#E7CC9D" tools:listitem="@layout/item_user_feed" /> From 02658d2b3a513d56c8c75549019cd0fb15b27888 Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Tue, 15 Feb 2022 22:53:45 +0530 Subject: [PATCH 04/50] userfeed-home page in xml --- app/src/main/res/layout/item_user_feed.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_user_feed.xml b/app/src/main/res/layout/item_user_feed.xml index 7f79cee..583d1b9 100644 --- a/app/src/main/res/layout/item_user_feed.xml +++ b/app/src/main/res/layout/item_user_feed.xml @@ -74,7 +74,7 @@ Date: Tue, 15 Feb 2022 22:58:36 +0530 Subject: [PATCH 05/50] userfeed-home page in xml --- app/src/main/res/layout/fragment_user_feed.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/fragment_user_feed.xml b/app/src/main/res/layout/fragment_user_feed.xml index 4d6558c..de396de 100644 --- a/app/src/main/res/layout/fragment_user_feed.xml +++ b/app/src/main/res/layout/fragment_user_feed.xml @@ -10,6 +10,7 @@ android:id="@+id/user_post_list" android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" From bd1d25cff7bdf2227bc609c9ac503d56eb91c3fe Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Sat, 19 Feb 2022 00:15:59 +0530 Subject: [PATCH 06/50] Without resources --- .idea/misc.xml | 5 +- .../screens/home/CommentUserFeedFragment.java | 66 ++++++ .../main/res/drawable/bx_arrow_back_svg.xml | 9 + .../drawable/user_feed_caption_outline.xml | 11 + .../drawable/user_feed_comment_outline.xml | 11 + .../main/res/drawable/user_feed_send_icon.xml | 9 + .../res/drawable/user_post_image_outline.xml | 11 + .../res/layout/fragment_comment_user_feed.xml | 196 ++++++++++++++++++ .../res/layout/fragment_create_new_feed.xml | 105 +++++++++- .../main/res/layout/fragment_user_feed.xml | 4 +- .../res/layout/item_comment_user_feed.xml | 35 ++++ app/src/main/res/layout/item_user_feed.xml | 21 +- 12 files changed, 461 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/nith/hillfair2k22/screens/home/CommentUserFeedFragment.java create mode 100644 app/src/main/res/drawable/bx_arrow_back_svg.xml create mode 100644 app/src/main/res/drawable/user_feed_caption_outline.xml create mode 100644 app/src/main/res/drawable/user_feed_comment_outline.xml create mode 100644 app/src/main/res/drawable/user_feed_send_icon.xml create mode 100644 app/src/main/res/drawable/user_post_image_outline.xml create mode 100644 app/src/main/res/layout/fragment_comment_user_feed.xml create mode 100644 app/src/main/res/layout/item_comment_user_feed.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 59df0f4..33f832f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -18,12 +18,13 @@ + - - + + diff --git a/app/src/main/java/com/nith/hillfair2k22/screens/home/CommentUserFeedFragment.java b/app/src/main/java/com/nith/hillfair2k22/screens/home/CommentUserFeedFragment.java new file mode 100644 index 0000000..eb9c6d3 --- /dev/null +++ b/app/src/main/java/com/nith/hillfair2k22/screens/home/CommentUserFeedFragment.java @@ -0,0 +1,66 @@ +package com.nith.hillfair2k22.screens.home; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.nith.hillfair2k22.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link CommentUserFeedFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class CommentUserFeedFragment extends Fragment { + + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + public CommentUserFeedFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment CommentUserFeedFragment. + */ + // TODO: Rename and change types and number of parameters + public static CommentUserFeedFragment newInstance(String param1, String param2) { + CommentUserFeedFragment fragment = new CommentUserFeedFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_comment_user_feed, container, false); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bx_arrow_back_svg.xml b/app/src/main/res/drawable/bx_arrow_back_svg.xml new file mode 100644 index 0000000..2df0e0a --- /dev/null +++ b/app/src/main/res/drawable/bx_arrow_back_svg.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_feed_caption_outline.xml b/app/src/main/res/drawable/user_feed_caption_outline.xml new file mode 100644 index 0000000..262160b --- /dev/null +++ b/app/src/main/res/drawable/user_feed_caption_outline.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/user_feed_comment_outline.xml b/app/src/main/res/drawable/user_feed_comment_outline.xml new file mode 100644 index 0000000..eb5b903 --- /dev/null +++ b/app/src/main/res/drawable/user_feed_comment_outline.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/user_feed_send_icon.xml b/app/src/main/res/drawable/user_feed_send_icon.xml new file mode 100644 index 0000000..072371e --- /dev/null +++ b/app/src/main/res/drawable/user_feed_send_icon.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_post_image_outline.xml b/app/src/main/res/drawable/user_post_image_outline.xml new file mode 100644 index 0000000..fc02193 --- /dev/null +++ b/app/src/main/res/drawable/user_post_image_outline.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/fragment_comment_user_feed.xml b/app/src/main/res/layout/fragment_comment_user_feed.xml new file mode 100644 index 0000000..8615033 --- /dev/null +++ b/app/src/main/res/layout/fragment_comment_user_feed.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_new_feed.xml b/app/src/main/res/layout/fragment_create_new_feed.xml index 25272fb..8ff7e2a 100644 --- a/app/src/main/res/layout/fragment_create_new_feed.xml +++ b/app/src/main/res/layout/fragment_create_new_feed.xml @@ -1,14 +1,107 @@ - - - + + + android:layout_height="400dp" + android:elevation="20dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="115dp" + app:cardBackgroundColor="#DBB05E" + app:cardCornerRadius="24dp" + app:cardElevation="20dp" + android:padding="12dp"> + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_feed.xml b/app/src/main/res/layout/fragment_user_feed.xml index de396de..410339a 100644 --- a/app/src/main/res/layout/fragment_user_feed.xml +++ b/app/src/main/res/layout/fragment_user_feed.xml @@ -10,7 +10,6 @@ android:id="@+id/user_post_list" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -26,7 +25,8 @@ android:layout_marginBottom="24dp" android:clickable="true" android:focusable="true" - android:backgroundTint="#DBB05E" + app:elevation="40dp" + app:backgroundTint="#DBB05E" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@drawable/ic_add" /> diff --git a/app/src/main/res/layout/item_comment_user_feed.xml b/app/src/main/res/layout/item_comment_user_feed.xml new file mode 100644 index 0000000..bc35b6c --- /dev/null +++ b/app/src/main/res/layout/item_comment_user_feed.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_feed.xml b/app/src/main/res/layout/item_user_feed.xml index 583d1b9..088a5a7 100644 --- a/app/src/main/res/layout/item_user_feed.xml +++ b/app/src/main/res/layout/item_user_feed.xml @@ -6,10 +6,11 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginEnd="18dp" android:layout_marginTop="61dp" + android:layout_marginStart="22dp" android:padding="10dp" - android:backgroundTint ="#DBB05E" - android:elevation="20dp" - app:cardCornerRadius="24dp"> + app:cardBackgroundColor="#DBB05E" + app:cardElevation="20dp" + app:cardCornerRadius="12dp"> @@ -74,11 +73,11 @@ @@ -96,10 +95,8 @@ android:id="@+id/line_2" android:layout_width="match_parent" android:layout_height="1dp" - android:layout_alignParentLeft="true" android:layout_marginStart="25dp" android:layout_marginEnd="22dp" - android:layout_alignParentTop="true" android:layout_marginTop="10dp" android:background="@drawable/line_3" /> From 983c5d31245aab0df8ba1622a17af0af02b82bcc Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Sat, 19 Feb 2022 17:25:58 +0530 Subject: [PATCH 07/50] with id's --- .../res/layout/fragment_comment_user_feed.xml | 23 +++++++++-------- .../res/layout/fragment_create_new_feed.xml | 15 +++++------ .../main/res/layout/fragment_user_feed.xml | 2 +- .../res/layout/item_comment_user_feed.xml | 6 +++++ app/src/main/res/layout/item_user_feed.xml | 25 ++++++++++--------- 5 files changed, 40 insertions(+), 31 deletions(-) diff --git a/app/src/main/res/layout/fragment_comment_user_feed.xml b/app/src/main/res/layout/fragment_comment_user_feed.xml index 8615033..61f6c77 100644 --- a/app/src/main/res/layout/fragment_comment_user_feed.xml +++ b/app/src/main/res/layout/fragment_comment_user_feed.xml @@ -24,7 +24,6 @@ @@ -34,7 +33,7 @@ android:layout_marginTop="10dp"> @@ -135,7 +135,7 @@ android:layout_marginBottom="20dp"> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_new_feed.xml b/app/src/main/res/layout/fragment_create_new_feed.xml index 8ff7e2a..38ea1d4 100644 --- a/app/src/main/res/layout/fragment_create_new_feed.xml +++ b/app/src/main/res/layout/fragment_create_new_feed.xml @@ -8,12 +8,12 @@ tools:context=".screens.home.CreateNewFeedFragment"> @@ -42,7 +42,7 @@ android:layout_marginTop="10dp"> + android:layout_toEndOf="@+id/user_post_user_profile_icon"> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_feed.xml b/app/src/main/res/layout/fragment_user_feed.xml index 410339a..0fd7341 100644 --- a/app/src/main/res/layout/fragment_user_feed.xml +++ b/app/src/main/res/layout/fragment_user_feed.xml @@ -18,7 +18,7 @@ tools:listitem="@layout/item_user_feed" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_feed.xml b/app/src/main/res/layout/item_user_feed.xml index 088a5a7..2dcfb06 100644 --- a/app/src/main/res/layout/item_user_feed.xml +++ b/app/src/main/res/layout/item_user_feed.xml @@ -15,7 +15,6 @@ @@ -26,7 +25,7 @@ > - - - + \ No newline at end of file From 14a51571862faf5cf88238d56386725c49ae6ba9 Mon Sep 17 00:00:00 2001 From: SHUBHAM979 Date: Sun, 20 Feb 2022 13:11:01 +0530 Subject: [PATCH 08/50] only string and dimen resources remain --- .../res/layout/fragment_comment_user_feed.xml | 19 ++++++++++++------- .../res/layout/fragment_create_new_feed.xml | 12 ++++++++---- .../main/res/layout/fragment_user_feed.xml | 3 ++- .../res/layout/item_comment_user_feed.xml | 3 +-- app/src/main/res/layout/item_user_feed.xml | 16 +++++++++++----- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/app/src/main/res/layout/fragment_comment_user_feed.xml b/app/src/main/res/layout/fragment_comment_user_feed.xml index 61f6c77..8828668 100644 --- a/app/src/main/res/layout/fragment_comment_user_feed.xml +++ b/app/src/main/res/layout/fragment_comment_user_feed.xml @@ -40,7 +40,8 @@ android:layout_marginTop="7dp" android:layout_marginEnd="7dp" android:layout_marginBottom="7dp" - android:background="@drawable/user_icon_view" /> + android:background="@drawable/user_icon_view" + android:contentDescription="user profile picture"/> + android:src="@drawable/ic_baseline_more_horiz_24" + android:contentDescription="more option"/> @@ -75,7 +77,6 @@ + android:scaleType="centerCrop" + android:contentDescription="user post"/> @@ -116,7 +118,8 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:padding="8dp" - android:src="@drawable/ic_baseline_message_24" /> + android:src="@drawable/ic_baseline_message_24" + android:contentDescription="comments button"/> + android:src="@drawable/vector" + android:contentDescription="like button"/> @@ -179,7 +183,8 @@ android:layout_alignParentEnd="true" android:layout_marginEnd="12dp" android:padding="12dp" - android:src="@drawable/user_feed_send_icon" /> + android:src="@drawable/user_feed_send_icon" + android:contentDescription="comment post button"/> diff --git a/app/src/main/res/layout/fragment_create_new_feed.xml b/app/src/main/res/layout/fragment_create_new_feed.xml index 38ea1d4..5f42846 100644 --- a/app/src/main/res/layout/fragment_create_new_feed.xml +++ b/app/src/main/res/layout/fragment_create_new_feed.xml @@ -15,7 +15,8 @@ android:layout_alignParentTop="true" android:src="@drawable/bx_arrow_back_svg" android:layout_marginTop="12dp" - android:layout_marginStart="12dp"/> + android:layout_marginStart="12dp" + android:contentDescription="back button"/> + android:background="@drawable/user_icon_view" + android:contentDescription="user profile picture"/> + android:src="@drawable/ic_add" + android:contentDescription="add picture placeholder"/> @@ -103,6 +106,7 @@ android:elevation="20dp" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" - app:srcCompat="@drawable/user_feed_send_icon"/> + app:srcCompat="@drawable/user_feed_send_icon" + android:contentDescription="post user feed button"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_feed.xml b/app/src/main/res/layout/fragment_user_feed.xml index 0fd7341..70aaebf 100644 --- a/app/src/main/res/layout/fragment_user_feed.xml +++ b/app/src/main/res/layout/fragment_user_feed.xml @@ -29,6 +29,7 @@ app:backgroundTint="#DBB05E" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:srcCompat="@drawable/ic_add" /> + app:srcCompat="@drawable/ic_add" + android:contentDescription="button to add post" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_comment_user_feed.xml b/app/src/main/res/layout/item_comment_user_feed.xml index 06c8f11..8435460 100644 --- a/app/src/main/res/layout/item_comment_user_feed.xml +++ b/app/src/main/res/layout/item_comment_user_feed.xml @@ -1,9 +1,8 @@ diff --git a/app/src/main/res/layout/item_user_feed.xml b/app/src/main/res/layout/item_user_feed.xml index 2dcfb06..4836a03 100644 --- a/app/src/main/res/layout/item_user_feed.xml +++ b/app/src/main/res/layout/item_user_feed.xml @@ -32,7 +32,8 @@ android:layout_marginTop="7dp" android:layout_marginEnd="7dp" android:layout_marginBottom="7dp" - android:background="@drawable/user_icon_view" /> + android:background="@drawable/user_icon_view" + android:contentDescription="User profile image" /> + android:src="@drawable/ic_baseline_more_horiz_24" + android:contentDescription="more option"/> @@ -88,7 +90,8 @@ android:adjustViewBounds="true" android:background="#F9FAF6" android:elevation="20dp" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + android:contentDescription="user post"/> + android:src="@drawable/ic_baseline_message_24" + android:contentDescription="comments button"/> + + android:src="@drawable/vector" + android:contentDescription="like button"/> From 420b64d354e95e8e715e180ec1d8fc203ee6263a Mon Sep 17 00:00:00 2001 From: tiwar Date: Sun, 20 Feb 2022 13:53:19 +0530 Subject: [PATCH 09/50] just before bottom bar --- app/src/main/res/drawable-v24/account.png | Bin 0 -> 16459 bytes app/src/main/res/drawable/ic_frame_81.xml | 50 ++++++ app/src/main/res/drawable/ic_frame_image.xml | 52 ++++++ app/src/main/res/drawable/ic_group_37.xml | 18 ++ app/src/main/res/drawable/shadow.xml | 5 + .../main/res/layout/activity_edit_profile.xml | 132 ++++++++++++++ .../res/layout/activity_forgot_password.xml | 73 +++++++- app/src/main/res/layout/activity_login.xml | 109 +++++++++++- app/src/main/res/layout/activity_signup.xml | 106 ++++++++++- .../main/res/layout/fragment_view_profile.xml | 164 +++++++++++++++++- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/colors.xml | 6 +- app/src/main/res/values/integers.xml | 10 ++ app/src/main/res/values/strings.xml | 16 ++ app/src/main/res/values/themes.xml | 2 +- 15 files changed, 729 insertions(+), 16 deletions(-) create mode 100644 app/src/main/res/drawable-v24/account.png create mode 100644 app/src/main/res/drawable/ic_frame_81.xml create mode 100644 app/src/main/res/drawable/ic_frame_image.xml create mode 100644 app/src/main/res/drawable/ic_group_37.xml create mode 100644 app/src/main/res/drawable/shadow.xml create mode 100644 app/src/main/res/values/integers.xml diff --git a/app/src/main/res/drawable-v24/account.png b/app/src/main/res/drawable-v24/account.png new file mode 100644 index 0000000000000000000000000000000000000000..5f2e60078278020d1c8dd32172943bd382450a39 GIT binary patch literal 16459 zcmb7rhdyjO^S8-9cQ1&P@d&?f7?2?grZ)IHBBgCbUxX2!vx3`;>kutMx zDB{W`GvoeVKEJ=<>%rr?=R9A}ea?BE=Rlhp>(bM3(EtEIudka68zW= z8~+D>Pz2r5x4Z!UL|(X;0Dh+q)Vmu501Wu^KS;J112;Ix`B>Zbu|f~6 z586^ZQ2hBfy0g$m;6KIDYX^m^(W5O$gnq{V<(KQhtq^EN?>$}@cbCkM(;U(-s9LGGMbLDS3}g&smyRHf9#fK4_4UPp z(uHYY+Fd$?s_>Hq9v8&;k{Q`mWEJ4|T%%>!GaJ9nM42BH6FLkGtjto;UP%vTjzkMyL&t1MP;rhySyX%@FN}YS3%|$1L5XR7wV_vNF%oVsQk`Q(DSpF1Os0ac?%j zyHX!_1t)`}O*lAIBhCKMB(!L4-~y0}6*GFEz~jQ-KrxCSQdBoajdWRMxD^-`*jq0u zvtot7$;ZkUyLVDyDW9B=>^h%-&ppAJBye7Qt5Xk{vhdQKC~h0X9IQB4Ivb$f2t38X z1k~K)Qn$N6`L%t(3D%Lq@m_?rg8vXk5+uZ+e<#1SYXD3!ey|RjF!`|v=k-{%V%U#R zR0GS{Q#&`$*!74s!v+$)zdjw9;Ef0t>6;tlT3%oU|y%U!+CC z9)IcJ->FQjuK_`eFpt0f!Q9b-K9c^BulA}UyFNBnA8#0`j(0xRIdz8wa>;xywY=60 zl#4b~EkHWp(*ieHD=yhU$@B%NYG?-jOp8i1W|P|w4cBr;`K6V<%+nhh3ROFD?u|=l z{fxG8q!QGpzsVaW5-5A*+!bf`wlynv)Q#CZb(%_}vsQ={z4W8o^^v4`_B`bYJBioj z;Ume6@w&|fzAvBq$*~?B!HMz6ZrG%zC|Uv#?PAhK|Zx~4tGN!_{@fsie z3}XKsu{TXe5X9fPKjZv7ZtPcUPT0?1Bu)LduWm)osA!$B7rAnnd`iX{r1ySQ1Gp+n z(Axu&!J<}EaNHtn%0r}hJwF$N6x{*{x7@xv@t>JD@zOioHk9dbd?blgum|K`Z6Zye zH9g0rcM1VM;1|Q$Q9nW5{(_3y;eklpX+!KY^1ONRXfJ7Vm;NkDNjjLc#Z7mn7`wIs zk>MP+!-eC7alJU5$^;{1UM$bs#M%po6ePvslJ~oE(RDth75KC+#vkJMI-BWoVRP^y zzNB^}71gq9;n~HS;sIP4erH6P?(D;9ExD84gq3?e*&fwR5uJ%izi^zc$ga!#u% zrj|uqY(=lN2D8YJj~#KR8ZmB8ozhIxiB~U#Q0xQykV4hNQL93JAjY7PN1qLVF0s#g zp>8gznw7rAHQ^>y_G-JS!^CAPXl5@=b5Hw7?_c?cnP#>sh{a!AkOIVlEX;0n6KDMd zWU96@RrdbaV1C0qAvO%X{3vcDYo5M5PRm7vaGCG~=c?s{;>~Rjf^FLoGKgA;y@hBT z>q@HgdmnMiXxbC*?e%;AT1UFt>i9@*1b2MIrpQ1y|2oGhuBG-c$Ijia_(P1)k+Vi{ zq6qp;8b7o!)rZe=;GSFSIu)|$;_%$efdOVIn$Y^NC|JMg(Zw-C%xSDePAiK-^5LUh zlrw)O+6FEHvtjCf+_3dl3D1bWQkcPYkA|e_(CB4UmwT8^)^wRl8EM4cmn9&UAO{LZ z2Y0iVuMn&-7*Bnx2L3?RBWH1|zR<`Jp|{g7I3fy9;pT61bqyaqMo40? zUau%RfJ0H4&PV&Fc5e@rQXZvy|A@j<$jvx&Stb0$nV>^og)DuuHKI%ra-vr(zP#k= zvgmJ&E#0XyG2F{L)i#R-E!^Moz{bn+X)v1M`D$j2vsa(_QqWI?p?R!Is;!prF|B|s z8}N>~0k7{dowFt-U37A+Dm(J&$5Zn*YW#|b-=DRcJ|rGG2}iMPKR?2RR;7mhDo0pC zZnByA(_y4@I$1l7$pE3{Rq5`0fUAxwXi?jL8yA@5|nn-37v_~ zEH6Ij83h7?!kfRP4?SGGuXq`If9OG1_%x`GcP1F1&*;rrRP$}q%IRZq9=MmE3T{+j z7W9?l4vz>n`9z~j(3zt4dUr{gz2?$~w%iJs6UM-qhY*IJ77@IZCofM%UGwVb!h$qc z4ZJ%fkYWR5!b{F6sFdjXbA9;(Xfdn!anN1Q$fPxnYY#3(d?8+o+7b@mQ_gAKHIx#G z>+p;*{+zhwwyN@mJAB=aHoLksQfnMqkfkI>}RFE$GTN&Md$PvM=)QZX{HJwiRxx zx%K|^5rM&Ntc=Vx54C?&m~} z)n%;l@6_NkTB9p+d@KmME6xW3OLWCe2H5I(dv^UaoerRIz*M zd>JoNI=v{-9^CaTX4Ku^`*UODijJCIQv($VIN~q%UuHaf-%V$M_MDYPfg9LJXNm}# zRmwR*0_HKz*ZTZqW6tk{<^?b@B{l-DC51aOUMdsnrNJ=?22zuhttd{^FUfz0Zj=xZ{MovJ;(q2@88O zQ%(7YSJ)ufa=-G>>`sa>n;%|pF*l%Ux5S?nL^*Eo{Y6i~>{C{u_bo-tHs6%`BnG$^ zFT+`*_kV!5wcM0Rx7e58lMUK1oN&#NQS@4!@zwN2Qja+SA?yA<6F4c)i<>T{1z-smY>zK>a^v z7DIMlJIiVuq;R{sIKSdN+We^#pOh8CMx4`Hva;eonrg^AwEW?v#Z?lV!1sBE|Eckk zncGQ|QmAyG;?Y$7=0ny%JlFed>n#th&v*8lh=>K7|BlkEeV9q^I{|0LOG<9xZo!^G zZcy&{zg8muP-I~p$8yVTAUj zhVL~BZvcxTWTljwFM(01ACY>aB+Z?G!)+aPlGJoiv&Du5S!UcXksq30wR6YYNciH` zWJAr5uw@yyf58=UF`B2ZqH~}%Qp@)m@dn7_f$o&v!zEY3sLexF`5OW7mzgoVeJlq| zf9v#Om7j*?dM>Ukqo3e@coZbD;F5br46R(_S6aP62YMZ_Nwr*J2B zCiCC$`i*?s6x-z%iLrK-V=k^wcq<%3Im>8SbdQ4+VsbI9t(jHkm%?!wpNWI(LvMzc`k*m8Jsh%D~-^a3e?WbY6Rhe10^HZ;7s3;~^<1wk~_-jS)+L(#> zC*q3ca*HG>Xa^K)Y3q(6i+6HBMhr`;$QhN*=XE??@oL!qo@_Xa`bU8eESboF%$U<& zt|&Z0_iO8^;L%M|*pj7#P$f$~Y$_w>G-;vN1CLGSDx%iv8zgSroU}#uz~qhlOl!&r znV%KulUr2lnB72pkCqq+ckg!y14V-5f64OxS0??^C-1Yb%Swf)cdf3E{~50ddS@1? zazTYExY#(e_>|^2`ab<6%riZvAw|d<8X);oTyF6ro`-s7>Pxwf3hIS>FxFTb_s&3x z${UHsDXuJ*x}&pk=${2~y~-Jf|BZIV=`^{?1YTOlw^xj2{10I51Q?RMTg24y4zFQH;o0!TwI$M zau)y06a}e%yVaKxH|{qI{tMj0`FA9Qeerbe8*^jp zit|efM%oW_SLnQmc9^N*<~C2gg3)PMigs}yuW0!nUu3g|H$_;Xo_ zy)tgHXH(($-(9OYZ$4V&^6I-IsM&FbYAEt$ZV|7{a$g_ z?co57HRr?FCU`l&r1CcUtZHCqH)4dwXst03k`vKQ?u}yB&{56#L)oRyi2Wu9t2xRl z$Avemd07|@YGD?O-~M@+{;Ow9hyEeV@;4v~w9`t;Ob@e+GLm%QcpHov9>fsYfu>%W|{v6 zdo7ArCT`T}K4|eI0W03+uDbGM^lfiwkNJL+ASaOuPk1wOq|`u zxG>#-7G5TYbM@M~U8%jcKKT#Fvs1I$zb43*YXK)}?S2{Rx~9|nh(KUYZ8ri}`<`6V zHh$HViQ(<5ptchcV7CTdR}cJgRwt4U74^|IxWO+Um`Yo|aVh`yhcPz3P(_>WWOEM3+EuRnI`1`vH1((%$zGFNE0$Go4e(bjed~KEm|;TVeU=7xjV@M5^5Y557j7gBv?iXV|4-A-40T2ORVG&t_%|ch2^BIA5Ur z2378>erv(O?Tw(cDZi~*Tr%~gN<@=SoioR1GYJ@OXl5+6kW}>~bb%Jl#1E8e$L1h!>o!)Uz9s?&OaImp*!#MtdQSvQHw>fxDy zGNi(#=Cko@*IxktFgUJ?obnWr;R_D$YZD1noe;HqkNEZc&u8OO%`zrTWP!_Vqw7U$ zhz@b(bjmym2L_%rOuuvsODt}XsMTA1hw+>I5y!+}sLpufLmdsjVkxftwY(y-$*Nm^S1;(DUNE&V5 zBFfYi_u?-ev?Yd0$XNJV`O+5TVzeAL^_s9B`cOu9RF^`OU!M5*a&%sZhrRT&C~olB zm*-2gFDEf>4hrj>{HytTGQ%$vUS7!)?ji2a$%K z`)`i}&53|Anr&JY^rpW3VdK|u$=6D!62fNHUfiagP{Jt6uRfFG*KH8Nb2##QFB@{< zFo#GH_k?@Gd;Yxxg!Bjea>O}N!IwV*)$m&`wds7wN!lPHD63%|g39P0*m0I%MnV}V zp(5aQx)ED}6L1hR+Ptn&<<j4%NhMfJge3Ve^%lJo=glr4SNZYMcxFR-7woT!&@o-c11OIe6ixUnqgy`<;QkV zPV;Oifgbm7MxU-NZSAyXVOm@nat#gF*m8gsU@-XC%gE~bOyv3{AiE*~X>w2G%k_NF zjzV?7TD6IXi1hvIq)8&;H5VNB#?nh~h#y^7vd(J{j9aq-ox!XVoHKh2qP5eGtTf1j zdm_?9-CiPJZh;ZP>gEyS*Rg6j7~E^Wa$NnF892_+ZKp^y7haHq(V_(-o7LE_TNOsp zlyey%6T43W>S>WvrWh--@f)R1t=W5ji4>)XZ}lwq-$WDsg3O1@)cScsK{V)rWBwfl zQYR5%=iT`~Akg6|zMGWMI2+J@ zS^oqT8h|jCiQL36p@|Qi-|ycEftoYZB30g*C-Xj&7UtB{y}SEReG|>EOv~C*>|JjT$#MIs+^gsXhyOzuGYu31QPUVqS$UCSAf*5Mm^%8@0pf;`k zX^uPUN(WVzH3e|i04Y?_1+|Omg@~8S4!Ib;&l0^Orrz)RQ1lI%_df(9srrku9zbM7 z2ERJ}kt>0}7L_HR0{mxIwU3(lIV$DX#tij^ zTEH~oh~_odnX)oUvu1OT0i5qZ=91NC>2W`2^#3=nnvOvNt)9~LowahT-Nxu{b3Wg{(6v8=s8B z&44Nc@elc%@megY*td+W=UZtXpFr6gtEQ?_E}w~xa(3n4+K@nm^joUqyP2YN+h4H5 zBgPu*b=(asU&^s0E`oHpw3v$&4bnZLHdQ`PSAH^T5<5KjKahG5L{ixL!jN1tUt>Yb zTR?#^pIk{C1YMr5T}>I1j4kr+pbT@JQNG#^OsDYec{)4`0w3}Q*Os3zq`bMIf#o#> zu3@5dz3St2!U+-4Xx9Qu^%A+V*Z(MT(<(RzN}Cy^08GCg;>~gdEL{&5k5-)ZsuzGj zs}L|I@1QMyr)=HM_^ftYAIIeJ=QX&j1XS<;#{tVHZ~RD|q1IE~IVMub33m?}0}5?J z$vJlcqW-`zySuc;W59B6hEc=s;e!w;SEe(l*#Y(9&*A`9`e>9M_iRT0zM-U`Fg)Xx zFK`I%>Rg%asQk>JY5M8RQFW4H zhnNVjnzln<(+rclsn|S3-aPz38KwYQ4MF?x&Q9B1olB5B2B7R^-H&=2r08Ry@u)lc zUxiL)zGd9vMTtyo4)F+>q};#e-s8avbdhb|`3hKBoL*Ii1eenE+%R}TFa74ZpE2y0 zg?Z*D4hg8|5>z8t?ioj$qM$NUg@ysT%M9FKiy!9SQu#KiKlFo+K(8Ipn8b!W?Tg88gsxW-<#BcPE)dDW5=j_VTg4O0162b8x*6WYO; z8vIDI78E`B=K=n}yzIXi2X=6S5MYB0K4vj{Sh)~M|GMljJOsM_J<`Sc5kmxP=f`4N zq~pNmHR_4`ShEBFPcL~U7PE1|Gy3HhXGUKRvIACORPbp-BpljC!Zt%n1J1HC}^ivI;&{A_$Hc7TsYA=Z|!RoX}lc$wZE-H`Z=>cr+8 zpi9pXDD`Z`oQxF2c2VB9g9O549z1)soR2F3*9LuOj;A&YQ&4o-B*31Vz(neVN;EYdA-h9cK*EE{9$|o>Iq2%uttuVX1ByWj#weB|Q*x z+wfA!ul&po@?a;lKbp+g3^WdC;j$rc!_pE`tF1Zvdwg>mF?WOZ{IGvBc?=jI&E610 zMPvqDU6I!?gX65>e(x-TG7f5ZR+%x-w{)wJMNo~`ej&EH%_RVPHjs#ijr-tVNHM4N z`r8kOIVn$zwu5%?*q|*}Jy{OYFlUXTGu5NqkK0kgmw*{| z%?WwNFlv%ZhyWI&3+9`|Gr1f?XmLsYH%+x5wN8-PwKzD^+KYiC;C3NLj?Ls^Y)Q4Q z9fs&N+BWb1npy&wvC746Q4%Oz9)c)3v~dQg%6b;FpC0NFqGrIo7T}&U#Y9g)g7CaZ z1B;o51l)<*;U&oGmE)Ojdkrlhf;@K_D=BuU6u@UPa(kkIBMcs>38G3S+JHGjoTp>* zXf{q}#byhe0>{i#XbreutT`4|`^{0fio9cTQ#0w$kofwdbb=q|XI z=qPee7ja0Id$ty?Z9H@e5%A6eWoBtR$Bjf0DaI8-FY@Bm61&+p{E=kt!D?ACgUT(rqoU`$u~sSI^NuDfUXaVx3tPx26nLVKNoFk@IV$KQ#x z!R%Am;nYw5rS)oqGxnb5xBPGA)bhb-ZP}%fv&eDPLW(Yp$eBA<^{O9=l6T(>SoD*h zPB-nAWGOXBl8gzSVA3%7MLZgvdxL9BKPUX2*CTa7b#d~=sjAeu%vzJ9_^ZJl0y6P9 zIDY)U8OABmK7LdS#3%T1+1rJg)Va~Y&^A@1K=>CgMtH%?j+h5V|IokMO3<9^T?v9z zaruk|cZOQSE|Tc6GXLq>VfHc(x=Uy2FPQ<4F z2u~}A-29aB>~nDbMeR$#U(_(|wDG$edUGw7&pmJ^lM}i~+ zsgKk-N{ej)AeFT?+21#}Bc?(x3NQZ5hQ)`$kcxrI=>m`5cKdCY{{H{vWR!6rrSDxdoN=&tzU#nolb}8kO(veSxH~kt z8dcy(9PayoqF%;#cgJE`zn6VzhL4U9Zb76WIW*abJ>y?1p{8GgS`wgykI?2Z30gqk zyyhM|;Ft;^muQgLaNl>_Y(Pe-)6DfJ)&@{lo zCGZqeWY)+S7Xz=OQQE$xn*%ChPskai`~Byla(L>x z@doQ>49cNx?}=Gl8J#P;1o%K^5v!N=y}SI7*U-n#w_@WUx1vQfkQngdgOGRHKPE?9 zb79lC`X0Dis_T|>&Wgw9=*dfyOHP&$(go5z&Dr%VUWkys$E@rVa%@v8yA?nOv|MVe zHr@o?S>ODxs`3+Z3tQ8hVjAG8bOpmE=6|E$B91+smaGRr)~0Eu6%?uT&4c`Cd@~Aq zhQT+Ae(3Ak(l!?{B%(rmru)nW2xV=m6K(>KaBxHg6nayO$uvQL7CAfM%r*_x$gq4# zWCCLMo5bn?TZSRYzzEFr|3v?#bQxr;%Uh}*K%PVc5zx%cAW*Q;?-rFkB#8X$RDq79-7a1_TiI@Z(8;ohbpCt!kszT5a&s|rN{=X9kFT}MjOGY z`m08u1<2K~^zObhq-mFZ4QGt|gU=aA!G+*&$0!%)Je;R*(yQ|C*fl5k7jxv^9`X$l z8+)pd4;4{Lr+IYoQ}=cL8lS`km%DI{=2bVyYZVKWY67}qA7PE1OAaF_8_LsQ9I4z( z-&7a}2q!+}Ms1)Odf6xkABF9l9i!A)JIAhfC1JlXNjJc6ZC=k@@^~1es#&ZNg>ao)&t(YgPjNzQr_Wh%D?0<523v4`iHybFIIuh}IBy%UA)CRFco0+FIzXR%EtLgI+^ z+b8hMSodchD~p-s%1rT!R6%tbxw@ z;Pvq*KCo1K;7Pe%GsNizhi-=QgX|p%gdIGZp@3?xC_hEilS`&W``5+!qX2aD;- z{Wbfk5~o+Ks3MrVccg^kzTI2Q(FtA_2CMa?iF4P&WR4D22Hx^}P<470cFJS@`pI7yE?U%J^MskVw!4iZHN6&nbd;CO2tIgXpvPW` zc^B_M_muaHSh!s^PRMa@-^$6e1I6N0&$-{Xl?WlXpGWw%PAT}tX18x3bO$*w$r)7_niSX+A-`A!v0PSh5M z&P^HaLv}a+OA~#c2f9PwOPyYgaA7zS+1c>mFQwV$S(@sS-QhHPp+;~h*8ZIGY$82=>UHO?+K$N@P*?jb+)IGu&C?#hv7D?95g|O)>f9IDsW}DcBP1GOMOtr_#x+a+1n2{SRC*`v0A_FrX!@*@oRv~_#r&814z z^$uoRDP?Lmnx$UFrzeBnfWkW>%rCEGo44C_SIJ+%sbS`Bt%6nVF$_(;gzl;4brySQUg22YLjm8L^=G9zp)c8Mi&O zCdhX=nd{c1pjB>S$9B+!;gw%MN7cq)`2S?>8iJ9GP?NNnVY(jMAaSU1ug8}@@0gvM z8Gw{r&-l31=>XvfIce=X<{8d!U@32<)*3xiCVkezX1*yt^(=lcoAR{s;60Io5{${9 zoWiagWlsXq{5H#6!(I5S(wV7#>7+l)ZbW|RS9|E#(E1v)JAY$(ZNDx;7=?+UrF(U< z1U+ux9n=OAFT5&H!7)npp3)fNDZFYfFJhL=|I~{~aNO?4ixnFO7%tg^|GtqSus|~; zM1I8)XXd0r(LwD@OZNeF;&UC~vEN5o54f%rk=`g&t+-dW%_Cp*cQeGf?n*|}5)IpV zHP3=ME-UrEqthIEWxR8Mi_$;l`z_VLqIW%Z?dq-wfwba)*qb!N?csEhO^+<}|AM&% z%F{Fsr+LvLq3#_n;3XtKC$h>ah(r3tNf7Ab(Q^RLt#)6{$OEsUV+aA4ks557M|&qy z`Qc)Zk&yL__cKmh4%+Esy9g*5SD{hTKgC#%Tho+V@3=Dm%mEI07_FD;Y0gpf03(Zm z=8c&*IKP!5pB`x}cLPfBLGy1*uUl>1l1H{SViEcSg`<&jiALxjmyH@3%x0XEFwuzW z1qQGddi2{IzjgrCjX~q59Qy}gi2nNUYbA@J1^p_YMa0?qO}dhAt+BuM=ySD({9i@+ zQh?gM?_X=j(^y5d|faoYf+#b;nSuLHxy9>O>Kf(CowvVRp;d^Fp#8 zG-+OuPdlI<3d29^rmnsgJ9E+Y)>$lPBGwY^UZ+0sd)$pfN7;>G?_Xin*WJIXFC(km ztz&I~iw0N94ib2N3C>U_jp^f$&#;fZ)5jTRnJ`J}V3v_1N(D^mbmd|+ST{|gJ#MHJ zI{*0*;^9a*UMUjnkxr6L*eb)n?gA%pn zPg73*%3iX%i!9G@(m#W9@#$tov@Y-4x&3)g{OiUMCv%+*CSooTpAq8}xAf4B%PqP1 zPJ{;n@*K;wUIWG6}LHHBJh1{Se=-!_8D9 zSU>s2Q+gg9w&GNNBo50ea&Y2{5ayq{HiF_^tKEI?a~`kBd)%` zdJw2=lbymPC~-M1%ku40`_#3lmqD*K7zq&gS{Pnud)bTAH)@db>r~ud+mX_(t zp)0Ya+t3;a8Q@x3Tv8$Sbl)<%IkFaK4k_y~&R@{@rA?ss`K+fxo9J^Ar)#_l`9{3MO1Zg2Ohz?O#l) zw~N5wBcfvaAJWFW$2CS!{tX-`26ExPIp@P;#_)wAj26?YFHoS4XJsCLk1hj|?aC*k zy$u%UCz>7@BYQALhIm1Jb51qAOOWI*Ss>a%?JBm`kPv~4Qk@UbFuqFX;#TWdJ2Wo+ z?)dviK`=;-kng1-C~$q*4rmqbgmOH(9%vuJ3|{&UFUibxn7!HuLEqp$$u;285ql%a zxS;awq?nQi-^Gwu4xrq?=&-R?hNb-}t`ey@@Fc6aLISuL1aqJz7M!#E^6XjePD}bL z2S8(Yx`VRO5X2A&#Da0f;r7)?Y} zuyxU$c!V%}_}m6f0VP1c2X$nWjtoKe%YGT0rf7e2hR}VWou*TeKG(cQHH8zyTslTi zs<9$yZjt#Lg+WH6D478alxo#9R_mY4;P_DwX3%;WqCc;@aUFFLwZh*@)Btfq@It^T zXXC z=C%g_Hpa6jkGVbD$3OQ=7}}XEfCOPmKIrogW+_}SqNVb zFIJz{2obpZ-3idBVpE{a{h!W6e!=X&5n`izi;Y+y$-hDfcp?I!uR5mN@y~CshyVL5 zbzmv?!wC(2?`Jn*t6m~z@GfXrTP1S!p2!t_(N8h3ts&!LQE{NqpDR!*geI%B>;v1h zlrmbh4hSooM=!iNAM?y*^!;QJgu9>&c|SOe;|B8?2v)c9Z$*q`CL%?v_f1GXjOrd} zmi0k2E}%ZMT)-KU!a6*iBFq2$r*i13&R!OIiI|J90m}!p z#pnl9=fE0td&&~Z=(dNKG`xhNIl$<-2R$_yZNzsc}gH5Z!^ircr~HPyB9I z)C{^Y7OoL6EMf=sJYScrj~D{=LYV#BAzva4ke#T-{|%Ca2&`ZcOgda6MU4=P<2)BN z143{{9(ag+wax?!Mn3Sfu)uj=fr$4^)k(rjQ{5T1z)Cw1#uFyP@HuNdQVdyw3Tj|^ zpv8;HuB* zp`vMhQyIy3z-(&an-9?Fb6Ttf1AO^A6j%!QI0RZ%1|b~d>~OA!SRM1zT}S|>vGK_5 z64FQWs6L37>#BzS-ZsVd^3OP;mYfnTGJG1|dTAQWNa@=>yQ^hF)}BG%-y_0I8CxK; zP8tk${d=qah+0$<}r7*PZ*6BSO}k zS>whxp?v@&*rd160FJ(=Y8J6(f9y~*E@^;lfkyo3>2C6cT+|Z7J;CRoN`G+y(U1-< z+k%1@88gt!$cO|RXpE-#bwtIJKM)2Ar#QwKSIFyk$BZe#|FcBp_0KSSC)7^Y>JRpdKY!wete_OKEzaH z64qtdVc(dLwNpjW#n_R&MifcTgCpDO6iI#r+m4)4r**1mZMyj=0Y&zSEa&f{|4HIn zkgMP#lAi-e283js`@o0tU%p*dO#UziI0N*({)o1BF~m)#W)qpS)Z+{XdG?sjToWWk zcJ!6{@4|8b5$JiwDQ^4oU61eZL#05D1)r~ByRcPY>vG(_e(Ya^yXS43LIedD^Yb>& z>dS1u!j*6QHSkWOM+QI*z}~btS1obCm{J&Q1iis}C@r0OBIVT6pA>;?xvVd-D?p%G z!g%fH)PV(p|B&j0TlN_gxJewDumLIgP^ZzVfzBfulP0=QK7R>)df@0IP1ZeNAJRdkQV3<*AV*jwO3@|+k5z8u^C40 z60W*Stvq2;GK{g{Ce8rug3rbG(9T|p(i%P8T6)~!Et3O#`JW*HK?rldjBYVV;;zTi!Zu`57kBgnR&hP+>58s-Cz=ApA=9M zF&0)^w4fvx^nX*|5>!8i37&vEDti%G<9At>=Bvk1C h)+(P-YIj7|yT@onf6J->Z2SlGwT-pj-*S2S{{X*&*=PU& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_frame_81.xml b/app/src/main/res/drawable/ic_frame_81.xml new file mode 100644 index 0000000..5243f62 --- /dev/null +++ b/app/src/main/res/drawable/ic_frame_81.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_frame_image.xml b/app/src/main/res/drawable/ic_frame_image.xml new file mode 100644 index 0000000..9f308d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_frame_image.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_group_37.xml b/app/src/main/res/drawable/ic_group_37.xml new file mode 100644 index 0000000..bb3ebac --- /dev/null +++ b/app/src/main/res/drawable/ic_group_37.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shadow.xml b/app/src/main/res/drawable/shadow.xml new file mode 100644 index 0000000..0837153 --- /dev/null +++ b/app/src/main/res/drawable/shadow.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 198f01a..2eb1997 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -4,6 +4,138 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background_color" + android:orientation="vertical" tools:context=".screens.account.EditProfileActivity"> + + + + + + + + + + + + + + + + + + + +